jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

[Style] A small coding style fixing session.

Browse Source
This commit is contained in:
Piotr Esden-Tempski 2013-07-05 20:35:13 -07:00
parent db1f19c8f8
commit 2f425af647
14 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libopencm3/stm32/tools.h
View File

@ -55,9 +55,10 @@ do { \
register uint16_t toggle_mask = GET_REG(REG) & (MSK); \ register uint16_t toggle_mask = GET_REG(REG) & (MSK); \
register uint16_t bit_selector; \ register uint16_t bit_selector; \
for (bit_selector = 1; bit_selector; bit_selector <<= 1) { \ for (bit_selector = 1; bit_selector; bit_selector <<= 1) { \
if ((bit_selector & (BIT)) != 0) \ if ((bit_selector & (BIT)) != 0) { \
toggle_mask ^= bit_selector; \ toggle_mask ^= bit_selector; \
} \ } \
} \
SET_REG(REG, toggle_mask); \ SET_REG(REG, toggle_mask); \
} while (0) } while (0)

3
lib/lm4f/usb_lm4f.c
View File

@ -321,8 +321,7 @@ static void lm4f_ep_stall_set(usbd_device *usbd_dev, uint8_t addr,
} else { } else {
(USB_TXCSRL(ep)) &= ~USB_TXCSRL_STALL; (USB_TXCSRL(ep)) &= ~USB_TXCSRL_STALL;
} }
} } else {
else {
if (stall) { if (stall) {
(USB_RXCSRL(ep)) |= USB_RXCSRL_STALL; (USB_RXCSRL(ep)) |= USB_RXCSRL_STALL;
} else { } else {

4
lib/stm32/common/gpio_common_f24.c
View File

@ -137,9 +137,9 @@ void gpio_set_output_options(uint32_t gpioport, uint8_t otype, uint8_t speed,
if (otype == 0x1) { if (otype == 0x1) {
GPIO_OTYPER(gpioport) |= gpios; GPIO_OTYPER(gpioport) |= gpios;
} } else {
else
GPIO_OTYPER(gpioport) &= ~gpios; GPIO_OTYPER(gpioport) &= ~gpios;
}
ospeedr = GPIO_OSPEEDR(gpioport); ospeedr = GPIO_OSPEEDR(gpioport);

5
lib/stm32/common/pwr_common_all.c
View File

@ -172,7 +172,7 @@ threshold.
bool pwr_voltage_high(void) bool pwr_voltage_high(void)
{ {
return (PWR_CSR & PWR_CSR_PVDO); return PWR_CSR & PWR_CSR_PVDO;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -186,7 +186,7 @@ cleared by software (see @ref pwr_clear_standby_flag).
bool pwr_get_standby_flag(void) bool pwr_get_standby_flag(void)
{ {
return (PWR_CSR & PWR_CSR_SBF); return PWR_CSR & PWR_CSR_SBF;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -203,4 +203,3 @@ bool pwr_get_wakeup_flag(void)
return PWR_CSR & PWR_CSR_WUF; return PWR_CSR & PWR_CSR_WUF;
} }
/**@}*/ /**@}*/

15
lib/usb/usb_f103.c
View File

@ -191,13 +191,15 @@ static uint8_t stm32f103_ep_stall_get(usbd_device *dev, uint8_t addr)
(void)dev; (void)dev;
if (addr & 0x80) { if (addr & 0x80) {
if ((*USB_EP_REG(addr & 0x7F) & USB_EP_TX_STAT) == if ((*USB_EP_REG(addr & 0x7F) & USB_EP_TX_STAT) ==
USB_EP_TX_STAT_STALL) USB_EP_TX_STAT_STALL) {
return 1; return 1;
}
} else { } else {
if ((*USB_EP_REG(addr) & USB_EP_RX_STAT) == if ((*USB_EP_REG(addr) & USB_EP_RX_STAT) ==
USB_EP_RX_STAT_STALL) USB_EP_RX_STAT_STALL) {
return 1; return 1;
} }
}
return 0; return 0;
} }
@ -213,10 +215,10 @@ static void stm32f103_ep_nak_set(usbd_device *dev, uint8_t addr, uint8_t nak)
if (nak) { if (nak) {
USB_SET_EP_RX_STAT(addr, USB_EP_RX_STAT_NAK); USB_SET_EP_RX_STAT(addr, USB_EP_RX_STAT_NAK);
} } else {
else
USB_SET_EP_RX_STAT(addr, USB_EP_RX_STAT_VALID); USB_SET_EP_RX_STAT(addr, USB_EP_RX_STAT_VALID);
} }
}
/** /**
* Copy a data buffer to packet memory. * Copy a data buffer to packet memory.
@ -308,10 +310,11 @@ static void stm32f103_poll(usbd_device *dev)
uint8_t ep = istr & USB_ISTR_EP_ID; uint8_t ep = istr & USB_ISTR_EP_ID;
uint8_t type = (istr & USB_ISTR_DIR) ? 1 : 0; uint8_t type = (istr & USB_ISTR_DIR) ? 1 : 0;
if (type) /* OUT or SETUP transaction */ if (type) { /* OUT or SETUP transaction */
type += (*USB_EP_REG(ep) & USB_EP_SETUP) ? 1 : 0; type += (*USB_EP_REG(ep) & USB_EP_SETUP) ? 1 : 0;
else /* IN transaction */ } else { /* IN transaction */
USB_CLR_EP_TX_CTR(ep); USB_CLR_EP_TX_CTR(ep);
}
if (dev->user_callback_ctr[ep][type]) { if (dev->user_callback_ctr[ep][type]) {
dev->user_callback_ctr[ep][type] (dev, ep); dev->user_callback_ctr[ep][type] (dev, ep);