diff options
author | Piotr Esden-Tempski <piotr@esden.net> | 2015-12-15 00:57:15 +0300 |
---|---|---|
committer | Piotr Esden-Tempski <piotr@esden.net> | 2015-12-15 00:57:15 +0300 |
commit | b1049f9a6f43882968dcf82ca1df3f1eee67e367 (patch) | |
tree | 3a7b45ae32d4a69f70e6fff245ade0c7ca3cc015 /lib/usb | |
parent | 1f6fd11dd9ec3ad2ef719ee56ec092000f30b657 (diff) |
[Style] Stylefix sweep over the whole codebase.
Diffstat (limited to 'lib/usb')
-rw-r--r-- | lib/usb/usb_control.c | 6 | ||||
-rw-r--r-- | lib/usb/usb_efm32lg.c | 5 | ||||
-rw-r--r-- | lib/usb/usb_fx07_common.c | 3 | ||||
-rw-r--r-- | lib/usb/usb_msc.c | 55 | ||||
-rw-r--r-- | lib/usb/usb_standard.c | 22 |
5 files changed, 58 insertions, 33 deletions
diff --git a/lib/usb/usb_control.c b/lib/usb/usb_control.c index 69e14bb3..acaceb33 100644 --- a/lib/usb/usb_control.c +++ b/lib/usb/usb_control.c @@ -59,7 +59,8 @@ static void stall_transaction(usbd_device *usbd_dev) * @param ep_size * @return */ -static bool needs_zlp(uint16_t len, uint16_t wLength, uint8_t ep_size) { +static bool needs_zlp(uint16_t len, uint16_t wLength, uint8_t ep_size) +{ if (len < wLength) { if (len && (len % ep_size == 0)) { return true; @@ -109,7 +110,8 @@ static void usb_control_send_chunk(usbd_device *usbd_dev) usbd_dev->control_state.ctrl_len); usbd_dev->control_state.state = - usbd_dev->control_state.needs_zlp ? DATA_IN : LAST_DATA_IN; + usbd_dev->control_state.needs_zlp ? + DATA_IN : LAST_DATA_IN; usbd_dev->control_state.needs_zlp = false; usbd_dev->control_state.ctrl_len = 0; usbd_dev->control_state.ctrl_buf = NULL; diff --git a/lib/usb/usb_efm32lg.c b/lib/usb/usb_efm32lg.c index 439b815f..f0b2cc3d 100644 --- a/lib/usb/usb_efm32lg.c +++ b/lib/usb/usb_efm32lg.c @@ -51,7 +51,7 @@ static usbd_device *efm32lg_usbd_init(void) CMU_CMD = CMU_CMD_USBCCLKSEL_HFCLKNODIV; /* wait till clock not selected */ - while(!(CMU_STATUS & CMU_STATUS_USBCHFCLKSEL)); + while (!(CMU_STATUS & CMU_STATUS_USBCHFCLKSEL)); USB_GINTSTS = USB_GINTSTS_MMIS; @@ -179,7 +179,8 @@ static void efm32lg_endpoints_reset(usbd_device *usbd_dev) usbd_dev->fifo_mem_top = usbd_dev->fifo_mem_top_ep0; } -static void efm32lg_ep_stall_set(usbd_device *usbd_dev, uint8_t addr, uint8_t stall) +static void efm32lg_ep_stall_set(usbd_device *usbd_dev, uint8_t addr, + uint8_t stall) { (void)usbd_dev; if (addr == 0) { diff --git a/lib/usb/usb_fx07_common.c b/lib/usb/usb_fx07_common.c index ffb46f11..a2fab525 100644 --- a/lib/usb/usb_fx07_common.c +++ b/lib/usb/usb_fx07_common.c @@ -132,7 +132,8 @@ void stm32fx07_endpoints_reset(usbd_device *usbd_dev) } /* Flush all tx/rx fifos */ - REBASE(OTG_GRSTCTL) = OTG_GRSTCTL_TXFFLSH | OTG_GRSTCTL_TXFNUM_ALL | OTG_GRSTCTL_RXFFLSH; + REBASE(OTG_GRSTCTL) = OTG_GRSTCTL_TXFFLSH | OTG_GRSTCTL_TXFNUM_ALL + | OTG_GRSTCTL_RXFFLSH; } void stm32fx07_ep_stall_set(usbd_device *usbd_dev, uint8_t addr, uint8_t stall) diff --git a/lib/usb/usb_msc.c b/lib/usb/usb_msc.c index 98cb87ad..ba18b49c 100644 --- a/lib/usb/usb_msc.c +++ b/lib/usb/usb_msc.c @@ -153,8 +153,9 @@ struct usb_msc_trans { uint32_t bytes_to_read; uint32_t bytes_to_write; - uint32_t byte_count; /* Either read until equal to bytes_to_read or - write until equal to bytes_to_write. */ + uint32_t byte_count; /* Either read until equal to + bytes_to_read or write until equal + to bytes_to_write. */ uint32_t lba_start; uint32_t block_count; uint32_t current_block; @@ -288,7 +289,8 @@ static void scsi_write_6(usbd_mass_storage *ms, buf = get_cbw_buf(trans); - trans->lba_start = ((0x1f & buf[1]) << 16) | (buf[2] << 8) | buf[3]; + trans->lba_start = ((0x1f & buf[1]) << 16) + | (buf[2] << 8) | buf[3]; trans->block_count = buf[4]; trans->current_block = 0; @@ -325,7 +327,8 @@ static void scsi_read_10(usbd_mass_storage *ms, buf = get_cbw_buf(trans); - trans->lba_start = (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | buf[5]; + trans->lba_start = (buf[2] << 24) | (buf[3] << 16) + | (buf[4] << 8) | buf[5]; trans->block_count = (buf[7] << 8) | buf[8]; /* TODO: Check the lba & block_count for range. */ @@ -384,7 +387,8 @@ static void scsi_request_sense(usbd_mass_storage *ms, buf = &trans->cbw.cbw.CBWCB[0]; trans->bytes_to_write = buf[4]; /* allocation length */ - memcpy(trans->msd_buf, _spc3_request_sense, sizeof(_spc3_request_sense)); + memcpy(trans->msd_buf, _spc3_request_sense, + sizeof(_spc3_request_sense)); trans->msd_buf[2] = ms->sense.key; trans->msd_buf[12] = ms->sense.asc; @@ -445,7 +449,8 @@ static void scsi_inquiry(usbd_mass_storage *ms, if (0 == evpd) { size_t len; trans->bytes_to_write = sizeof(_spc3_inquiry_response); - memcpy(trans->msd_buf, _spc3_inquiry_response, sizeof(_spc3_inquiry_response)); + memcpy(trans->msd_buf, _spc3_inquiry_response, + sizeof(_spc3_inquiry_response)); len = strlen(ms->vendor_id); len = MIN(len, 8); @@ -457,9 +462,11 @@ static void scsi_inquiry(usbd_mass_storage *ms, len = strlen(ms->product_revision_level); len = MIN(len, 4); - memcpy(&trans->msd_buf[32], ms->product_revision_level, len); + memcpy(&trans->msd_buf[32], ms->product_revision_level, + len); - trans->csw.csw.dCSWDataResidue = sizeof(_spc3_inquiry_response); + trans->csw.csw.dCSWDataResidue = + sizeof(_spc3_inquiry_response); set_sbc_status_good(ms); } else { @@ -564,7 +571,7 @@ static void msc_data_rx_cb(usbd_device *usbd_dev, uint8_t ep) if (trans->byte_count < trans->bytes_to_read) { if (0 < trans->block_count) { - if ((0 == trans->byte_count) && (NULL != ms->lock)){ + if ((0 == trans->byte_count) && (NULL != ms->lock)) { (*ms->lock)(); } } @@ -580,7 +587,8 @@ static void msc_data_rx_cb(usbd_device *usbd_dev, uint8_t ep) uint32_t lba; lba = trans->lba_start + trans->current_block; - if (0 != (*ms->write_block)(lba, trans->msd_buf)) { + if (0 != (*ms->write_block)(lba, + trans->msd_buf)) { /* Error */ } trans->current_block++; @@ -596,7 +604,8 @@ static void msc_data_rx_cb(usbd_device *usbd_dev, uint8_t ep) uint32_t lba; lba = trans->lba_start + trans->current_block; - if (0 != (*ms->read_block)(lba, trans->msd_buf)) { + if (0 != (*ms->read_block)(lba, + trans->msd_buf)) { /* Error */ } trans->current_block++; @@ -614,12 +623,13 @@ static void msc_data_rx_cb(usbd_device *usbd_dev, uint8_t ep) uint32_t lba; lba = trans->lba_start + trans->current_block; - if (0 != (*ms->write_block)(lba, trans->msd_buf)) { + if (0 != (*ms->write_block)(lba, + trans->msd_buf)) { /* Error */ } trans->current_block = 0; - if (NULL != ms->unlock){ + if (NULL != ms->unlock) { (*ms->unlock)(); } } @@ -633,7 +643,8 @@ static void msc_data_rx_cb(usbd_device *usbd_dev, uint8_t ep) if (0 < left) { max_len = MIN(ms->ep_out_size, left); p = &trans->csw.buf[trans->csw_sent]; - len = usbd_ep_write_packet(usbd_dev, ms->ep_in, p, max_len); + len = usbd_ep_write_packet(usbd_dev, ms->ep_in, p, + max_len); trans->csw_sent += len; } } @@ -656,7 +667,8 @@ static void msc_data_tx_cb(usbd_device *usbd_dev, uint8_t ep) uint32_t lba; lba = trans->lba_start + trans->current_block; - if (0 != (*ms->read_block)(lba, trans->msd_buf)) { + if (0 != (*ms->read_block)(lba, + trans->msd_buf)) { /* Error */ } trans->current_block++; @@ -672,7 +684,7 @@ static void msc_data_tx_cb(usbd_device *usbd_dev, uint8_t ep) if (0 < trans->block_count) { if (trans->current_block == trans->block_count) { trans->current_block = 0; - if (NULL != ms->unlock){ + if (NULL != ms->unlock) { (*ms->unlock)(); } } @@ -707,8 +719,9 @@ static void msc_data_tx_cb(usbd_device *usbd_dev, uint8_t ep) * interface. */ static int msc_control_request(usbd_device *usbd_dev, - struct usb_setup_data *req, uint8_t **buf, uint16_t *len, - usbd_control_complete_callback *complete) + struct usb_setup_data *req, uint8_t **buf, + uint16_t *len, + usbd_control_complete_callback *complete) { (void)complete; (void)usbd_dev; @@ -777,8 +790,10 @@ usbd_mass_storage *usb_msc_init(usbd_device *usbd_dev, const char *product_id, const char *product_revision_level, const uint32_t block_count, - int (*read_block)(uint32_t lba, uint8_t *copy_to), - int (*write_block)(uint32_t lba, const uint8_t *copy_from)) + int (*read_block)(uint32_t lba, + uint8_t *copy_to), + int (*write_block)(uint32_t lba, + const uint8_t *copy_from)) { _mass_storage.usbd_dev = usbd_dev; _mass_storage.ep_in = ep_in; diff --git a/lib/usb/usb_standard.c b/lib/usb/usb_standard.c index a27f69a8..02cef621 100644 --- a/lib/usb/usb_standard.c +++ b/lib/usb/usb_standard.c @@ -45,8 +45,9 @@ int usbd_register_set_config_callback(usbd_device *usbd_dev, int i; for (i = 0; i < MAX_USER_SET_CONFIG_CALLBACK; i++) { - if (usbd_dev->user_callback_set_config[i]) + if (usbd_dev->user_callback_set_config[i]) { continue; + } usbd_dev->user_callback_set_config[i] = callback; return 0; @@ -56,7 +57,7 @@ int usbd_register_set_config_callback(usbd_device *usbd_dev, } void usbd_register_set_altsetting_callback(usbd_device *usbd_dev, - usbd_set_altsetting_callback callback) + usbd_set_altsetting_callback callback) { usbd_dev->user_callback_set_altsetting = callback; } @@ -253,9 +254,10 @@ static int usb_standard_set_configuration(usbd_device *usbd_dev, (void)buf; (void)len; - if(req->wValue > 0) { + if (req->wValue > 0) { for (i = 0; i < usbd_dev->desc->bNumConfigurations; i++) { - if (req->wValue == usbd_dev->config[i].bConfigurationValue) { + if (req->wValue + == usbd_dev->config[i].bConfigurationValue) { found_index = i; break; } @@ -310,7 +312,8 @@ static int usb_standard_get_configuration(usbd_device *usbd_dev, if (*len > 1) { *len = 1; } - const struct usb_config_descriptor *cfg = &usbd_dev->config[usbd_dev->current_config - 1]; + const struct usb_config_descriptor *cfg = + &usbd_dev->config[usbd_dev->current_config - 1]; (*buf)[0] = cfg->bConfigurationValue; return 1; @@ -320,7 +323,8 @@ static int usb_standard_set_interface(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len) { - const struct usb_config_descriptor *cfx = &usbd_dev->config[usbd_dev->current_config - 1]; + const struct usb_config_descriptor *cfx = + &usbd_dev->config[usbd_dev->current_config - 1]; const struct usb_interface *iface; (void)buf; @@ -343,7 +347,8 @@ static int usb_standard_set_interface(usbd_device *usbd_dev, if (usbd_dev->user_callback_set_altsetting) { usbd_dev->user_callback_set_altsetting(usbd_dev, - req->wIndex, req->wValue); + req->wIndex, + req->wValue); } *len = 0; @@ -356,7 +361,8 @@ static int usb_standard_get_interface(usbd_device *usbd_dev, uint8_t **buf, uint16_t *len) { uint8_t *cur_altsetting; - const struct usb_config_descriptor *cfx = &usbd_dev->config[usbd_dev->current_config - 1]; + const struct usb_config_descriptor *cfx = + &usbd_dev->config[usbd_dev->current_config - 1]; if (req->wIndex >= cfx->bNumInterfaces) { return USBD_REQ_NOTSUPP; |