yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

copy data into ep0 buffer at a unified location

Browse Source
This commit is contained in:
sakumisu
2024-04-30 14:21:22 +08:00
parent 8d18a8b6e5
commit 183d49efbd
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/usbd_core.c
View File

@@ -236,8 +236,8 @@ static bool usbd_get_descriptor(uint8_t busid, uint16_t type_index, uint8_t **da
/* nothing found */ /* nothing found */
USB_LOG_ERR("descriptor <type:%x,index:%x> not found!\r\n", type, index); USB_LOG_ERR("descriptor <type:%x,index:%x> not found!\r\n", type, index);
} else { } else {
// *data = desc; *data = desc;
memcpy(*data, desc, desc_len); //memcpy(*data, desc, desc_len);
*len = desc_len; *len = desc_len;
} }
return found; return found;
@@ -261,8 +261,8 @@ static bool usbd_get_descriptor(uint8_t busid, uint16_t type_index, uint8_t **da
return false; return false;
} }
//*data = (uint8_t *)g_usbd_core[busid].msosv1_desc->string; *data = (uint8_t *)g_usbd_core[busid].msosv1_desc->string;
memcpy(*data, (uint8_t *)g_usbd_core[busid].msosv1_desc->string, g_usbd_core[busid].msosv1_desc->string[0]); //memcpy(*data, (uint8_t *)g_usbd_core[busid].msosv1_desc->string, g_usbd_core[busid].msosv1_desc->string[0]);
*len = g_usbd_core[busid].msosv1_desc->string[0]; *len = g_usbd_core[busid].msosv1_desc->string[0];
return true; return true;
@@ -273,8 +273,8 @@ static bool usbd_get_descriptor(uint8_t busid, uint16_t type_index, uint8_t **da
return false; return false;
} }
//*data = g_usbd_core[busid].bos_desc->string; *data = g_usbd_core[busid].bos_desc->string;
memcpy(*data, (uint8_t *)g_usbd_core[busid].bos_desc->string, g_usbd_core[busid].bos_desc->string_len); //memcpy(*data, (uint8_t *)g_usbd_core[busid].bos_desc->string, g_usbd_core[busid].bos_desc->string_len);
*len = g_usbd_core[busid].bos_desc->string_len; *len = g_usbd_core[busid].bos_desc->string_len;
return true; return true;
} }
@@ -320,7 +320,8 @@ static bool usbd_get_descriptor(uint8_t busid, uint16_t type_index, uint8_t **da
/* normally length is at offset 0 */ /* normally length is at offset 0 */
*len = p[DESC_bLength]; *len = p[DESC_bLength];
} }
memcpy(*data, p, *len); *data = p;
//memcpy(*data, p, *len);
} else { } else {
/* nothing found */ /* nothing found */
USB_LOG_ERR("descriptor <type:0x%02x,index:0x%02x> not found!\r\n", type, index); USB_LOG_ERR("descriptor <type:0x%02x,index:0x%02x> not found!\r\n", type, index);
@@ -600,8 +601,8 @@ static bool usbd_std_interface_req_handler(uint8_t busid, struct usb_setup_packe
struct usbd_interface *intf = g_usbd_core[busid].intf[i]; struct usbd_interface *intf = g_usbd_core[busid].intf[i];
if (intf && (intf->intf_num == intf_num)) { if (intf && (intf->intf_num == intf_num)) {
//*data = (uint8_t *)intf->hid_report_descriptor; *data = (uint8_t *)intf->hid_report_descriptor;
memcpy(*data, intf->hid_report_descriptor, intf->hid_report_descriptor_len); //memcpy(*data, intf->hid_report_descriptor, intf->hid_report_descriptor_len);
*len = intf->hid_report_descriptor_len; *len = intf->hid_report_descriptor_len;
return true; return true;
} }
@@ -790,8 +791,8 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s
(g_usbd_core[busid].descriptors->msosv1_descriptor->compat_id[2] << 16) + (g_usbd_core[busid].descriptors->msosv1_descriptor->compat_id[2] << 16) +
(g_usbd_core[busid].descriptors->msosv1_descriptor->compat_id[3] << 24); (g_usbd_core[busid].descriptors->msosv1_descriptor->compat_id[3] << 24);
//*data = (uint8_t *)g_usbd_core[busid].descriptors->msosv1_descriptor->compat_id; *data = (uint8_t *)g_usbd_core[busid].descriptors->msosv1_descriptor->compat_id;
memcpy(*data, g_usbd_core[busid].descriptors->msosv1_descriptor->compat_id, desclen); //memcpy(*data, g_usbd_core[busid].descriptors->msosv1_descriptor->compat_id, desclen);
*len = desclen; *len = desclen;
return 0; return 0;
case 0x05: case 0x05:
@@ -801,8 +802,8 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s
(g_usbd_core[busid].descriptors->msosv1_descriptor->comp_id_property[setup->wValue][2] << 16) + (g_usbd_core[busid].descriptors->msosv1_descriptor->comp_id_property[setup->wValue][2] << 16) +
(g_usbd_core[busid].descriptors->msosv1_descriptor->comp_id_property[setup->wValue][3] << 24); (g_usbd_core[busid].descriptors->msosv1_descriptor->comp_id_property[setup->wValue][3] << 24);
//*data = (uint8_t *)g_usbd_core[busid].descriptors->msosv1_descriptor->comp_id_property[setup->wValue]; *data = (uint8_t *)g_usbd_core[busid].descriptors->msosv1_descriptor->comp_id_property[setup->wValue];
memcpy(*data, g_usbd_core[busid].descriptors->msosv1_descriptor->comp_id_property[setup->wValue], desclen); //memcpy(*data, g_usbd_core[busid].descriptors->msosv1_descriptor->comp_id_property[setup->wValue], desclen);
*len = desclen; *len = desclen;
return 0; return 0;
default: default:
@@ -817,8 +818,8 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s
USB_LOG_INFO("GET MS OS 2.0 Descriptor\r\n"); USB_LOG_INFO("GET MS OS 2.0 Descriptor\r\n");
desclen = g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id_len; desclen = g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id_len;
//*data = (uint8_t *)g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id; *data = (uint8_t *)g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id;
memcpy(*data, g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id, desclen); //memcpy(*data, g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id, desclen);
*len = g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id_len; *len = g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id_len;
return 0; return 0;
default: default:
@@ -833,8 +834,8 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s
USB_LOG_INFO("GET Webusb url Descriptor\r\n"); USB_LOG_INFO("GET Webusb url Descriptor\r\n");
desclen = g_usbd_core[busid].descriptors->webusb_url_descriptor->string_len; desclen = g_usbd_core[busid].descriptors->webusb_url_descriptor->string_len;
//*data = (uint8_t *)g_usbd_core[busid].descriptors->webusb_url_descriptor->string; *data = (uint8_t *)g_usbd_core[busid].descriptors->webusb_url_descriptor->string;
memcpy(*data, g_usbd_core[busid].descriptors->webusb_url_descriptor->string, desclen); //memcpy(*data, g_usbd_core[busid].descriptors->webusb_url_descriptor->string, desclen);
*len = desclen; *len = desclen;
return 0; return 0;
default: default:
@@ -849,22 +850,22 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s
switch (setup->wIndex) { switch (setup->wIndex) {
case 0x04: case 0x04:
USB_LOG_INFO("get Compat ID\r\n"); USB_LOG_INFO("get Compat ID\r\n");
//*data = (uint8_t *)msosv1_desc->compat_id; *data = (uint8_t *)g_usbd_core[busid].msosv1_desc->compat_id;
desclen = g_usbd_core[busid].msosv1_desc->compat_id[0] + desclen = g_usbd_core[busid].msosv1_desc->compat_id[0] +
(g_usbd_core[busid].msosv1_desc->compat_id[1] << 8) + (g_usbd_core[busid].msosv1_desc->compat_id[1] << 8) +
(g_usbd_core[busid].msosv1_desc->compat_id[2] << 16) + (g_usbd_core[busid].msosv1_desc->compat_id[2] << 16) +
(g_usbd_core[busid].msosv1_desc->compat_id[3] << 24); (g_usbd_core[busid].msosv1_desc->compat_id[3] << 24);
memcpy(*data, g_usbd_core[busid].msosv1_desc->compat_id, desclen); //memcpy(*data, g_usbd_core[busid].msosv1_desc->compat_id, desclen);
*len = desclen; *len = desclen;
return 0; return 0;
case 0x05: case 0x05:
USB_LOG_INFO("get Compat id properties\r\n"); USB_LOG_INFO("get Compat id properties\r\n");
//*data = (uint8_t *)msosv1_desc->comp_id_property[setup->wValue]; *data = (uint8_t *)g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue];
desclen = g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue][0] + desclen = g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue][0] +
(g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue][1] << 8) + (g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue][1] << 8) +
(g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue][2] << 16) + (g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue][2] << 16) +
(g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue][3] << 24); (g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue][3] << 24);
memcpy(*data, g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue], desclen); //memcpy(*data, g_usbd_core[busid].msosv1_desc->comp_id_property[setup->wValue], desclen);
*len = desclen; *len = desclen;
return 0; return 0;
default: default:
@@ -877,8 +878,8 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s
switch (setup->wIndex) { switch (setup->wIndex) {
case WINUSB_REQUEST_GET_DESCRIPTOR_SET: case WINUSB_REQUEST_GET_DESCRIPTOR_SET:
USB_LOG_INFO("GET MS OS 2.0 Descriptor\r\n"); USB_LOG_INFO("GET MS OS 2.0 Descriptor\r\n");
//*data = (uint8_t *)msosv2_desc->compat_id; *data = (uint8_t *)g_usbd_core[busid].msosv2_desc->compat_id;
memcpy(*data, g_usbd_core[busid].msosv2_desc->compat_id, g_usbd_core[busid].msosv2_desc->compat_id_len); //memcpy(*data, g_usbd_core[busid].msosv2_desc->compat_id, g_usbd_core[busid].msosv2_desc->compat_id_len);
*len = g_usbd_core[busid].msosv2_desc->compat_id_len; *len = g_usbd_core[busid].msosv2_desc->compat_id_len;
return 0; return 0;
default: default:
@@ -1045,9 +1046,19 @@ void usbd_event_ep0_setup_complete_handler(uint8_t busid, uint8_t *psetup)
g_usbd_core[busid].ep0_data_buf_residue = MIN(g_usbd_core[busid].ep0_data_buf_len, setup->wLength); g_usbd_core[busid].ep0_data_buf_residue = MIN(g_usbd_core[busid].ep0_data_buf_len, setup->wLength);
if (g_usbd_core[busid].ep0_data_buf_residue > CONFIG_USBDEV_REQUEST_BUFFER_LEN) { if (g_usbd_core[busid].ep0_data_buf_residue > CONFIG_USBDEV_REQUEST_BUFFER_LEN) {
USB_LOG_ERR("Request buffer too small\r\n"); USB_LOG_ERR("Request buffer too small\r\n");
usbd_ep_set_stall(busid, USB_CONTROL_IN_EP0);
return; return;
} }
/* use *data = xxx; g_usbd_core[busid].ep0_data_buf records real data address, we should copy data into ep0 buffer.
* Why we should copy once? because some chips are not access to flash with dma if real data address is in flash address(such as ch32).
*/
if (g_usbd_core[busid].ep0_data_buf != g_usbd_core[busid].req_data) {
memcpy(g_usbd_core[busid].req_data, g_usbd_core[busid].ep0_data_buf, g_usbd_core[busid].ep0_data_buf_residue);
} else {
/* use memcpy(*data, xxx, len); has copied into ep0 buffer, we do nothing */
}
/* Send data or status to host */ /* Send data or status to host */
usbd_ep_start_write(busid, USB_CONTROL_IN_EP0, g_usbd_core[busid].ep0_data_buf, g_usbd_core[busid].ep0_data_buf_residue); usbd_ep_start_write(busid, USB_CONTROL_IN_EP0, g_usbd_core[busid].ep0_data_buf, g_usbd_core[busid].ep0_data_buf_residue);
/* /*