From 01099f01ec321c5779002c0e2fa7600bb2e9dc54 Mon Sep 17 00:00:00 2001 From: pamaury Date: Tue, 13 Apr 2010 08:40:21 +0000 Subject: [PATCH] Attempt to have a consistent coding convention in usb_core.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25617 a1c6a512-1295-4272-9138-f99709370657 --- firmware/usbstack/usb_core.c | 261 ++++++++++++++++++++----------------------- 1 file changed, 124 insertions(+), 137 deletions(-) diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index b7334879f..c3435393c 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c @@ -98,7 +98,7 @@ static struct usb_config_descriptor __attribute__((aligned(2))) .bConfigurationValue = 1, .iConfiguration = 0, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, - .bMaxPower = (USB_MAX_CURRENT+1) / 2, /* In 2mA units */ + .bMaxPower = (USB_MAX_CURRENT + 1) / 2, /* In 2mA units */ }; static const struct usb_qualifier_descriptor __attribute__((aligned(2))) @@ -119,7 +119,7 @@ static const struct usb_string_descriptor __attribute__((aligned(2))) { 24, USB_DT_STRING, - {'R','o','c','k','b','o','x','.','o','r','g'} + {'R', 'o', 'c', 'k', 'b', 'o', 'x', '.', 'o', 'r', 'g'} }; static const struct usb_string_descriptor __attribute__((aligned(2))) @@ -127,9 +127,9 @@ static const struct usb_string_descriptor __attribute__((aligned(2))) { 42, USB_DT_STRING, - {'R','o','c','k','b','o','x',' ', - 'm','e','d','i','a',' ', - 'p','l','a','y','e','r'} + {'R', 'o', 'c', 'k', 'b', 'o', 'x', ' ', + 'm', 'e', 'd', 'i', 'a', ' ', + 'p', 'l', 'a', 'y', 'e', 'r'} }; static struct usb_string_descriptor __attribute__((aligned(2))) @@ -137,9 +137,10 @@ static struct usb_string_descriptor __attribute__((aligned(2))) { 84, USB_DT_STRING, - {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0', - '0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0', - '0','0','0','0','0','0','0','0','0'} + {'0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', + '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', + '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', + '0', '0', '0', '0', '0', '0', '0', '0'} }; /* Generic for all targets */ @@ -167,8 +168,8 @@ 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,unsigned char* dest); +typedef void (*completion_handler_t)(int ep, int dir, int status, int length); +typedef bool (*control_handler_t)(struct usb_ctrlrequest* req, unsigned char* dest); static struct { @@ -261,31 +262,31 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req); static unsigned char response_data[256] USB_DEVBSS_ATTR; -static short hex[16] = {'0','1','2','3','4','5','6','7', - '8','9','A','B','C','D','E','F'}; +static short hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; #ifdef IPOD_ARCH static void set_serial_descriptor(void) { #ifdef IPOD_VIDEO - uint32_t* serial = (uint32_t*)(0x20004034); + uint32_t* serial = (uint32_t*)0x20004034; #else - uint32_t* serial = (uint32_t*)(0x20002034); + uint32_t* serial = (uint32_t*)0x20002034; #endif /* We need to convert from a little-endian 64-bit int into a utf-16 string of hex characters */ short* p = &usb_string_iSerial.wString[24]; uint32_t x; - int i,j; + int i, j; - for (i = 0; i < 2; i++) { + for(i = 0; i < 2; i++) { x = serial[i]; - for (j=0;j<8;j++) { + for(j = 0; j < 8; j++) { *p-- = hex[x & 0xf]; x >>= 4; } } - usb_string_iSerial.bLength=52; + usb_string_iSerial.bLength = 52; } #elif defined(HAVE_AS3514) static void set_serial_descriptor(void) @@ -296,11 +297,11 @@ static void set_serial_descriptor(void) int i; ascodec_readbytes(AS3514_UID_0, 0x10, serial); - for (i = 0; i < 16; i++) { + for(i = 0; i < 16; i++) { *p++ = hex[(serial[i] >> 4) & 0xF]; *p++ = hex[(serial[i] >> 0) & 0xF]; } - usb_string_iSerial.bLength=68; + usb_string_iSerial.bLength = 68; } #elif (CONFIG_STORAGE & STORAGE_ATA) /* If we don't know the device serial number, use the one @@ -312,14 +313,14 @@ static void set_serial_descriptor(void) unsigned short x; int i; - for (i = 10; i < 20; i++) { + for(i = 10; i < 20; i++) { x = identify[i]; *p++ = hex[(x >> 12) & 0xF]; *p++ = hex[(x >> 8) & 0xF]; *p++ = hex[(x >> 4) & 0xF]; *p++ = hex[(x >> 0) & 0xF]; } - usb_string_iSerial.bLength=84; + usb_string_iSerial.bLength = 84; } #elif (CONFIG_STORAGE & STORAGE_RAMDISK) /* This "serial number" isn't unique, but it should never actually @@ -328,11 +329,11 @@ static void set_serial_descriptor(void) { short* p = &usb_string_iSerial.wString[1]; int i; - for (i = 0; i < 16; i++) { - *p++ = hex[(2*i)&0xF]; - *p++ = hex[(2*i+1)&0xF]; + for(i = 0; i < 16; i++) { + *p++ = hex[(2 * i) & 0xF]; + *p++ = hex[(2 * i + 1) & 0xF]; } - usb_string_iSerial.bLength=68; + usb_string_iSerial.bLength = 68; } #else static void set_serial_descriptor(void) @@ -352,10 +353,9 @@ void usb_core_init(void) /* class driver init functions should be safe to call even if the driver * won't be used. This simplifies other logic (i.e. we don't need to know * yet which drivers will be enabled */ - for(i=0;iendpoint; @@ -390,18 +388,17 @@ void usb_core_handle_transfer_completion( switch(ep) { case EP_CONTROL: logf("ctrl handled %ld",current_tick); - usb_core_control_request_handler( - (struct usb_ctrlrequest*)event->data); + usb_core_control_request_handler((struct usb_ctrlrequest*)event->data); break; default: handler = ep_data[ep].completion_handler[EP_DIR(event->dir)]; if(handler != NULL) - handler(ep,event->dir,event->status,event->length); + handler(ep, event->dir, event->status, event->length); break; } } -void usb_core_enable_driver(int driver,bool enabled) +void usb_core_enable_driver(int driver, bool enabled) { drivers[driver].enabled = enabled; } @@ -414,37 +411,31 @@ bool usb_core_driver_enabled(int driver) bool usb_core_any_exclusive_storage(void) { int i; - for(i=0;iwIndex; bool handled=false; - for(i=0;ibRequest, req->wValue>>8); + logf("bad req:desc %d:%d", req->bRequest, req->wValue >> 8); usb_drv_stall(EP_CONTROL, true, true); } } @@ -539,7 +530,7 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req) int length = req->wLength; int index = req->wValue & 0xff; - switch(req->wValue>>8) { /* type */ + switch(req->wValue >> 8) { /* type */ case USB_DT_DEVICE: ptr = &device_descriptor; size = sizeof(struct usb_device_descriptor); @@ -550,8 +541,8 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req) int i, max_packet_size; if(req->wValue>>8==USB_DT_CONFIG) { - max_packet_size=(usb_drv_port_speed() ? 512 : 64); - config_descriptor.bDescriptorType=USB_DT_CONFIG; + max_packet_size = (usb_drv_port_speed() ? 512 : 64); + config_descriptor.bDescriptorType = USB_DT_CONFIG; } else { max_packet_size=(usb_drv_port_speed() ? 64 : 512); @@ -560,15 +551,14 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req) } size = sizeof(struct usb_config_descriptor); - for(i=0;ibLength; ptr = usb_strings[index]; } else { - logf("bad string id %d",index); - usb_drv_stall(EP_CONTROL,true,true); + logf("bad string id %d", index); + usb_drv_stall(EP_CONTROL, true, true); } break; @@ -600,16 +590,15 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req) break; } - if (ptr) { - logf("data %d (%d)",size,length); - length = MIN(size,length); + if(ptr) { + logf("data %d (%d)", size, length); + length = MIN(size, length); - if (ptr != response_data) { - memcpy(response_data,ptr,length); - } + if (ptr != response_data) + memcpy(response_data, ptr, length); - usb_drv_recv(EP_CONTROL,NULL,0); - usb_drv_send(EP_CONTROL,response_data,length); + usb_drv_recv(EP_CONTROL, NULL, 0); + usb_drv_send(EP_CONTROL, response_data, length); } } @@ -621,7 +610,7 @@ static void request_handler_device(struct usb_ctrlrequest* req) case USB_REQ_GET_CONFIGURATION: { logf("usb_core: GET_CONFIG"); response_data[0] = (usb_state == ADDRESS ? 0 : 1); - usb_drv_recv(EP_CONTROL,NULL,0); + usb_drv_recv(EP_CONTROL, NULL, 0); usb_drv_send(EP_CONTROL, response_data, 1); break; } @@ -630,21 +619,20 @@ static void request_handler_device(struct usb_ctrlrequest* req) usb_drv_cancel_all_transfers(); if(req->wValue) { usb_state = CONFIGURED; - for(i=0;iwValue; logf("usb_core: SET_ADR %d", address); - usb_drv_send(EP_CONTROL,NULL,0); + usb_drv_send(EP_CONTROL, NULL, 0); usb_drv_cancel_all_transfers(); usb_address = address; usb_drv_set_address(usb_address); @@ -652,22 +640,22 @@ static void request_handler_device(struct usb_ctrlrequest* req) break; } 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); break; case USB_REQ_CLEAR_FEATURE: break; case USB_REQ_SET_FEATURE: if(req->wValue==USB_DEVICE_TEST_MODE) { - int mode=req->wIndex>>8; - usb_drv_send(EP_CONTROL,NULL,0); + int mode = req->wIndex >> 8; + usb_drv_send(EP_CONTROL, NULL, 0); usb_drv_set_test_mode(mode); } break; case USB_REQ_GET_STATUS: - response_data[0]= 0; - response_data[1]= 0; - usb_drv_recv(EP_CONTROL,NULL,0); + response_data[0] = 0; + response_data[1] = 0; + usb_drv_recv(EP_CONTROL, NULL, 0); usb_drv_send(EP_CONTROL, response_data, 2); break; default: @@ -681,23 +669,23 @@ static void request_handler_interface_standard(struct usb_ctrlrequest* req) { case USB_REQ_SET_INTERFACE: logf("usb_core: SET_INTERFACE"); - usb_drv_send(EP_CONTROL,NULL,0); + usb_drv_send(EP_CONTROL, NULL, 0); break; case USB_REQ_GET_INTERFACE: logf("usb_core: GET_INTERFACE"); - response_data[0]=0; - usb_drv_recv(EP_CONTROL,NULL,0); - usb_drv_send(EP_CONTROL,response_data,1); + response_data[0] = 0; + usb_drv_recv(EP_CONTROL, NULL, 0); + usb_drv_send(EP_CONTROL, response_data, 1); break; case USB_REQ_CLEAR_FEATURE: break; case USB_REQ_SET_FEATURE: break; case USB_REQ_GET_STATUS: - response_data[0]=0; - response_data[1]=0; - usb_drv_recv(EP_CONTROL,NULL,0); + response_data[0] = 0; + response_data[1] = 0; + usb_drv_recv(EP_CONTROL, NULL, 0); usb_drv_send(EP_CONTROL, response_data, 2); break; default: @@ -731,10 +719,10 @@ static void request_handler_endoint_drivers(struct usb_ctrlrequest* req) if(control_handler) handled = control_handler(req, response_data); - if (!handled) { + if(!handled) { /* nope. flag error */ - logf("usb bad req %d",req->bRequest); - usb_drv_stall(EP_CONTROL,true,true); + logf("usb bad req %d", req->bRequest); + usb_drv_stall(EP_CONTROL, true, true); } } @@ -742,27 +730,26 @@ static void request_handler_endpoint_standard(struct usb_ctrlrequest* req) { switch (req->bRequest) { case USB_REQ_CLEAR_FEATURE: - if (req->wValue==USB_ENDPOINT_HALT) { + if(req->wValue == USB_ENDPOINT_HALT) usb_drv_stall(EP_NUM(req->wIndex), false, EP_DIR(req->wIndex)); - } - usb_drv_send(EP_CONTROL,NULL,0); + + usb_drv_send(EP_CONTROL, NULL, 0); break; case USB_REQ_SET_FEATURE: - if (req->wValue==USB_ENDPOINT_HALT) { + if(req->wValue == USB_ENDPOINT_HALT) usb_drv_stall(EP_NUM(req->wIndex), true, EP_DIR(req->wIndex)); - } - usb_drv_send(EP_CONTROL,NULL,0); + + usb_drv_send(EP_CONTROL, NULL, 0); break; case USB_REQ_GET_STATUS: - response_data[0]=0; - response_data[1]=0; + response_data[0] = 0; + response_data[1] = 0; logf("usb_core: GET_STATUS"); - if(req->wIndex>0) { - response_data[0]=usb_drv_stalled(EP_NUM(req->wIndex), - EP_DIR(req->wIndex)); - } - usb_drv_recv(EP_CONTROL,NULL,0); - usb_drv_send(EP_CONTROL,response_data,2); + if(req->wIndex > 0) + response_data[0] = usb_drv_stalled(EP_NUM(req->wIndex), EP_DIR(req->wIndex)); + + usb_drv_recv(EP_CONTROL, NULL, 0); + usb_drv_send(EP_CONTROL, response_data, 2); break; default: request_handler_endoint_drivers(req); @@ -788,7 +775,7 @@ static void request_handler_endpoint(struct usb_ctrlrequest* req) /* Handling USB requests starts here */ static void usb_core_control_request_handler(struct usb_ctrlrequest* req) { - if (usb_state==DEFAULT) { + if(usb_state == DEFAULT) { set_serial_descriptor(); usb_core_set_serial_function_id(); @@ -815,12 +802,12 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req) /* called by usb_drv_int() */ void usb_core_bus_reset(void) { - usb_address=0; - usb_state=DEFAULT; + usb_address = 0; + usb_state = DEFAULT; } /* called by usb_drv_transfer_completed() */ -void usb_core_transfer_complete(int endpoint,int dir,int status,int length) +void usb_core_transfer_complete(int endpoint, int dir, int status, int length) { struct usb_transfer_completion_event_data *completion_event; @@ -830,13 +817,13 @@ void usb_core_transfer_complete(int endpoint,int dir,int status,int length) break; default: - completion_event=&ep_data[endpoint].completion_event[EP_DIR(dir)]; + completion_event = &ep_data[endpoint].completion_event[EP_DIR(dir)]; - completion_event->endpoint=endpoint; - completion_event->dir=dir; - completion_event->data=0; - completion_event->status=status; - completion_event->length=length; + completion_event->endpoint = endpoint; + completion_event->dir = dir; + completion_event->data = 0; + completion_event->status = status; + completion_event->length = length; /* All other endoints. Let the thread deal with it */ usb_signal_transfer_completion(completion_event); break; @@ -849,18 +836,18 @@ void usb_core_control_request(struct usb_ctrlrequest* req) struct usb_transfer_completion_event_data* completion_event = &ep_data[EP_CONTROL].completion_event[EP_DIR(USB_DIR_IN)]; - completion_event->endpoint=EP_CONTROL; - completion_event->dir=0; - completion_event->data=(void*)req; - completion_event->status=0; - completion_event->length=0; - logf("ctrl received %ld",current_tick); + completion_event->endpoint = EP_CONTROL; + completion_event->dir = 0; + completion_event->data = (void*)req; + completion_event->status = 0; + completion_event->length = 0; + logf("ctrl received %ld", current_tick); usb_signal_transfer_completion(completion_event); } #ifdef HAVE_USB_POWER unsigned short usb_allowed_current() { - return (usb_state==CONFIGURED) ? MAX(USB_MAX_CURRENT, 100) : 100; + return (usb_state == CONFIGURED) ? MAX(USB_MAX_CURRENT, 100) : 100; } #endif -- 2.11.4.GIT