From 29c72f3455d7f617fb22c150178fec98757ca283 Mon Sep 17 00:00:00 2001 From: sakumisu <1203593632@qq.com> Date: Tue, 16 Apr 2024 22:18:25 +0800 Subject: [PATCH] update msh cmd and scons --- SConscript | 24 ++++----- third_party/rt-thread-5.0/msh_cmd.c | 79 ----------------------------- third_party/rt-thread-5.0/usb_msh.c | 45 ++++++++++++++++ 3 files changed, 57 insertions(+), 91 deletions(-) delete mode 100644 third_party/rt-thread-5.0/msh_cmd.c create mode 100644 third_party/rt-thread-5.0/usb_msh.c diff --git a/SConscript b/SConscript index 31689d5e..9cd1750c 100644 --- a/SConscript +++ b/SConscript @@ -26,13 +26,6 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']): if GetDepend(['PKG_CHERRYUSB_DEVICE_HS']): CPPDEFINES+=['CONFIG_USB_HS'] - if GetDepend(['PKG_CHERRYUSB_DEVICE_BL']): - src += Glob('port/bouffalolab/usb_dc_bl.c') - if GetDepend(['PKG_CHERRYUSB_DEVICE_CH32']): - if GetDepend(['PKG_CHERRYUSB_DEVICE_HS']): - src += Glob('port/ch32/usb_dc_usbhs.c') - else: - src += Glob('port/ch32/usb_dc_usbfs.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_FSDEV']): src += Glob('port/fsdev/usb_dc_fsdev.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_DWC2_ST']): @@ -44,6 +37,9 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']): if GetDepend(['PKG_CHERRYUSB_DEVICE_DWC2_AT']): src += Glob('port/dwc2/usb_dc_dwc2.c') src += Glob('port/dwc2/usb_glue_at.c') + if GetDepend(['PKG_CHERRYUSB_DEVICE_DWC2_GD']): + src += Glob('port/dwc2/usb_dc_dwc2.c') + src += Glob('port/dwc2/usb_glue_gd.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_DWC2_CUSTOM']): src += Glob('port/dwc2/usb_dc_dwc2.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_MUSB_STANDARD']): @@ -53,13 +49,15 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']): CPPDEFINES += ['CONFIG_USB_MUSB_SUNXI'] if GetDepend(['PKG_CHERRYUSB_DEVICE_MUSB_CUSTOM']): src += Glob('port/musb/usb_dc_musb.c') + if GetDepend(['PKG_CHERRYUSB_DEVICE_BL']): + src += Glob('port/bouffalolab/usb_dc_bl.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_HPM']): src += Glob('port/hpm/usb_dc_hpm.c') - if GetDepend(['PKG_CHERRYUSB_DEVICE_PUSB2']): - path += [cwd + '/port/pusb2/common'] - path += [cwd + '/port/pusb2/fpusb2'] - src += Glob('port/pusb2/fpusb2' + '/*.c') - src += Glob('port/pusb2/usb_dc_pusb2.c') + if GetDepend(['PKG_CHERRYUSB_DEVICE_CH32']): + if GetDepend(['PKG_CHERRYUSB_DEVICE_HS']): + src += Glob('port/ch32/usb_dc_usbhs.c') + else: + src += Glob('port/ch32/usb_dc_usbfs.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_CDC_ACM']): src += Glob('class/cdc/usbd_cdc.c') @@ -191,6 +189,8 @@ if GetDepend(['PKG_CHERRYUSB_HOST']): if GetDepend('RT_USING_DFS'): src += Glob('third_party/rt-thread-5.0/dfs_usbh_msc.c') +src += Glob('third_party/rt-thread-5.0/usb_msh.c') + group = DefineGroup('CherryUSB', src, depend = ['PKG_USING_CHERRYUSB'], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/third_party/rt-thread-5.0/msh_cmd.c b/third_party/rt-thread-5.0/msh_cmd.c deleted file mode 100644 index 27c2912b..00000000 --- a/third_party/rt-thread-5.0/msh_cmd.c +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************/ /** -* -* @copyright (C) 2019 Nuvoton Technology Corp. All rights reserved. -* -* SPDX-License-Identifier: Apache-2.0 -* -* Change Logs: -* Date Author Notes -* 2023-8-9 Wayne First version -* -******************************************************************************/ - -#include - -#if defined(PKG_USING_CHERRYUSB) - -#if 0 -#if defined(PKG_CHERRYUSB_DEVICE_CDC_TEMPLATE) -void cdc_acm_init(void); -MSH_CMD_EXPORT(cdc_acm_init, start cdc_acm_init); -#endif - -#if defined(PKG_CHERRYUSB_DEVICE_HID_MOUSE_TEMPLATE) -void hid_mouse_init(void); -void hid_mouse_test(void); - -MSH_CMD_EXPORT(hid_mouse_init, start hid_mouse_init); -MSH_CMD_EXPORT(hid_mouse_test, start hid_mouse_test); -#endif - -#if defined(PKG_CHERRYUSB_DEVICE_HID_KEYBOARD_TEMPLATE) -void hid_keyboard_init(void); -void hid_keyboard_test(void); - -MSH_CMD_EXPORT(hid_keyboard_init, start hid_keyboard_init); -MSH_CMD_EXPORT(hid_keyboard_test, start hid_keyboard_test); -#endif - -#if defined(PKG_CHERRYUSB_DEVICE_MSC_TEMPLATE) -void msc_ram_init(void); -MSH_CMD_EXPORT(msc_ram_init, start msc_ram_init); -#endif - -#if defined(PKG_CHERRYUSB_DEVICE_RNDIS_TEMPLATE) -void cdc_rndis_init(void); -MSH_CMD_EXPORT(cdc_rndis_init, start cdc_rndis_init); -#endif - -#if defined(PKG_CHERRYUSB_DEVICE_VIDEO_TEMPLATE) -void video_init(void); -void video_test(void); - -MSH_CMD_EXPORT(video_init, start video_init); -MSH_CMD_EXPORT(video_test, start video_test); -#endif - -#if defined(PKG_CHERRYUSB_DEVICE_AUDIO_V1_TEMPLATE) -void audio_v1_init(void); -void audio_v1_test(void); - -MSH_CMD_EXPORT(audio_v1_init, start audio_v1_init); -MSH_CMD_EXPORT(audio_v1_test, start audio_v1_test); -#endif - -#if defined(PKG_CHERRYUSB_DEVICE_AUDIO_V2_TEMPLATE) -void audio_v2_init(void); -void audio_v2_test(void); - -MSH_CMD_EXPORT(audio_v2_init, start audio_v2_init); -MSH_CMD_EXPORT(audio_v2_test, start audio_v2_test); -#endif -#endif - -#if defined(PKG_CHERRYUSB_HOST) -int lsusb(int argc, char **argv); -MSH_CMD_EXPORT(lsusb, start lsusb); -#endif - -#endif diff --git a/third_party/rt-thread-5.0/usb_msh.c b/third_party/rt-thread-5.0/usb_msh.c new file mode 100644 index 00000000..7dfa5921 --- /dev/null +++ b/third_party/rt-thread-5.0/usb_msh.c @@ -0,0 +1,45 @@ +#include + +#if IDLE_THREAD_STACK_SIZE < 2048 +#error "IDLE_THREAD_STACK_SIZE must be greater than 2048" +#endif + +#ifdef PKG_CHERRYUSB_HOST +#include "usbh_core.h" + +int usbh_init(int argc, char **argv) +{ + uint8_t busid; + uint32_t reg_base; + + if (argc < 3) { + USB_LOG_ERR("please input correct command: usbh_init \r\n"); + return -1; + } + + busid = atoi(argv[1]); + reg_base = strtoll(argv[2], NULL, 16); + usbh_initialize(busid, reg_base); + + return 0; +} + +int usbh_deinit(int argc, char **argv) +{ + uint8_t busid; + + if (argc < 2) { + USB_LOG_ERR("please input correct command: usbh_deinit \r\n"); + return -1; + } + + busid = atoi(argv[1]); + usbh_deinitialize(busid); + + return 0; +} + +MSH_CMD_EXPORT(usbh_init, init usb host); +MSH_CMD_EXPORT(usbh_deinit, deinit usb host); +MSH_CMD_EXPORT(lsusb, ls usb devices); +#endif