aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sidrane <david_s5@nscdg.com>2015-03-24 14:29:40 -1000
committerDavid Sidrane <david_s5@nscdg.com>2015-03-24 14:29:40 -1000
commitb984c7bc49130864b96979c88d926284fb1cf7fc (patch)
tree58c63d5055899cc6e8efe2f7c7ccf9d193846747
parent7442eb0d1c7880b973d55a32af9a95662dda2b26 (diff)
downloadpx4-firmware-b984c7bc49130864b96979c88d926284fb1cf7fc.tar.gz
px4-firmware-b984c7bc49130864b96979c88d926284fb1cf7fc.tar.bz2
px4-firmware-b984c7bc49130864b96979c88d926284fb1cf7fc.zip
astyle-ed
-rw-r--r--src/drivers/boards/px4cannode-v1/px4cannode_buttons.c14
-rw-r--r--src/drivers/boards/px4cannode-v1/px4cannode_can.c36
-rw-r--r--src/drivers/boards/px4cannode-v1/px4cannode_init.c52
-rw-r--r--src/drivers/boards/px4cannode-v1/px4cannode_led.c68
-rw-r--r--src/drivers/boards/px4cannode-v1/px4cannode_spi.c34
5 files changed, 102 insertions, 102 deletions
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_buttons.c b/src/drivers/boards/px4cannode-v1/px4cannode_buttons.c
index 724394211..bd2363cce 100644
--- a/src/drivers/boards/px4cannode-v1/px4cannode_buttons.c
+++ b/src/drivers/boards/px4cannode-v1/px4cannode_buttons.c
@@ -102,7 +102,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler);
void board_button_initialize(void)
{
- stm32_configgpio(BUTTON_BOOT0n);
+ stm32_configgpio(BUTTON_BOOT0n);
}
/****************************************************************************
@@ -119,7 +119,7 @@ void board_button_initialize(void)
uint8_t board_buttons(void)
{
- return stm32_gpioread(BUTTON_BOOT0n) ? 0 : BUTTON_BOOT0_MASK;
+ return stm32_gpioread(BUTTON_BOOT0n) ? 0 : BUTTON_BOOT0_MASK;
}
/****************************************************************************
@@ -139,16 +139,16 @@ uint8_t board_buttons(void)
#ifdef CONFIG_ARCH_IRQBUTTONS
xcpt_t board_button_irq(int id, xcpt_t irqhandler)
{
- xcpt_t oldhandler = NULL;
+ xcpt_t oldhandler = NULL;
- /* The following should be atomic */
+ /* The following should be atomic */
- if (id == IRQBUTTON)
+ if (id == IRQBUTTON)
{
- oldhandler = stm32_gpiosetevent(BUTTON_BOOT0n, true, true, true, irqhandler);
+ oldhandler = stm32_gpiosetevent(BUTTON_BOOT0n, true, true, true, irqhandler);
}
- return oldhandler;
+ return oldhandler;
}
#endif
#endif /* CONFIG_ARCH_BUTTONS */
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_can.c b/src/drivers/boards/px4cannode-v1/px4cannode_can.c
index 92f09d0cc..59bfec574 100644
--- a/src/drivers/boards/px4cannode-v1/px4cannode_can.c
+++ b/src/drivers/boards/px4cannode-v1/px4cannode_can.c
@@ -110,38 +110,38 @@ int can_devinit(void);
int can_devinit(void)
{
- static bool initialized = false;
- struct can_dev_s *can;
- int ret;
+ static bool initialized = false;
+ struct can_dev_s *can;
+ int ret;
- /* Check if we have already initialized */
+ /* Check if we have already initialized */
- if (!initialized)
+ if (!initialized)
{
- /* Call stm32_caninitialize() to get an instance of the CAN interface */
+ /* Call stm32_caninitialize() to get an instance of the CAN interface */
- can = stm32_caninitialize(CAN_PORT);
- if (can == NULL)
+ can = stm32_caninitialize(CAN_PORT);
+ if (can == NULL)
{
- candbg("ERROR: Failed to get CAN interface\n");
- return -ENODEV;
+ candbg("ERROR: Failed to get CAN interface\n");
+ return -ENODEV;
}
- /* Register the CAN driver at "/dev/can0" */
+ /* Register the CAN driver at "/dev/can0" */
- ret = can_register("/dev/can0", can);
- if (ret < 0)
+ ret = can_register("/dev/can0", can);
+ if (ret < 0)
{
- candbg("ERROR: can_register failed: %d\n", ret);
- return ret;
+ candbg("ERROR: can_register failed: %d\n", ret);
+ return ret;
}
- /* Now we are initialized */
+ /* Now we are initialized */
- initialized = true;
+ initialized = true;
}
- return OK;
+ return OK;
}
#endif /* CONFIG_CAN && CONFIG_STM32_CAN1 */
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_init.c b/src/drivers/boards/px4cannode-v1/px4cannode_init.c
index b1c3e71a5..a30cc3038 100644
--- a/src/drivers/boards/px4cannode-v1/px4cannode_init.c
+++ b/src/drivers/boards/px4cannode-v1/px4cannode_init.c
@@ -134,24 +134,24 @@ __EXPORT void board_initialize(void)
#ifdef __cplusplus
__EXPORT int matherr(struct __exception *e)
{
- return 1;
+ return 1;
}
#else
__EXPORT int matherr(struct exception *e)
{
- return 1;
+ return 1;
}
#endif
__EXPORT int nsh_archinitialize(void)
{
- int result = OK;
+ int result = OK;
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
- /* run C++ ctors before we go any further */
+ /* run C++ ctors before we go any further */
- up_cxxinitialize();
+ up_cxxinitialize();
# if defined(CONFIG_EXAMPLES_NSH_CXXINITIALIZE)
# error CONFIG_EXAMPLES_NSH_CXXINITIALIZE Must not be defined! Use CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE.
@@ -161,31 +161,31 @@ __EXPORT int nsh_archinitialize(void)
# error platform is dependent on c++ both CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE must be defined.
#endif
- /* configure the high-resolution time/callout interface */
- hrt_init();
+ /* configure the high-resolution time/callout interface */
+ hrt_init();
- /* set up the serial DMA polling */
- static struct hrt_call serial_dma_call;
- struct timespec ts;
+ /* set up the serial DMA polling */
+ static struct hrt_call serial_dma_call;
+ struct timespec ts;
- /*
- * Poll at 1ms intervals for received bytes that have not triggered
- * a DMA event.
- */
- ts.tv_sec = 0;
- ts.tv_nsec = 1000000;
+ /*
+ * Poll at 1ms intervals for received bytes that have not triggered
+ * a DMA event.
+ */
+ ts.tv_sec = 0;
+ ts.tv_nsec = 1000000;
- hrt_call_every(&serial_dma_call,
- ts_to_abstime(&ts),
- ts_to_abstime(&ts),
- (hrt_callout)stm32_serial_dma_poll,
- NULL);
+ hrt_call_every(&serial_dma_call,
+ ts_to_abstime(&ts),
+ ts_to_abstime(&ts),
+ (hrt_callout)stm32_serial_dma_poll,
+ NULL);
- /* initial LED state */
- drv_led_start();
+ /* initial LED state */
+ drv_led_start();
- led_off(LED_AMBER);
- led_off(LED_BLUE);
+ led_off(LED_AMBER);
+ led_off(LED_BLUE);
- return result;
+ return result;
}
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_led.c b/src/drivers/boards/px4cannode-v1/px4cannode_led.c
index fe765d653..a34af704d 100644
--- a/src/drivers/boards/px4cannode-v1/px4cannode_led.c
+++ b/src/drivers/boards/px4cannode-v1/px4cannode_led.c
@@ -70,43 +70,43 @@ static uint16_t g_ledmap[] = {
__EXPORT void led_init(void)
{
- /* Configure LED1-2 GPIOs for output */
- for (size_t l = 0; l < arraySize(g_ledmap); l++) {
- stm32_configgpio(g_ledmap[l]);
- }
+ /* Configure LED1-2 GPIOs for output */
+ for (size_t l = 0; l < arraySize(g_ledmap); l++) {
+ stm32_configgpio(g_ledmap[l]);
+ }
}
__EXPORT void board_led_initialize(void)
{
- led_init();
+ led_init();
}
static void phy_set_led(int led, bool state)
{
- /* Pull Up to switch on */
- stm32_gpiowrite(g_ledmap[led], state);
+ /* Pull Up to switch on */
+ stm32_gpiowrite(g_ledmap[led], state);
}
static bool phy_get_led(int led)
{
- return !stm32_gpioread(g_ledmap[led]);
+ return !stm32_gpioread(g_ledmap[led]);
}
__EXPORT void led_on(int led)
{
- phy_set_led(led, true);
+ phy_set_led(led, true);
}
__EXPORT void led_off(int led)
{
- phy_set_led(led, false);
+ phy_set_led(led, false);
}
__EXPORT void led_toggle(int led)
{
- phy_set_led(led, !phy_get_led(led));
+ phy_set_led(led, !phy_get_led(led));
}
static bool g_initialized;
@@ -115,30 +115,30 @@ static bool g_initialized;
__EXPORT void board_led_on(int led)
{
- switch (led)
+ switch (led)
{
- default:
- case LED_STARTED:
- case LED_HEAPALLOCATE:
- case LED_IRQSENABLED:
+ default:
+ case LED_STARTED:
+ case LED_HEAPALLOCATE:
+ case LED_IRQSENABLED:
phy_set_led(LED_GREEN, false);
phy_set_led(LED_YELLOW, false);
break;
- case LED_STACKCREATED:
+ case LED_STACKCREATED:
phy_set_led(LED_GREEN, true);
phy_set_led(LED_YELLOW, false);
g_initialized = true;
break;
- case LED_INIRQ:
- case LED_SIGNAL:
- case LED_ASSERTION:
- case LED_PANIC:
+ case LED_INIRQ:
+ case LED_SIGNAL:
+ case LED_ASSERTION:
+ case LED_PANIC:
phy_set_led(LED_YELLOW, true);
break;
- case LED_IDLE : /* IDLE */
+ case LED_IDLE : /* IDLE */
phy_set_led(LED_GREEN, false);
break;
}
@@ -151,24 +151,24 @@ __EXPORT void board_led_on(int led)
__EXPORT void board_led_off(int led)
{
- switch (led)
+ switch (led)
{
- default:
- case LED_STARTED:
- case LED_HEAPALLOCATE:
- case LED_IRQSENABLED:
- case LED_STACKCREATED:
+ default:
+ case LED_STARTED:
+ case LED_HEAPALLOCATE:
+ case LED_IRQSENABLED:
+ case LED_STACKCREATED:
phy_set_led(LED_GREEN, false);
- // no break
+ // no break
- case LED_INIRQ:
- case LED_SIGNAL:
- case LED_ASSERTION:
- case LED_PANIC:
+ case LED_INIRQ:
+ case LED_SIGNAL:
+ case LED_ASSERTION:
+ case LED_PANIC:
phy_set_led(LED_YELLOW, false);
break;
- case LED_IDLE: /* IDLE */
+ case LED_IDLE: /* IDLE */
phy_set_led(LED_GREEN, g_initialized);
break;
}
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_spi.c b/src/drivers/boards/px4cannode-v1/px4cannode_spi.c
index 0277098b9..a82b4f399 100644
--- a/src/drivers/boards/px4cannode-v1/px4cannode_spi.c
+++ b/src/drivers/boards/px4cannode-v1/px4cannode_spi.c
@@ -98,14 +98,14 @@
void weak_function board_spiinitialize(void)
{
- /* Setup CS */
+ /* Setup CS */
#ifdef CONFIG_STM32_SPI1
- stm32_configgpio(USER_CSn);
+ stm32_configgpio(USER_CSn);
#endif
#ifdef CONFIG_STM32_SPI2
- stm32_configgpio(MMCSD_CSn);
+ stm32_configgpio(MMCSD_CSn);
#endif
}
@@ -138,48 +138,48 @@ void weak_function board_spiinitialize(void)
#ifdef CONFIG_STM32_SPI1
void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
- spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
- if (devid == SPIDEV_USER)
+ spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+ if (devid == SPIDEV_USER)
{
- stm32_gpiowrite(USER_CSn, !selected);
+ stm32_gpiowrite(USER_CSn, !selected);
}
}
uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{
- return 0;
+ return 0;
}
#endif
#ifdef CONFIG_STM32_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
- spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+ spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#if defined(CONFIG_MMCSD)
- if (devid == SPIDEV_MMCSD)
+ if (devid == SPIDEV_MMCSD)
{
- stm32_gpiowrite(MMCSD_CSn, !selected);
+ stm32_gpiowrite(MMCSD_CSn, !selected);
}
#endif
}
uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{
- /* No switch on SD card socket so assume it is here */
+ /* No switch on SD card socket so assume it is here */
- return SPI_STATUS_PRESENT;
+ return SPI_STATUS_PRESENT;
}
#endif
#ifdef CONFIG_STM32_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
- spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+ spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
}
uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{
- return 0;
+ return 0;
}
#endif
@@ -210,21 +210,21 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#ifdef CONFIG_STM32_SPI1
int stm32_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
{
- return OK;
+ return OK;
}
#endif
#ifdef CONFIG_STM32_SPI2
int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
{
- return OK;
+ return OK;
}
#endif
#ifdef CONFIG_STM32_SPI3
int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
{
- return -ENODEV;
+ return -ENODEV;
}
#endif
#endif /* CONFIG_SPI_CMDDATA */