X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fkdebug_sam3.c;h=3438c05c3877318e0a71f2ba06d4323b6215af1c;hb=fde92710afb75118bda5d9fb622d12f57a2656da;hp=80e5501f2f9e1aeb4748d55ba985c473c2990317;hpb=e444d916197e4345dd2bbd85800d8544c2699096;p=bertos.git diff --git a/bertos/cpu/cortex-m3/drv/kdebug_sam3.c b/bertos/cpu/cortex-m3/drv/kdebug_sam3.c index 80e5501f..3438c05c 100644 --- a/bertos/cpu/cortex-m3/drv/kdebug_sam3.c +++ b/bertos/cpu/cortex-m3/drv/kdebug_sam3.c @@ -30,7 +30,7 @@ * * --> * - * \brief AT91SAM3 debug support (implementation). + * \brief SAM3 debug support (implementation). * * \author Stefano Fedrigo */ @@ -43,12 +43,12 @@ #if CONFIG_KDEBUG_PORT == 0 #define UART_BASE UART0_BASE - #define UART_INT INT_UART0 + #define UART_ID UART0_ID #define UART_PIO_BASE PIOA_BASE #define UART_PINS (BV(RXD0) | BV(TXD0)) -#elif (CONFIG_KDEBUG_PORT == 1) && !defined(CPU_CM3_AT91SAM3U) +#elif (CONFIG_KDEBUG_PORT == 1) && !defined(CPU_CM3_SAM3U) #define UART_BASE UART1_BASE - #define UART_INT INT_UART1 + #define UART_ID UART1_ID #define UART_PIO_BASE PIOB_BASE #define UART_PINS (BV(RXD1) | BV(TXD1)) #else @@ -78,7 +78,7 @@ INLINE void kdbg_hw_init(void) HWREG(UART_PIO_BASE + PIO_ABCDSR2_OFF) &= ~UART_PINS; /* Enable the peripheral clock */ - PMC_PCER |= BV(UART_INT); + PMC_PCER = BV(UART_ID); /* Reset and disable receiver & transmitter */ HWREG(UART_BASE + UART_CR_OFF) = BV(UART_CR_RSTRX) | BV(UART_CR_RSTTX) | BV(UART_CR_RXDIS) | BV(UART_CR_TXDIS);