diff options
| author | Dave Chapman <dave@dchapman.com> | 2007-08-27 22:07:36 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2007-08-27 22:07:36 +0000 |
| commit | 03745f4ed33f9dadc16bfc0e26472203e33b43cf (patch) | |
| tree | c5ba1df703895f67f72eaca7776eaf65b191ce31 /firmware/usbstack/drivers/device/usb_storage.c | |
| parent | a6d52a8305ba355aeeef17a0648d40e6e4f8fa70 (diff) | |
| download | rockbox-03745f4ed33f9dadc16bfc0e26472203e33b43cf.zip rockbox-03745f4ed33f9dadc16bfc0e26472203e33b43cf.tar.gz rockbox-03745f4ed33f9dadc16bfc0e26472203e33b43cf.tar.bz2 rockbox-03745f4ed33f9dadc16bfc0e26472203e33b43cf.tar.xz | |
Cosmetic changes only - tab, whitespace and brace policing
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14484 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usbstack/drivers/device/usb_storage.c')
| -rw-r--r-- | firmware/usbstack/drivers/device/usb_storage.c | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/firmware/usbstack/drivers/device/usb_storage.c b/firmware/usbstack/drivers/device/usb_storage.c index 0cb1f10..355fc4d 100644 --- a/firmware/usbstack/drivers/device/usb_storage.c +++ b/firmware/usbstack/drivers/device/usb_storage.c @@ -128,8 +128,8 @@ static int set_config(int config); /*-------------------------------------------------------------------------*/ -void usb_storage_driver_init(void) { - +void usb_storage_driver_init(void) +{ logf("usb storage: register"); usb_device_driver_register(&usb_storage_driver); } @@ -137,41 +137,41 @@ void usb_storage_driver_init(void) { /*-------------------------------------------------------------------------*/ /* device driver ops */ -void usb_storage_driver_bind(void* controler_ops) { - +void usb_storage_driver_bind(void* controler_ops) +{ ops = controler_ops; - + /* serach and asign endpoints */ usb_ep_autoconfig_reset(); - + dev.in = usb_ep_autoconfig(&storage_bulk_in_desc); - if (!dev.in) { - goto autoconf_fail; - } - dev.in->claimed = true; - logf("usb storage: in: %s", dev.in->name); - - dev.out = usb_ep_autoconfig(&storage_bulk_out_desc); - if (!dev.out) { - goto autoconf_fail; - } - dev.out->claimed = true; - logf("usb storage: out: %s", dev.out->name); - - return; - + if (!dev.in) { + goto autoconf_fail; + } + dev.in->claimed = true; + logf("usb storage: in: %s", dev.in->name); + + dev.out = usb_ep_autoconfig(&storage_bulk_out_desc); + if (!dev.out) { + goto autoconf_fail; + } + dev.out->claimed = true; + logf("usb storage: out: %s", dev.out->name); + + return; + autoconf_fail: - logf("failed to find endpoints"); + logf("failed to find endpoints"); } -int usb_storage_driver_request(struct usb_ctrlrequest* request) { - +int usb_storage_driver_request(struct usb_ctrlrequest* request) +{ int ret = -EOPNOTSUPP; logf("usb storage: request"); res.length = 0; res.buf = NULL; - + switch (request->bRequestType & USB_TYPE_MASK) { case USB_TYPE_STANDARD: @@ -187,12 +187,12 @@ int usb_storage_driver_request(struct usb_ctrlrequest* request) { case USB_DT_CONFIG: logf("usb storage: sending config desc"); - - ret = config_buf(buf, request->wValue >> 8, request->wValue & 0xff); - if (ret >= 0) { - logf("%d, vs %d", request->wLength, ret); - ret = MIN(request->wLength, (uint16_t)ret); - } + + ret = config_buf(buf, request->wValue >> 8, request->wValue & 0xff); + if (ret >= 0) { + logf("%d, vs %d", request->wLength, ret); + ret = MIN(request->wLength, (uint16_t)ret); + } res.buf = buf; break; } @@ -202,68 +202,68 @@ int usb_storage_driver_request(struct usb_ctrlrequest* request) { logf("usb storage: set configuration %d", request->wValue); ret = set_config(request->wValue); break; - + case USB_REQ_SET_INTERFACE: logf("usb storage: set interface"); ret = 0; break; } - + case USB_TYPE_CLASS: - - switch (request->bRequest) { - case USB_BULK_RESET_REQUEST: - logf("usb storage: bulk reset"); - break; - - case USB_BULK_GET_MAX_LUN_REQUEST: - logf("usb storage: get max lun"); - /* we support no LUNs (Logical Unit Number) */ - buf[0] = 0; - ret = 1; - break; - } - break; + + switch (request->bRequest) { + case USB_BULK_RESET_REQUEST: + logf("usb storage: bulk reset"); + break; + + case USB_BULK_GET_MAX_LUN_REQUEST: + logf("usb storage: get max lun"); + /* we support no LUNs (Logical Unit Number) */ + buf[0] = 0; + ret = 1; + break; + } + break; } if (ret >= 0) { res.length = ret; ret = ops->send(NULL, &res); } - + return ret; } /*-------------------------------------------------------------------------*/ /* S/GET CONFIGURATION helpers */ -static int config_buf(uint8_t *buf, uint8_t type, unsigned index) { - - int len; - - /* only one configuration */ - if (index != 0) { - return -EINVAL; - } - - len = usb_stack_configdesc(&storage_config_desc, buf, BUFFER_SIZE, storage_fullspeed_function); - if (len < 0) { - return len; - } - ((struct usb_config_descriptor *)buf)->bDescriptorType = type; - return len; -} +static int config_buf(uint8_t *buf, uint8_t type, unsigned index) +{ + int len; -static int set_config(int config) { + /* only one configuration */ + if (index != 0) { + return -EINVAL; + } + len = usb_stack_configdesc(&storage_config_desc, buf, BUFFER_SIZE, storage_fullspeed_function); + if (len < 0) { + return len; + } + ((struct usb_config_descriptor *)buf)->bDescriptorType = type; + return len; +} + +static int set_config(int config) +{ /* enable endpoints */ logf("setup %s", dev.in->name); ops->enable(dev.in); logf("setup %s", dev.out->name); ops->enable(dev.out); - + /* setup buffers */ - + return 0; } |