Skip to content

Commit

Permalink
make format
Browse files Browse the repository at this point in the history
  • Loading branch information
Simone Guscetti authored and David Sidrane committed Nov 8, 2018
1 parent bb6f7a3 commit 5f286b2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
10 changes: 5 additions & 5 deletions bl.c
Expand Up @@ -148,7 +148,7 @@ inline int cin(uint32_t devices)
{
#if INTERFACE_USB

if ((bl_type == NONE || bl_type == USB) && (devices&USB0_DEV) != 0) {
if ((bl_type == NONE || bl_type == USB) && (devices & USB0_DEV) != 0) {
int usb_in = usb_cin();

if (usb_in >= 0) {
Expand All @@ -161,7 +161,7 @@ inline int cin(uint32_t devices)

#if INTERFACE_USART

if ((bl_type == NONE || bl_type == USART) && (devices&SERIAL0_DEV) != 0) {
if ((bl_type == NONE || bl_type == USART) && (devices & SERIAL0_DEV) != 0) {
int uart_in = uart_cin();

if (uart_in >= 0) {
Expand Down Expand Up @@ -685,9 +685,9 @@ bootloader(unsigned timeout)

#if defined(TARGET_HW_PX4_FMU_V4)

if (check_silicon()) {
goto bad_silicon;
}
if (check_silicon()) {
goto bad_silicon;
}

#endif

Expand Down
2 changes: 1 addition & 1 deletion hw_config.h
Expand Up @@ -56,7 +56,7 @@
* * Other defines are somewhat self explanatory.
*/

/* Boot device selection list*/
/* Boot device selection list*/
#define USB0_DEV 0x01
#define SERIAL0_DEV 0x02
#define SERIAL1_DEV 0x04
Expand Down
2 changes: 2 additions & 0 deletions main_f4.c
Expand Up @@ -340,9 +340,11 @@ uint32_t
board_get_devices(void)
{
uint32_t devices = BOOT_DEVICES_SELECTION;

if (usb_connected) {
devices &= BOOT_DEVICES_FILTER_ONUSB;
}

return devices;
}

Expand Down
2 changes: 2 additions & 0 deletions main_f7.c
Expand Up @@ -323,9 +323,11 @@ uint32_t
board_get_devices(void)
{
uint32_t devices = BOOT_DEVICES_SELECTION;

if (usb_connected) {
devices &= BOOT_DEVICES_FILTER_ONUSB;
}

return devices;
}

Expand Down
2 changes: 2 additions & 0 deletions main_k66.c
Expand Up @@ -175,9 +175,11 @@ uint32_t
board_get_devices(void)
{
uint32_t devices = BOOT_DEVICES_SELECTION;

if (usb_connected) {
devices &= BOOT_DEVICES_FILTER_ONUSB;
}

return devices;
}

Expand Down

0 comments on commit 5f286b2

Please sign in to comment.