len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: add request data argument to all control request handlers

Browse source 
Change-Id: I237143fa0d95c914b8e25ed22f8acde96ec00551
This commit is contained in:
Aidan MacDonald 2021-09-20 01:05:39 +01:00
parent b69d43c247
commit dff8320a5d
8 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/usbstack/usb_class_driver.h
View file

@ -80,7 +80,7 @@ struct usb_class_driver {
able to handle it, it should ack the request, and return true. Otherwise able to handle it, it should ack the request, and return true. Otherwise
it should return false. it should return false.
Optional function */ Optional function */
bool (*control_request)(struct usb_ctrlrequest* req, unsigned char *dest); bool (*control_request)(struct usb_ctrlrequest* req, void* reqdata, unsigned char *dest);
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
/* Tells the driver that a hotswappable disk/card was inserted or /* Tells the driver that a hotswappable disk/card was inserted or

50
firmware/usbstack/usb_core.c
View file

@ -172,7 +172,7 @@ static int usb_no_host_callback(struct timeout *tmo)
static int usb_core_num_interfaces; static int usb_core_num_interfaces;
typedef void (*completion_handler_t)(int ep, int dir, int status, int length); typedef void (*completion_handler_t)(int ep, int dir, int status, int length);
typedef bool (*control_handler_t)(struct usb_ctrlrequest* req, typedef bool (*control_handler_t)(struct usb_ctrlrequest* req, void* reqdata,
unsigned char* dest); unsigned char* dest);
static struct static struct
@ -262,7 +262,7 @@ static struct usb_class_driver drivers[USB_NUM_DRIVERS] =
#endif #endif
}; };
static void usb_core_control_request_handler(struct usb_ctrlrequest* req); static void usb_core_control_request_handler(struct usb_ctrlrequest* req, void* reqdata);
static unsigned char response_data[256] USB_DEVBSS_ATTR; static unsigned char response_data[256] USB_DEVBSS_ATTR;
@ -449,7 +449,7 @@ void usb_core_handle_transfer_completion(
((struct usb_ctrlrequest*)event->data[0])->bRequest); ((struct usb_ctrlrequest*)event->data[0])->bRequest);
usb_core_control_request_handler( usb_core_control_request_handler(
(struct usb_ctrlrequest*)event->data[0]); (struct usb_ctrlrequest*)event->data[0], event->data[1]);
break; break;
default: default:
handler = ep_data[ep].completion_handler[EP_DIR(event->dir)]; handler = ep_data[ep].completion_handler[EP_DIR(event->dir)];
@ -560,7 +560,7 @@ static void allocate_interfaces_and_endpoints(void)
} }
static void control_request_handler_drivers(struct usb_ctrlrequest* req) static void control_request_handler_drivers(struct usb_ctrlrequest* req, void* reqdata)
{ {
int i, interface = req->wIndex & 0xff; int i, interface = req->wIndex & 0xff;
bool handled = false; bool handled = false;
@ -571,7 +571,7 @@ static void control_request_handler_drivers(struct usb_ctrlrequest* req)
drivers[i].first_interface <= interface && drivers[i].first_interface <= interface &&
drivers[i].last_interface > interface) drivers[i].last_interface > interface)
{ {
handled = drivers[i].control_request(req, response_data); handled = drivers[i].control_request(req, reqdata, response_data);
if(handled) if(handled)
break; break;
} }
@ -583,7 +583,7 @@ static void control_request_handler_drivers(struct usb_ctrlrequest* req)
} }
} }
static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req) static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req, void* reqdata)
{ {
int size; int size;
const void* ptr = NULL; const void* ptr = NULL;
@ -662,7 +662,7 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req)
default: default:
logf("ctrl desc."); logf("ctrl desc.");
control_request_handler_drivers(req); control_request_handler_drivers(req, reqdata);
break; break;
} }
@ -718,7 +718,7 @@ static void usb_core_do_clear_feature(int recip, int recip_nr, int feature)
} }
} }
static void request_handler_device(struct usb_ctrlrequest* req) static void request_handler_device(struct usb_ctrlrequest* req, void* reqdata)
{ {
switch(req->bRequest) { switch(req->bRequest) {
case USB_REQ_GET_CONFIGURATION: { case USB_REQ_GET_CONFIGURATION: {
@ -744,7 +744,7 @@ static void request_handler_device(struct usb_ctrlrequest* req)
} }
case USB_REQ_GET_DESCRIPTOR: case USB_REQ_GET_DESCRIPTOR:
logf("usb_core: GET_DESC %d", req->wValue >> 8); logf("usb_core: GET_DESC %d", req->wValue >> 8);
request_handler_device_get_descriptor(req); request_handler_device_get_descriptor(req, reqdata);
break; break;
case USB_REQ_CLEAR_FEATURE: case USB_REQ_CLEAR_FEATURE:
break; break;
@ -768,7 +768,7 @@ static void request_handler_device(struct usb_ctrlrequest* req)
} }
} }
static void request_handler_interface_standard(struct usb_ctrlrequest* req) static void request_handler_interface_standard(struct usb_ctrlrequest* req, void* reqdata)
{ {
switch (req->bRequest) switch (req->bRequest)
{ {
@ -794,19 +794,19 @@ static void request_handler_interface_standard(struct usb_ctrlrequest* req)
usb_drv_send(EP_CONTROL, response_data, 2); usb_drv_send(EP_CONTROL, response_data, 2);
break; break;
default: default:
control_request_handler_drivers(req); control_request_handler_drivers(req, reqdata);
break; break;
} }
} }
static void request_handler_interface(struct usb_ctrlrequest* req) static void request_handler_interface(struct usb_ctrlrequest* req, void* reqdata)
{ {
switch(req->bRequestType & USB_TYPE_MASK) { switch(req->bRequestType & USB_TYPE_MASK) {
case USB_TYPE_STANDARD: case USB_TYPE_STANDARD:
request_handler_interface_standard(req); request_handler_interface_standard(req, reqdata);
break; break;
case USB_TYPE_CLASS: case USB_TYPE_CLASS:
control_request_handler_drivers(req); control_request_handler_drivers(req, reqdata);
break; break;
case USB_TYPE_VENDOR: case USB_TYPE_VENDOR:
default: default:
@ -816,7 +816,7 @@ static void request_handler_interface(struct usb_ctrlrequest* req)
} }
} }
static void request_handler_endoint_drivers(struct usb_ctrlrequest* req) static void request_handler_endoint_drivers(struct usb_ctrlrequest* req, void* reqdata)
{ {
bool handled = false; bool handled = false;
control_handler_t control_handler = NULL; control_handler_t control_handler = NULL;
@ -826,7 +826,7 @@ static void request_handler_endoint_drivers(struct usb_ctrlrequest* req)
ep_data[EP_NUM(req->wIndex)].control_handler[EP_DIR(req->wIndex)]; ep_data[EP_NUM(req->wIndex)].control_handler[EP_DIR(req->wIndex)];
if(control_handler) if(control_handler)
handled = control_handler(req, response_data); handled = control_handler(req, reqdata, response_data);
if(!handled) { if(!handled) {
/* nope. flag error */ /* nope. flag error */
@ -835,7 +835,7 @@ static void request_handler_endoint_drivers(struct usb_ctrlrequest* req)
} }
} }
static void request_handler_endpoint_standard(struct usb_ctrlrequest* req) static void request_handler_endpoint_standard(struct usb_ctrlrequest* req, void* reqdata)
{ {
switch (req->bRequest) { switch (req->bRequest) {
case USB_REQ_CLEAR_FEATURE: case USB_REQ_CLEAR_FEATURE:
@ -863,19 +863,19 @@ static void request_handler_endpoint_standard(struct usb_ctrlrequest* req)
usb_drv_send(EP_CONTROL, response_data, 2); usb_drv_send(EP_CONTROL, response_data, 2);
break; break;
default: default:
request_handler_endoint_drivers(req); request_handler_endoint_drivers(req, reqdata);
break; break;
} }
} }
static void request_handler_endpoint(struct usb_ctrlrequest* req) static void request_handler_endpoint(struct usb_ctrlrequest* req, void* reqdata)
{ {
switch(req->bRequestType & USB_TYPE_MASK) { switch(req->bRequestType & USB_TYPE_MASK) {
case USB_TYPE_STANDARD: case USB_TYPE_STANDARD:
request_handler_endpoint_standard(req); request_handler_endpoint_standard(req, reqdata);
break; break;
case USB_TYPE_CLASS: case USB_TYPE_CLASS:
request_handler_endoint_drivers(req); request_handler_endoint_drivers(req, reqdata);
break; break;
case USB_TYPE_VENDOR: case USB_TYPE_VENDOR:
default: default:
@ -886,7 +886,7 @@ static void request_handler_endpoint(struct usb_ctrlrequest* req)
} }
/* Handling USB requests starts here */ /* Handling USB requests starts here */
static void usb_core_control_request_handler(struct usb_ctrlrequest* req) static void usb_core_control_request_handler(struct usb_ctrlrequest* req, void* reqdata)
{ {
#ifdef HAVE_USB_CHARGING_ENABLE #ifdef HAVE_USB_CHARGING_ENABLE
timeout_cancel(&usb_no_host_timeout); timeout_cancel(&usb_no_host_timeout);
@ -904,13 +904,13 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
switch(req->bRequestType & USB_RECIP_MASK) { switch(req->bRequestType & USB_RECIP_MASK) {
case USB_RECIP_DEVICE: case USB_RECIP_DEVICE:
request_handler_device(req); request_handler_device(req, reqdata);
break; break;
case USB_RECIP_INTERFACE: case USB_RECIP_INTERFACE:
request_handler_interface(req); request_handler_interface(req, reqdata);
break; break;
case USB_RECIP_ENDPOINT: case USB_RECIP_ENDPOINT:
request_handler_endpoint(req); request_handler_endpoint(req, reqdata);
break; break;
case USB_RECIP_OTHER: case USB_RECIP_OTHER:
logf("unsupported recipient"); logf("unsupported recipient");

4
firmware/usbstack/usb_hid.c
View file

@ -747,8 +747,10 @@ static int usb_hid_get_report(struct usb_ctrlrequest *req, unsigned char** dest)
} }
/* called by usb_core_control_request() */ /* called by usb_core_control_request() */
bool usb_hid_control_request(struct usb_ctrlrequest *req, unsigned char *dest) bool usb_hid_control_request(struct usb_ctrlrequest *req, void *reqdata, unsigned char *dest)
{ {
(void)reqdata;
unsigned char *orig_dest = dest; unsigned char *orig_dest = dest;
switch (req->bRequestType & USB_TYPE_MASK) switch (req->bRequestType & USB_TYPE_MASK)
{ {

2
firmware/usbstack/usb_hid.h
View file

@ -32,7 +32,7 @@ void usb_hid_init_connection(void);
void usb_hid_init(void); void usb_hid_init(void);
void usb_hid_disconnect(void); void usb_hid_disconnect(void);
void usb_hid_transfer_complete(int ep, int dir, int status, int length); void usb_hid_transfer_complete(int ep, int dir, int status, int length);
bool usb_hid_control_request(struct usb_ctrlrequest* req, unsigned char* dest); bool usb_hid_control_request(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest);
void usb_hid_send(usage_page_t usage_page, int id); void usb_hid_send(usage_page_t usage_page, int id);

4
firmware/usbstack/usb_serial.c
View file

@ -277,11 +277,13 @@ int usb_serial_get_config_descriptor(unsigned char *dest, int max_packet_size)
} }
/* called by usb_core_control_request() */ /* called by usb_core_control_request() */
bool usb_serial_control_request(struct usb_ctrlrequest* req, unsigned char* dest) bool usb_serial_control_request(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest)
{ {
bool handled = false; bool handled = false;
(void)dest; (void)dest;
(void)reqdata;
if (req->wIndex != control_interface) if (req->wIndex != control_interface)
{ {
return false; return false;

2
firmware/usbstack/usb_serial.h
View file

@ -30,7 +30,7 @@ void usb_serial_init_connection(void);
void usb_serial_init(void); void usb_serial_init(void);
void usb_serial_disconnect(void); void usb_serial_disconnect(void);
void usb_serial_transfer_complete(int ep,int dir, int status, int length); void usb_serial_transfer_complete(int ep,int dir, int status, int length);
bool usb_serial_control_request(struct usb_ctrlrequest* req, unsigned char *dest); bool usb_serial_control_request(struct usb_ctrlrequest* req, void* reqdata, unsigned char *dest);
void usb_serial_send(const unsigned char *data, int length); void usb_serial_send(const unsigned char *data, int length);

4
firmware/usbstack/usb_storage.c
View file

@ -673,11 +673,13 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
} }
/* called by usb_core_control_request() */ /* called by usb_core_control_request() */
bool usb_storage_control_request(struct usb_ctrlrequest* req, unsigned char* dest) bool usb_storage_control_request(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest)
{ {
bool handled = false; bool handled = false;
(void)dest; (void)dest;
(void)reqdata;
switch (req->bRequest) { switch (req->bRequest) {
case USB_BULK_GET_MAX_LUN: { case USB_BULK_GET_MAX_LUN: {
*tb.max_lun = storage_num_drives() - 1; *tb.max_lun = storage_num_drives() - 1;

2
firmware/usbstack/usb_storage.h
View file

@ -30,7 +30,7 @@ void usb_storage_init_connection(void);
void usb_storage_disconnect(void); void usb_storage_disconnect(void);
void usb_storage_init(void); void usb_storage_init(void);
void usb_storage_transfer_complete(int ep,int dir,int state,int length); void usb_storage_transfer_complete(int ep,int dir,int state,int length);
bool usb_storage_control_request(struct usb_ctrlrequest* req, unsigned char* dest); bool usb_storage_control_request(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest);
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
void usb_storage_notify_hotswap(int volume,bool inserted); void usb_storage_notify_hotswap(int volume,bool inserted);
#endif #endif