update sconscript

1 files changed, 66 insertions, 41 deletions

diff --git a/SConscript b/SConscript
index 435c5adf..825d1912 100644
--- a/SConscript
+++ b/SConscript
@@ -7,46 +7,63 @@ path += [cwd + '/core']
 src = []
 
 CPPDEFINES = []
-if GetDepend(['PKG_CHERRYUSB_USING_HS']):
-    CPPDEFINES+=['CONFIG_USB_HS']
-elif GetDepend(['PKG_CHERRYUSB_USING_HS_IN_FULL']):
-        CPPDEFINES += ['CONFIG_USB_HS_IN_FULL']
 
 # USB DEVICE
-if GetDepend(['PKG_CHERRYUSB_USING_DEVICE']):
+if GetDepend(['PKG_CHERRYUSB_DEVICE']):
     src += Glob('core/usbd_core.c')
-    if GetDepend(['PKG_CHERRYUSB_USING_CDC']):
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_HS']):
+        CPPDEFINES+=['CONFIG_USB_HS']
+    elif GetDepend(['PKG_CHERRYUSB_DEVICE_HS_IN_FULL']):
+        CPPDEFINES += ['CONFIG_USB_HS_IN_FULL']
+
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_CDC']):
         path += [cwd + '/class/cdc']
         src += Glob('class/cdc/usbd_cdc.c')
-    if GetDepend(['PKG_CHERRYUSB_USING_HID']):
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_HID']):
         path += [cwd + '/class/hid']
-        src += Glob('class/cdc/usbd_hid.c')
+        src += Glob('class/hid/usbd_hid.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_MSC']):
+        path += [cwd + '/class/msc']
+        src += Glob('class/msc/usbd_msc.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_AUDIO']):
+        path += [cwd + '/class/audio']
+        src += Glob('class/audio/usbd_audio.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_VIDEO']):
+        path += [cwd + '/class/video']
+        src += Glob('class/video/usbd_video.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_RNDIS']):
+        path += [cwd + '/class/wireless']
+        src += Glob('class/wireless/usbd_rndis.c')
     if GetDepend(['PKG_CHERRYUSB_USING_DFU']):
         path += [cwd + '/class/dfu']
-        src += Glob('class/cdc/usbd_dfu.c')
+        src += Glob('class/dfu/usbd_dfu.c')
     if GetDepend(['PKG_CHERRYUSB_USING_HUB']):
         path += [cwd + '/class/hub']
-        src += Glob('class/cdc/usbd_hub.c')
-    if GetDepend(['PKG_CHERRYUSB_USING_AUDIO']):
-        path += [cwd + '/class/audio']
-        src += Glob('class/cdc/usbd_audio.c')
-    if GetDepend(['PKG_CHERRYUSB_USING_VIDEO']):
-        path += [cwd + '/class/video']
-        src += Glob('class/cdc/usbd_video.c')
-    if GetDepend(['PKG_CHERRYUSB_USING_MSC']):
-        path += [cwd + '/class/msc']
-        src += Glob('class/cdc/usbd_msc.c')
-    if GetDepend(['SOC_FAMILY_STM32']):
-        if GetDepend(['SOC_SERIES_STM32F0']) or GetDepend(['SOC_SERIES_STM32F1']) or GetDepend(['SOC_SERIES_STM32F3']) or GetDepend(['SOC_SERIES_STM32L0']):
-            src += Glob('port/fsdev/usb_dc_fsdev.c')
-        else:
-            src += Glob('port/synopsys/usb_dc_synopsys.c')
-            if GetDepend(['SOC_SERIES_STM32H7']) and GetDepend(['PKG_CHERRYUSB_USING_FS']):
-                CPPDEFINES += ['USB_BASE=0x40080000UL']
-    if GetDepend(['CHERRYUSB_USING_MUSB']):
-        src += Glob('port/musb/usb_dc_musb.c')
-    if GetDepend(['CHERRYUSB_USING_CDC_DEMO']):
+        src += Glob('class/hub/usbd_hub.c')
+        
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_CDC_TEMPLATE']):
         src += Glob('demo/cdc_acm_template.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_HID_MOUSE_TEMPLATE']):
