From e47c5412cfbc146f0b07b9873d930610bd95447d Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 16 Feb 2023 22:54:30 +0100 Subject: [PATCH] Fixes for Pico SDK 1.5 Signed-off-by: Pol Henarejos --- src/usb/ccid/ccid.c | 8 ++++++-- src/usb/usb_descriptors.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/usb/ccid/ccid.c b/src/usb/ccid/ccid.c index 69514f4..12f072f 100644 --- a/src/usb/ccid/ccid.c +++ b/src/usb/ccid/ccid.c @@ -135,12 +135,16 @@ void tud_vendor_rx_cb(uint8_t itf) { } void tud_vendor_tx_cb(uint8_t itf, uint32_t sent_bytes) { - printf("written %ld\n", sent_bytes); + //printf("written %ld\n", sent_bytes); usb_write_flush(ITF_CCID); } int driver_write_ccid(const uint8_t *buffer, size_t buffer_size) { - return tud_vendor_write(buffer, buffer_size); + int r = tud_vendor_write(buffer, buffer_size); + if (r > 0) { + return MAX(tud_vendor_flush(), r); + } + return r; } size_t driver_read_ccid(uint8_t *buffer, size_t buffer_size) { diff --git a/src/usb/usb_descriptors.c b/src/usb/usb_descriptors.c index d6cd6b6..98bed73 100644 --- a/src/usb/usb_descriptors.c +++ b/src/usb/usb_descriptors.c @@ -132,7 +132,7 @@ tusb_desc_endpoint_t const desc_ep1 = { .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = TUSB_DIR_IN_MASK | 1, .bmAttributes.xfer = TUSB_XFER_BULK, - .wMaxPacketSize.size = (64), + .wMaxPacketSize = (64), .bInterval = 0 }; @@ -141,7 +141,7 @@ tusb_desc_endpoint_t const desc_ep2 = { .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = 2, .bmAttributes.xfer = TUSB_XFER_BULK, - .wMaxPacketSize.size = (64), + .wMaxPacketSize = (64), .bInterval = 0 }; #endif