Skip to content

Commit 95163a2

Browse files
committed
update(class/wireless/usbh_rndis): reduce rndis control buffer
1 parent 5a15f71 commit 95163a2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ CherryUSB Host Stack resource usage (GCC 10.2 with -O2):
118118
|usbh_hid.c | ~1400 | 256 | 4 + sizeof(struct usbh_hid) * x | 0 |
119119
|usbh_video.c | ~3800 | 128 | 4 + sizeof(struct usbh_video) * x | 0 |
120120
|usbh_audio.c | ~4100 | 128 | 4 + sizeof(struct usbh_audio) * x | 0 |
121-
|usbh_rndis.c | ~4200 | 4096 + 2 * 2048(default)| sizeof(struct usbh_rndis) * 1 | 0 |
121+
|usbh_rndis.c | ~4200 | 512 + 2 * 2048(default)| sizeof(struct usbh_rndis) * 1 | 0 |
122122
|usbh_cdc_ecm.c | ~2200 | 2 * 1514 + 16 | sizeof(struct usbh_cdc_ecm) * 1 | 0 |
123123
|usbh_cdc_ncm.c | ~3300 | 2 * 2048(default) + 16 + 32 | sizeof(struct usbh_cdc_ncm) * 1 | 0 |
124124
|usbh_bluetooth.c | ~1000 | 2 * 2048(default) | sizeof(struct usbh_bluetooth) * 1 | 0 |

README_zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ CherryUSB Host 协议栈资源占用说明(GCC 10.2 with -O2):
118118
|usbh_hid.c | ~1400 | 256 | 4 + sizeof(struct usbh_hid) * x | 0 |
119119
|usbh_video.c | ~3800 | 128 | 4 + sizeof(struct usbh_video) * x | 0 |
120120
|usbh_audio.c | ~4100 | 128 | 4 + sizeof(struct usbh_audio) * x | 0 |
121-
|usbh_rndis.c | ~4200 | 4096 + 2 * 2048(default)| sizeof(struct usbh_rndis) * 1 | 0 |
121+
|usbh_rndis.c | ~4200 | 512 + 2 * 2048(default)| sizeof(struct usbh_rndis) * 1 | 0 |
122122
|usbh_cdc_ecm.c | ~2200 | 2 * 1514 + 16 | sizeof(struct usbh_cdc_ecm) * 1 | 0 |
123123
|usbh_cdc_ncm.c | ~3300 | 2 * 2048(default) + 16 + 32 | sizeof(struct usbh_cdc_ncm) * 1 | 0 |
124124
|usbh_bluetooth.c | ~1000 | 2 * 2048(default) | sizeof(struct usbh_bluetooth) * 1 | 0 |

class/wireless/usbh_rndis.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#define DEV_FORMAT "/dev/rndis"
1515

16-
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_rndis_buf[4096];
16+
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_rndis_buf[512];
1717

1818
#define CONFIG_USBHOST_RNDIS_ETH_MAX_FRAME_SIZE 1514
1919
#define CONFIG_USBHOST_RNDIS_ETH_MSG_SIZE (CONFIG_USBHOST_RNDIS_ETH_MAX_FRAME_SIZE + 44)
@@ -80,7 +80,7 @@ static int usbh_rndis_init_msg_transfer(struct usbh_rndis *rndis_class)
8080
setup->bRequest = CDC_REQUEST_GET_ENCAPSULATED_RESPONSE;
8181
setup->wValue = 0;
8282
setup->wIndex = 0;
83-
setup->wLength = 4096;
83+
setup->wLength = sizeof(g_rndis_buf);
8484

8585
ret = usbh_control_transfer(rndis_class->hport, setup, (uint8_t *)resp);
8686
if (ret < 0) {
@@ -138,7 +138,7 @@ int usbh_rndis_query_msg_transfer(struct usbh_rndis *rndis_class, uint32_t oid,
138138
setup->bRequest = CDC_REQUEST_GET_ENCAPSULATED_RESPONSE;
139139
setup->wValue = 0;
140140
setup->wIndex = 0;
141-
setup->wLength = 4096;
141+
setup->wLength = sizeof(g_rndis_buf);
142142

143143
ret = usbh_control_transfer(rndis_class->hport, setup, (uint8_t *)resp);
144144
if (ret < 0) {
@@ -195,7 +195,7 @@ static int usbh_rndis_set_msg_transfer(struct usbh_rndis *rndis_class, uint32_t
195195
setup->bRequest = CDC_REQUEST_GET_ENCAPSULATED_RESPONSE;
196196
setup->wValue = 0;
197197
setup->wIndex = 0;
198-
setup->wLength = 4096;
198+
setup->wLength = sizeof(g_rndis_buf);
199199

200200
ret = usbh_control_transfer(rndis_class->hport, setup, (uint8_t *)resp);
201201
if (ret < 0) {
@@ -262,7 +262,7 @@ int usbh_rndis_keepalive(struct usbh_rndis *rndis_class)
262262
setup->bRequest = CDC_REQUEST_GET_ENCAPSULATED_RESPONSE;
263263
setup->wValue = 0;
264264
setup->wIndex = 0;
265-
setup->wLength = 4096;
265+
setup->wLength = sizeof();
266266

267267
ret = usbh_control_transfer(rndis_class->hport, setup, (uint8_t *)resp);
268268
if (ret < 0) {

0 commit comments

Comments
 (0)