fix[ADC V2]: resolve ADC V1 compatibility Kconfig loop

Author: CYFS3

bsp/stm32/libraries/HAL_Drivers/drivers/Kconfig

@@ -26,8 +26,8 @@ endif
 
 menuconfig BSP_USING_ADC_V2
     bool "Enable ADC V2"
+    select RT_USING_ADC
     select RT_USING_ADC_V2
-    depends on !RT_USING_ADC
     default n
 
 if BSP_USING_ADC_V2

bsp/stm32/libraries/HAL_Drivers/drivers/SConscript

@@ -46,7 +46,7 @@ if GetDepend(['RT_USING_I2C']):
 if GetDepend(['BSP_USING_ETH', 'RT_USING_LWIP']) and not GetDepend(['SOC_STM32H750_ARTPI']):
     src += ['drv_eth.c']
 
-if GetDepend(['RT_USING_ADC']):
+if GetDepend(['RT_USING_ADC']) and not GetDepend(['RT_USING_ADC_V2']):
     src += ['drv_adc.c']
 
 if GetDepend(['BSP_USING_ADC_V2']):

components/drivers/adc/Kconfig

@@ -1,11 +1,22 @@
-menuconfig RT_USING_ADC_V2
-    bool "Using ADC V2 device drivers"
-    depends on !RT_USING_ADC
+menuconfig RT_USING_ADC
+    bool "Using ADC device drivers"
     default n
-    help
-        Enable the standalone ADC V2 framework. ADC V2 currently uses the
-        legacy ADC public namespace, so it cannot be enabled together with
-        RT_USING_ADC.
+
+if RT_USING_ADC
+    config RT_USING_ADC_V2
+        bool "Using ADC V2 device drivers"
+        default n
+        help
+            Enable the standalone ADC V2 framework. ADC V2 uses the legacy ADC
+            public namespace, so it cannot be enabled together with ADC V1.
+
+    config RT_USING_ADC_V1
+        bool
+        default y if !RT_USING_ADC_V2
+
+if RT_USING_DM && RT_USING_ADC_V1
+    osource "$(SOC_DM_ADC_DIR)/Kconfig"
+endif
 
 if RT_USING_ADC_V2
 
@@ -107,3 +118,4 @@ config RT_ADC_V2_USING_MSH
 
 endif
 
+endif

components/drivers/adc/SConscript

@@ -3,6 +3,10 @@ from building import *
 cwd = GetCurrentDir()
 src = []
 CPPPATH = [cwd + '/../include']
+group = []
+
+if GetDepend(['RT_USING_ADC']) and not GetDepend(['RT_USING_ADC_V2']):
+    src += ['adc.c']
 
 if GetDepend(['RT_USING_ADC_V2']):
     src += ['adc_v2.c']
@@ -13,6 +17,7 @@ if GetDepend(['RT_USING_ADC_V2', 'RT_ADC_USING_TRIGGER']):
 if GetDepend(['RT_USING_ADC_V2', 'RT_USING_FINSH', 'RT_ADC_V2_USING_MSH']):
     src += ['adc_v2_msh.c']
 
-group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_ADC_V2'], CPPPATH = CPPPATH)
+if len(src):
+    group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_ADC'], CPPPATH = CPPPATH)
 
 Return('group')

components/drivers/misc/adc.c components/drivers/adc/adc.ccomponents/drivers/misc/adc.c renamed to components/drivers/adc/adc.c

@@ -18,9 +18,9 @@
 
 #include <rtconfig.h>
 #include "misc.h"
-#if defined(RT_USING_ADC)
-#error "ADC V2 uses the legacy ADC namespace; disable RT_USING_ADC before enabling ADC V2."
-#endif /* defined(RT_USING_ADC) */
+#if !defined(RT_USING_ADC_V2)
+#error "ADC V2 interface requires RT_USING_ADC_V2."
+#endif /* !defined(RT_USING_ADC_V2) */
 
 #include <rtatomic.h>
 #include <rtdevice.h>

components/drivers/include/drivers/adc_v2.h

@@ -259,12 +259,10 @@ extern "C" {
 #include "drivers/dev_audio.h"
 #endif /* RT_USING_AUDIO */
 
-#ifdef RT_USING_ADC
-#include "drivers/adc.h"
-#endif /* RT_USING_ADC */
-
 #ifdef RT_USING_ADC_V2
 #include "drivers/adc_v2.h"
+#elif defined(RT_USING_ADC)
+#include "drivers/adc.h"
 #endif /* RT_USING_ADC_V2 */
 
 #ifdef RT_USING_DAC

components/drivers/include/rtdevice.h

@@ -1,11 +1,3 @@
-menuconfig RT_USING_ADC
-    bool "Using ADC device drivers"
-    default n
-
-if RT_USING_DM && RT_USING_ADC
-    osource "$(SOC_DM_ADC_DIR)/Kconfig"
-endif
-
 config RT_USING_DAC
     bool "Using DAC device drivers"
     default n

components/drivers/misc/Kconfig

@@ -5,9 +5,6 @@ src = []
 CPPPATH = [cwd + '/../include']
 group = []
 
-if GetDepend(['RT_USING_ADC']):
-    src = src + ['adc.c']
-
 if GetDepend(['RT_USING_DAC']):
     src = src + ['dac.c']