1
0
Эх сурвалжийг харах

[DeviceDrivers] prepare for device driver v2.0 (#7697)

Bernard Xiong 1 жил өмнө
parent
commit
e3f068f058

+ 15 - 0
components/drivers/core/SConscript

@@ -0,0 +1,15 @@
+from building import *
+
+cwd = GetCurrentDir()
+src = ['device.c']
+CPPPATH = [cwd + '/../include']
+
+if GetDepend(['RT_USING_DEV_BUS']):
+    src = src + ['bus.c']
+
+if GetDepend(['RT_USING_DM']):
+    src = src + ['driver.c']
+
+group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_DEVICE'], CPPPATH = CPPPATH)
+
+Return('group')

+ 0 - 0
components/drivers/misc/rt_dev_bus.c → components/drivers/core/bus.c


+ 0 - 0
src/device.c → components/drivers/core/device.c


+ 7 - 7
src/driver.c → components/drivers/core/driver.c

@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2023, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <rtthread.h>
+
+#ifdef RT_USING_DM
+
 #ifdef RT_USING_FDT
 #include <dtb_node.h>
 #endif
-#if defined(RT_USING_POSIX_DEVIO)
-#include <rtdevice.h> /* for wqueue_init */
-#endif
 
 /**
  * This function driver device match with id
@@ -45,7 +45,6 @@ rt_err_t rt_driver_match_with_id(const rt_driver_t drv,int device_id)
     }
     return ret;
 }
-
 RTM_EXPORT(rt_driver_match_with_id);
 
 #ifdef RT_USING_FDT
@@ -107,7 +106,8 @@ rt_err_t rt_driver_match_with_dtb(const rt_driver_t drv,void *from_node,int max_
     rt_free(node_list);
     return ret;
 }
-
 RTM_EXPORT(rt_driver_match_with_dtb);
-#endif  
+#endif /* RT_USING_FDT */ 
+
+#endif /* RT_USING_DM */
 

+ 0 - 3
components/drivers/misc/SConscript

@@ -23,9 +23,6 @@ if GetDepend(['RT_USING_PULSE_ENCODER']):
 if GetDepend(['RT_USING_INPUT_CAPTURE']):
     src = src + ['rt_inputcapture.c']
 
-if GetDepend(['RT_USING_DEV_BUS']):
-    src = src + ['rt_dev_bus.c']
-
 if GetDepend(['RT_USING_NULL']):
     src = src + ['rt_null.c']