From b69d43c247994c846da75c4b35d4351fbf96984d Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Mon, 20 Sep 2021 00:58:33 +0100 Subject: usb: give USB transfer completion events two data pointers Change-Id: I036cc7f02c2f86a364d2dba59493a6aa893f2c16 --- firmware/usbstack/usb_core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'firmware/usbstack/usb_core.c') diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index 1f17872ba8..4bc0443477 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c @@ -446,10 +446,10 @@ void usb_core_handle_transfer_completion( case EP_CONTROL: logf("ctrl handled %ld req=0x%x", current_tick, - ((struct usb_ctrlrequest*)event->data)->bRequest); + ((struct usb_ctrlrequest*)event->data[0])->bRequest); usb_core_control_request_handler( - (struct usb_ctrlrequest*)event->data); + (struct usb_ctrlrequest*)event->data[0]); break; default: handler = ep_data[ep].completion_handler[EP_DIR(event->dir)]; @@ -952,7 +952,8 @@ void usb_core_transfer_complete(int endpoint, int dir, int status, int length) completion_event->endpoint = endpoint; completion_event->dir = dir; - completion_event->data = 0; + completion_event->data[0] = NULL; + completion_event->data[1] = NULL; completion_event->status = status; completion_event->length = length; /* All other endpoints. Let the thread deal with it */ @@ -984,7 +985,8 @@ void usb_core_legacy_control_request(struct usb_ctrlrequest* req) completion_event->endpoint = EP_CONTROL; completion_event->dir = 0; - completion_event->data = (void*)req; + completion_event->data[0] = (void*)req; + completion_event->data[1] = NULL; completion_event->status = 0; completion_event->length = 0; logf("ctrl received %ld, req=0x%x", current_tick, req->bRequest); -- cgit v1.2.3