aboutsummaryrefslogtreecommitdiffstats
path: root/src/generic
diff options
context:
space:
mode:
Diffstat (limited to 'src/generic')
-rw-r--r--src/generic/usb_cdc.c3
-rw-r--r--src/generic/usb_cdc.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/generic/usb_cdc.c b/src/generic/usb_cdc.c
index 3899d7c3..a87ab810 100644
--- a/src/generic/usb_cdc.c
+++ b/src/generic/usb_cdc.c
@@ -412,9 +412,8 @@ static void
usb_state_ready(void)
{
struct usb_ctrlrequest req;
- int_fast8_t ret = usb_read_ep0(&req, sizeof(req));
+ int_fast8_t ret = usb_read_ep0_setup(&req, sizeof(req));
if (ret != sizeof(req))
- // XXX - should verify that packet was sent with a setup token
return;
switch (req.bRequest) {
case USB_REQ_GET_DESCRIPTOR: usb_req_get_descriptor(&req); break;
diff --git a/src/generic/usb_cdc.h b/src/generic/usb_cdc.h
index 21646900..4771d08c 100644
--- a/src/generic/usb_cdc.h
+++ b/src/generic/usb_cdc.h
@@ -15,6 +15,7 @@ enum {
int_fast8_t usb_read_bulk_out(void *data, uint_fast8_t max_len);
int_fast8_t usb_send_bulk_in(void *data, uint_fast8_t len);
int_fast8_t usb_read_ep0(void *data, uint_fast8_t max_len);
+int_fast8_t usb_read_ep0_setup(void *data, uint_fast8_t max_len);
int_fast8_t usb_send_ep0(const void *data, uint_fast8_t len);
int_fast8_t usb_send_ep0_progmem(const void *data, uint_fast8_t len);
void usb_stall_ep0(void);