lm3s1968-gpio: coding style fixes.

[bertos.git] / bertos / cpu / cortex-m3 / drv / kdebug_lm3s.c

diff --git a/bertos/cpu/cortex-m3/drv/kdebug_lm3s.c b/bertos/cpu/cortex-m3/drv/kdebug_lm3s.c
index a0c7209f2f45176e3e267d64a9cdb69ae42c560d..65c1dccb46512e36ccc917ee349840dccf6355a7 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/kdebug_lm3s.c
+++ b/bertos/cpu/cortex-m3/drv/kdebug_lm3s.c
@@ -35,12 +35,12 @@
  * \author Andrea Righi <arighi@develer.com>
  */
 
+#include <cfg/cfg_debug.h>
 #include <cfg/macros.h> /* for BV() */
+#include <drv/clock_lm3s.h> /* lm3s_busyWait() */
+#include <drv/gpio_lm3s.h>
+#include <io/lm3s.h>
 #include "kdebug_lm3s.h"
-#include "clock_lm3s.h" /* __delay() */
-#include "cfg/cfg_debug.h"
-#include "io/lm3s.h"
-#include "gpio_lm3s.h"
 
 INLINE void uart_disable(size_t base)
 {
@@ -125,9 +125,10 @@ INLINE void kdbg_hw_init(void)
        /* Enable the peripheral clock */
        SYSCTL_RCGC1_R |= SYSCTL_RCGC1_UART0;
        SYSCTL_RCGC2_R |= SYSCTL_RCGC2_GPIOA;
-       __delay(512);
+       lm3s_busyWait(512);
+
        /* Set GPIO A0 and A1 as UART pins */
-       lm3s_gpio_pin_config(GPIO_PORTA_BASE, BV(0) | BV(1),
+       lm3s_gpioPinConfig(GPIO_PORTA_BASE, BV(0) | BV(1),
                        GPIO_DIR_MODE_HW, GPIO_STRENGTH_2MA, GPIO_PIN_TYPE_STD);
        /* 115.200, 8-bit word, no parity, one stop bit */
        uart_config(UART0_BASE, CONFIG_KDEBUG_BAUDRATE, UART_LCRH_WLEN_8);