diff options
| author | sakimisu <[email protected]> | 2023-01-15 17:12:13 +0800 |
|---|---|---|
| committer | sakimisu <[email protected]> | 2023-01-15 17:20:31 +0800 |
| commit | d0890c2caf080b31e5eff8ae54651bb8db3ec720 (patch) | |
| tree | b647fe88b3f7dcaace835cd86c0c14efcef6f79b | |
| parent | 2c24b54bf103cabd01890dc1a4f2583b1fadf64d (diff) | |
fix class get data due to 528d8dc9d6d2c1150b9f78dfc0c512745185dc4c
| -rw-r--r-- | class/audio/usbd_audio.c | 2 | ||||
| -rw-r--r-- | class/dfu/usbd_dfu.c | 10 | ||||
| -rw-r--r-- | class/msc/usbd_msc.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/class/audio/usbd_audio.c b/class/audio/usbd_audio.c index aab1a6be..b6b3d274 100644 --- a/class/audio/usbd_audio.c +++ b/class/audio/usbd_audio.c @@ -300,7 +300,7 @@ static int audio_class_interface_request_handler(struct usb_setup_packet *setup, usbd_audio_get_sampling_freq_table(entity_id, &sampling_freq_table); num = (uint16_t)((uint16_t)(sampling_freq_table[1] << 8) | ((uint16_t)sampling_freq_table[0])); - *data = sampling_freq_table; + memcpy(*data, sampling_freq_table, (12 * num + 2)); *len = (12 * num + 2); USB_LOG_DBG("Get sampling_freq_table entity_id:%d ch[%d] addr:%x\r\n", entity_id, ch, (uint32_t)sampling_freq_table); } else { diff --git a/class/dfu/usbd_dfu.c b/class/dfu/usbd_dfu.c index 3042e4df..e22dfcaf 100644 --- a/class/dfu/usbd_dfu.c +++ b/class/dfu/usbd_dfu.c @@ -130,7 +130,7 @@ static void dfu_request_upload(struct usb_setup_packet *setup, uint8_t **data, u usbd_dfu_cfg.buffer.d8[2] = DFU_CMD_ERASE; /* Send the status data over EP0 */ - *data = usbd_dfu_cfg.buffer.d8; + memcpy(*data, usbd_dfu_cfg.buffer.d8, 3); *len = 3; } else if (usbd_dfu_cfg.wblock_num > 1U) { usbd_dfu_cfg.dev_state = DFU_STATE_DFU_UPLOAD_IDLE; @@ -146,7 +146,7 @@ static void dfu_request_upload(struct usb_setup_packet *setup, uint8_t **data, u phaddr = dfu_read_flash((uint8_t *)addr, usbd_dfu_cfg.buffer.d8, usbd_dfu_cfg.wlength); /* Send the status data over EP0 */ - *data = usbd_dfu_cfg.buffer.d8; + memcpy(*data, usbd_dfu_cfg.buffer.d8, usbd_dfu_cfg.wlength); *len = usbd_dfu_cfg.wlength; } else /* unsupported usbd_dfu_cfg.wblock_num */ { @@ -369,9 +369,7 @@ static void dfu_request_getstatus(struct usb_setup_packet *setup, uint8_t **data } /* Send the status data over EP0 */ - uint8_t temp_data[6]; - memcpy(temp_data, usbd_dfu_cfg.dev_status, 6); - *data = temp_data; + memcpy(*data, usbd_dfu_cfg.dev_status, 6); *len = 6; if (usbd_dfu_cfg.firmwar_flag == 1) { @@ -407,7 +405,7 @@ static void dfu_request_clrstatus(void) static void dfu_request_getstate(struct usb_setup_packet *setup, uint8_t **data, uint32_t *len) { /* Return the current state of the DFU interface */ - *data = &usbd_dfu_cfg.dev_state; + (*data)[0] = usbd_dfu_cfg.dev_state; *len = 1; } diff --git a/class/msc/usbd_msc.c b/class/msc/usbd_msc.c index 2220e112..cf249611 100644 --- a/class/msc/usbd_msc.c +++ b/class/msc/usbd_msc.c @@ -60,7 +60,7 @@ static int msc_storage_class_interface_request_handler(struct usb_setup_packet * break; case MSC_REQUEST_GET_MAX_LUN: - *data = (uint8_t *)(&usbd_msc_cfg.max_lun); + (*data)[0] = usbd_msc_cfg.max_lun; *len = 1; break; |
