alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 20:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/usb_host_cmock_add_device' into 'master'

Browse Source 
feature(usb_host): cmock add device

See merge request espressif/esp-idf!34932
This commit is contained in:
Peter Marcisovsky
2024-12-17 22:01:22 +08:00
parent 54b0d8774e 3cef3baeba
commit 13e8541007
6 changed files with 688 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/usb/private_include/usb_private.h
View File

@@ -10,6 +10,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <sys/queue.h>
#include "esp_assert.h"
#include "usb/usb_types_ch9.h"
#include "usb/usb_types_stack.h"
@@ -34,7 +35,7 @@ typedef struct {
int num_isoc_packets;
usb_isoc_packet_desc_t isoc_packet_desc[0];
} usb_transfer_dummy_t;
_Static_assert(sizeof(usb_transfer_dummy_t) == sizeof(usb_transfer_t), "usb_transfer_dummy_t does not match usb_transfer_t");
ESP_STATIC_ASSERT(sizeof(usb_transfer_dummy_t) == sizeof(usb_transfer_t), "usb_transfer_dummy_t does not match usb_transfer_t");
struct urb_s {
TAILQ_ENTRY(urb_s) tailq_entry;

10
components/usb/usb_private.c
View File

@@ -15,10 +15,18 @@ urb_t *urb_alloc(size_t data_buffer_size, int num_isoc_packets)
if (urb == NULL || data_buffer == NULL) {
goto err;
}
#if CONFIG_IDF_TARGET_LINUX
// heap_caps_get_allocated_size() return 0 on Linux target
const size_t allocated_size = data_buffer_size;
#else
const size_t allocated_size = heap_caps_get_allocated_size(data_buffer);
#endif
// Cast as dummy transfer so that we can assign to const fields
usb_transfer_dummy_t *dummy_transfer = (usb_transfer_dummy_t *)&urb->transfer;
dummy_transfer->data_buffer = data_buffer;
dummy_transfer->data_buffer_size = heap_caps_get_allocated_size(data_buffer);
dummy_transfer->data_buffer_size = allocated_size;
dummy_transfer->num_isoc_packets = num_isoc_packets;
return urb;
err: