You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2021/02/21 21:17:02 UTC
[GitHub] [incubator-nuttx] Ouss4 commented on a change in pull request #2883: This commit implements I2C support for ESP32 (wrover kit).
Ouss4 commented on a change in pull request #2883:
URL: https://github.com/apache/incubator-nuttx/pull/2883#discussion_r579866819
##########
File path: boards/xtensa/esp32/common/src/esp32_board_i2c.c
##########
@@ -0,0 +1,78 @@
+/****************************************************************************
+ * boards/xtensa/esp32/common/src/esp32_board_i2c.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <debug.h>
+#include <sys/types.h>
+#include <nuttx/i2c/i2c_master.h>
+
+#include "esp32_board_i2c.h"
+#include "esp32_i2c.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: esp32_i2c_register
+ *
+ * Description:
+ * registar an ESP32 I2C interface.
+ *
+ * Returned Value:
+ * Zero (OK) is returned on success; A negated errno value is returned
+ * to indicate the nature of any failure.
+ *
+ ****************************************************************************/
+
+int esp32_i2c_register(int bus)
+{
+ FAR struct i2c_master_s *i2c;
+ int ret;
+
+#ifdef CONFIG_I2C
Review comment:
This one can be removed since the `esp32_board_i2c.c` file won't be built unless `CONFIG_I2C_DRIVER` is enabled which implies that `CONFIG_I2C` is enabled.
##########
File path: boards/xtensa/esp32/common/src/Make.defs
##########
@@ -26,7 +26,10 @@ ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += esp32_board_wdt.c
endif
+ifeq ($(CONFIG_I2C),y)
Review comment:
```suggestion
ifeq ($(CONFIG_I2C_DRIVER),y)
```
##########
File path: boards/xtensa/esp32/common/include/esp32_board_i2c.h
##########
@@ -0,0 +1,69 @@
+/****************************************************************************
+ * boards/xtensa/esp32/common/include/esp32_board_i2c.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_I2C_H
+#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_I2C_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#ifndef __ASSEMBLY__
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef CONFIG_I2C
Review comment:
```suggestion
#ifdef CONFIG_I2C_DRIVER
```
##########
File path: boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
##########
@@ -231,6 +235,30 @@ int esp32_bringup(void)
syslog(LOG_ERR, "Failed to initialize GPIO Driver: %d\n", ret);
return ret;
}
+#endif
+
+#ifdef CONFIG_ESP32_I2C
Review comment:
```suggestion
#ifdef CONFIG_I2C_DRIVER
```
##########
File path: boards/xtensa/esp32/common/src/esp32_board_i2c.c
##########
@@ -0,0 +1,78 @@
+/****************************************************************************
+ * boards/xtensa/esp32/common/src/esp32_board_i2c.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <debug.h>
+#include <sys/types.h>
+#include <nuttx/i2c/i2c_master.h>
+
+#include "esp32_board_i2c.h"
+#include "esp32_i2c.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: esp32_i2c_register
+ *
+ * Description:
+ * registar an ESP32 I2C interface.
+ *
+ * Returned Value:
+ * Zero (OK) is returned on success; A negated errno value is returned
+ * to indicate the nature of any failure.
+ *
+ ****************************************************************************/
+
+int esp32_i2c_register(int bus)
+{
+ FAR struct i2c_master_s *i2c;
+ int ret;
+
+#ifdef CONFIG_I2C
Review comment:
This one can be removed since the `esp32_board_i2c.c` file won't be built unless `CONFIG_I2C_DRIVER` is enabled which implies that `CONFIG_I2C` is enabled.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org