Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow class drivers to reuse the core data buffer for control transfers. This doesn't make much difference right now, but it should keep HID memory usage lower (once HID is ready) (FS#10146 by Tomer Shalev)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20735 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2009-04-18 20:40:50 +00:00
parent 2c0da9d152
commit 3314f389ba
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
firmware/usbstack/usb_class_driver.h
View file

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

10
firmware/usbstack/usb_core.c
View file

@ -168,7 +168,7 @@ static enum { DEFAULT, ADDRESS, CONFIGURED } usb_state;
static int usb_core_num_interfaces;
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, unsigned char *dest);
static struct
{
@ -695,7 +695,7 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
drivers[i].first_interface <= (req->wIndex) &&
drivers[i].last_interface > (req->wIndex))
{
handled = drivers[i].control_request(req);
handled = drivers[i].control_request(req, response_data);
}
}
if(!handled) {
@ -735,8 +735,10 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
break;
default: {
bool handled=false;
if(ep_data[req->wIndex & 0xf].control_handler[0] != NULL)
handled = ep_data[req->wIndex & 0xf].control_handler[0](req);
if(ep_data[req->wIndex & 0xf].control_handler[0] != NULL) {
handled = ep_data[req->wIndex & 0xf].control_handler[0](req,
response_data);
}
if(!handled) {
/* nope. flag error */
logf("usb bad req %d", req->bRequest);

4
firmware/usbstack/usb_serial.c
View file

@ -117,9 +117,11 @@ int usb_serial_get_config_descriptor(unsigned char *dest,int max_packet_size)
}
/* called by usb_core_control_request() */
bool usb_serial_control_request(struct usb_ctrlrequest* req)
bool usb_serial_control_request(struct usb_ctrlrequest* req, unsigned char* dest)
{
bool handled = false;
(void)dest;
switch (req->bRequest) {
default:
logf("serial: unhandeld req %d", req->bRequest);

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_disconnect(void);
void usb_serial_transfer_complete(int ep,int dir, int status, int length);
bool usb_serial_control_request(struct usb_ctrlrequest* req);
bool usb_serial_control_request(struct usb_ctrlrequest* req, unsigned char *dest);
void usb_serial_send(unsigned char *data,int length);

4
firmware/usbstack/usb_storage.c
View file

@ -593,11 +593,11 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
}
/* called by usb_core_control_request() */
bool usb_storage_control_request(struct usb_ctrlrequest* req)
bool usb_storage_control_request(struct usb_ctrlrequest* req, unsigned char* dest)
{
bool handled = false;
(void)dest;
switch (req->bRequest) {
case USB_BULK_GET_MAX_LUN: {
#ifdef ONLY_EXPOSE_CARD_SLOT

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_init(void);
void usb_storage_transfer_complete(int ep,int dir,int state,int length);
bool usb_storage_control_request(struct usb_ctrlrequest* req);
bool usb_storage_control_request(struct usb_ctrlrequest* req, unsigned char* dest);
#ifdef HAVE_HOTSWAP
void usb_storage_notify_hotswap(int volume,bool inserted);
#endif