diff --git a/Kconfig b/Kconfig index 06a90b5..d03d30e 100755 --- a/Kconfig +++ b/Kconfig @@ -21,16 +21,21 @@ config OV3660_SUPPORT Enable this option if you want to use the OV3360. Disable this option to safe memory. -choice SCCB_HARDWARE_I2C - bool "Use hardware I2C0/I2C1 for SCCB" - default SCCB_HARDWARE_I2C1 +config SCCB_HARDWARE_I2C + bool "Use hardware I2C for SCCB" + default y help Enable this option if you want to use hardware I2C to control the camera. Disable this option to use software I2C. + +choice SCCB_HARDWARE_I2C_PORT + bool "I2C peripheral to use for SCCB" + depends on SCCB_HARDWARE_I2C + default SCCB_HARDWARE_I2C1 - config SCCB_HARDWARE_I2C0 + config SCCB_HARDWARE_I2C_PORT0 bool "I2C0" - config SCCB_HARDWARE_I2C1 + config SCCB_HARDWARE_I2C_PORT1 bool "I2C1" endchoice diff --git a/driver/sccb.c b/driver/sccb.c index bbff837..aa57abc 100755 --- a/driver/sccb.c +++ b/driver/sccb.c @@ -19,13 +19,6 @@ static const char* TAG = "sccb"; #endif -#ifdef CONFIG_SCCB_HARDWARE_I2C0 - #define CONFIG_SCCB_HARDWARE_I2C -#endif -#ifdef CONFIG_SCCB_HARDWARE_I2C1 - #define CONFIG_SCCB_HARDWARE_I2C -#endif - #define LITTLETOBIG(x) ((x<<8)|(x>>8)) #ifdef CONFIG_SCCB_HARDWARE_I2C @@ -38,7 +31,7 @@ static const char* TAG = "sccb"; #define ACK_CHECK_DIS 0x0 /*!< I2C master will not check ack from slave */ #define ACK_VAL 0x0 /*!< I2C ack value */ #define NACK_VAL 0x1 /*!< I2C nack value */ -#if CONFIG_SCCB_HARDWARE_I2C1 +#if CONFIG_SCCB_HARDWARE_I2C_PORT1 const int SCCB_I2C_PORT = 1; #else const int SCCB_I2C_PORT = 0;