+        src += Glob('demo/hid_mouse_template.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_HID_KEYBOARD_TEMPLATE']):
+        src += Glob('demo/hid_keyboard_template.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_MSC_TEMPLATE']):
+        src += Glob('demo/msc_ram_template.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_AUDIO_V1_TEMPLATE']):
+        src += Glob('demo/audio_v1_mic_speaker_dualchan_template.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_AUDIO_V2_TEMPLATE']):
+        src += Glob('demo/audio_v2_mic_speaker_multichan_template.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_VIDEO_TEMPLATE']):
+        src += Glob('demo/video_hs_mjpeg_template.c')
+        
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_FSDEV_STM32']):
+        src += Glob('port/fsdev/usb_dc_fsdev.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_SYNOPSYS_STM32']):
+        src += Glob('port/synopsys/usb_dc_synopsys.c')
+    if GetDepend(['PKG_CHERRYUSB_DEVICE_MUSB']):
+        src += Glob('port/musb/usb_dc_musb.c')
+        if GetDepend(['PKG_CHERRYUSB_DEVICE_MUSB_SUNXI']):
+            CPPDEFINES += ['USB_MUSB_SUNXI']
 
 # USB HOST
 if GetDepend(['PKG_CHERRYUSB_USING_HOST']):
@@ -54,21 +71,29 @@ if GetDepend(['PKG_CHERRYUSB_USING_HOST']):
     path += [cwd + '/osal']
     src += Glob('osal/usb_osal_rtthread.c')
     src += Glob('osal/usb_workq.c')
-    path += [cwd + '/class/cdc']
-    src += Glob('class/cdc/usbh_cdc_acm.c')
-    path += [cwd + '/class/hid']
-    src += Glob('class/hid/usbh_hid.c')
-    path += [cwd + '/class/msc']
-    src += Glob('class/msc/usbh_msc.c')
-    path += [cwd + '/class/hub']
-    src += Glob('class/hub/usbh_hub.c')
+    
+    if GetDepend(['PKG_CHERRYUSB_HOST_CDC']):
+        path += [cwd + '/class/cdc']
+        src += Glob('class/cdc/usbh_cdc_acm.c')
+    if GetDepend(['PKG_CHERRYUSB_HOST_HID']):
+        path += [cwd + '/class/hid']
+        src += Glob('class/hid/usbh_hid.c')
+    if GetDepend(['PKG_CHERRYUSB_HOST_MSC']):
+        path += [cwd + '/class/msc']
+        src += Glob('class/msc/usbh_msc.c')
+    if GetDepend(['PKG_CHERRYUSB_HOST_HUB']):
+        path += [cwd + '/class/hub']
+        src += Glob('class/hub/usbh_hub.c')
+        CPPDEFINES += ['CONFIG_USBHOST_HUB']
 
-    CPPDEFINES += ['CONFIG_USBHOST_HUB']
-    if GetDepend(['SOC_FAMILY_STM32']):
+    if GetDepend(['PKG_CHERRYUSB_HOST_SYNOPSYS_STM32']):
         src += Glob('port/synopsys/usb_hc_synopsys.c')
-    if GetDepend(['CHERRYUSB_USING_MUSB']):
+    if GetDepend(['PKG_CHERRYUSB_HOST_MUSB']):
         src += Glob('port/musb/usb_hc_musb.c')
-    if GetDepend(['CHERRYUSB_USING_HOST_DEMO']):
+        if GetDepend(['PKG_CHERRYUSB_HOST_MUSB_SUNXI']):
+            CPPDEFINES += ['USB_MUSB_SUNXI']
+
+    if GetDepend(['PKG_CHERRYUSB_HOST_TEMPLATE']):
         src += Glob('demo/usb_host.c')
 
 group = DefineGroup('CherryUSB', src, depend = ['PKG_USING_CHERRYUSB'], CPPPATH = path, CPPDEFINES = CPPDEFINES)