Skip to content

Commit f75fe23

Browse files
committed
update(bsp): update cherryusb demo to v1.6.1
Signed-off-by: sakumisu <1203593632@qq.com>
1 parent ab12c40 commit f75fe23

7 files changed

Lines changed: 21 additions & 47 deletions

File tree

bsp/bouffalo_lab/bl61x/board/cherryusb_port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ INIT_COMPONENT_EXPORT(cherryusb_devinit);
3030

3131
int cherryusb_hostinit(void)
3232
{
33-
usbh_initialize(0, 0x20072000);
33+
usbh_initialize(0, 0x20072000, NULL);
3434
return 0;
3535
}
3636
INIT_COMPONENT_EXPORT(cherryusb_hostinit);

bsp/bouffalo_lab/bl61x/board/usb_config.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,12 @@
160160
#define CONFIG_USBHOST_MAX_INTF_ALTSETTINGS 8
161161
#define CONFIG_USBHOST_MAX_ENDPOINTS 4
162162

163-
#define CONFIG_USBHOST_MAX_CDC_ACM_CLASS 4
163+
#define CONFIG_USBHOST_MAX_SERIAL_CLASS 4
164164
#define CONFIG_USBHOST_MAX_HID_CLASS 4
165165
#define CONFIG_USBHOST_MAX_MSC_CLASS 2
166166
#define CONFIG_USBHOST_MAX_AUDIO_CLASS 1
167167
#define CONFIG_USBHOST_MAX_VIDEO_CLASS 1
168+
//#define CONFIG_USBHOST_MAX_XBOX_CLASS 2
168169

169170
#define CONFIG_USBHOST_DEV_NAMELEN 16
170171

@@ -191,6 +192,10 @@
191192
#define CONFIG_USBHOST_CONTROL_TRANSFER_TIMEOUT 500
192193
#endif
193194

195+
#ifndef CONFIG_USBHOST_SERIAL_RX_SIZE
196+
#define CONFIG_USBHOST_SERIAL_RX_SIZE 2048
197+
#endif
198+
194199
#ifndef CONFIG_USBHOST_MSC_TIMEOUT
195200
#define CONFIG_USBHOST_MSC_TIMEOUT 5000
196201
#endif

bsp/hpmicro/hpm6750evk/board/cherryusb_port.c

Lines changed: 0 additions & 41 deletions
This file was deleted.

bsp/hpmicro/hpm6750evk2/board/cherryusb_port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ int cherryusb_hostinit(void)
3434
{
3535
board_init_usb_pins();
3636

37-
usbh_initialize(0, HPM_USB0_BASE);
37+
usbh_initialize(0, HPM_USB0_BASE, NULL);
3838
return 0;
3939
}
4040
INIT_COMPONENT_EXPORT(cherryusb_hostinit);

bsp/hpmicro/hpm6750evk2/board/usb_config.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,12 @@
157157
#define CONFIG_USBHOST_MAX_INTF_ALTSETTINGS 8
158158
#define CONFIG_USBHOST_MAX_ENDPOINTS 4
159159

160-
#define CONFIG_USBHOST_MAX_CDC_ACM_CLASS 4
160+
#define CONFIG_USBHOST_MAX_SERIAL_CLASS 4
161161
#define CONFIG_USBHOST_MAX_HID_CLASS 4
162162
#define CONFIG_USBHOST_MAX_MSC_CLASS 2
163163
#define CONFIG_USBHOST_MAX_AUDIO_CLASS 1
164164
#define CONFIG_USBHOST_MAX_VIDEO_CLASS 1
165+
//#define CONFIG_USBHOST_MAX_XBOX_CLASS 2
165166

166167
#define CONFIG_USBHOST_DEV_NAMELEN 16
167168

@@ -188,6 +189,10 @@
188189
#define CONFIG_USBHOST_CONTROL_TRANSFER_TIMEOUT 500
189190
#endif
190191

192+
#ifndef CONFIG_USBHOST_SERIAL_RX_SIZE
193+
#define CONFIG_USBHOST_SERIAL_RX_SIZE 2048
194+
#endif
195+
191196
#ifndef CONFIG_USBHOST_MSC_TIMEOUT
192197
#define CONFIG_USBHOST_MSC_TIMEOUT 5000
193198
#endif

bsp/nxp/mcx/mcxn/frdm-mcxn947/board/cherryusb_port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ INIT_COMPONENT_EXPORT(cherryusb_devinit);
3030

3131
int cherryusb_hostinit(void)
3232
{
33-
usbh_initialize(0, USBHS1__USBC_BASE);
33+
usbh_initialize(0, USBHS1__USBC_BASE, NULL);
3434
return 0;
3535
}
3636
INIT_COMPONENT_EXPORT(cherryusb_hostinit);

bsp/nxp/mcx/mcxn/frdm-mcxn947/board/usb_config.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,12 @@
155155
#define CONFIG_USBHOST_MAX_INTF_ALTSETTINGS 8
156156
#define CONFIG_USBHOST_MAX_ENDPOINTS 4
157157

158-
#define CONFIG_USBHOST_MAX_CDC_ACM_CLASS 4
158+
#define CONFIG_USBHOST_MAX_SERIAL_CLASS 4
159159
#define CONFIG_USBHOST_MAX_HID_CLASS 4
160160
#define CONFIG_USBHOST_MAX_MSC_CLASS 2
161161
#define CONFIG_USBHOST_MAX_AUDIO_CLASS 1
162162
#define CONFIG_USBHOST_MAX_VIDEO_CLASS 1
163+
//#define CONFIG_USBHOST_MAX_XBOX_CLASS 2
163164

164165
#define CONFIG_USBHOST_DEV_NAMELEN 16
165166

@@ -186,6 +187,10 @@
186187
#define CONFIG_USBHOST_CONTROL_TRANSFER_TIMEOUT 500
187188
#endif
188189

190+
#ifndef CONFIG_USBHOST_SERIAL_RX_SIZE
191+
#define CONFIG_USBHOST_SERIAL_RX_SIZE 2048
192+
#endif
193+
189194
#ifndef CONFIG_USBHOST_MSC_TIMEOUT
190195
#define CONFIG_USBHOST_MSC_TIMEOUT 5000
191196
#endif

0 commit comments

Comments
 (0)