From 2b387e02ffd797dc8c68e072d29e445821189559 Mon Sep 17 00:00:00 2001 From: batt Date: Wed, 26 May 2010 17:32:32 +0000 Subject: [PATCH] Remove broken debug uart name. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3851 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/cortex-m3/drv/kdebug_lm3s.c | 6 ------ bertos/cpu/cortex-m3/drv/kdebug_lm3s.h | 11 +---------- bertos/cpu/cortex-m3/drv/kdebug_stm32.c | 6 ------ bertos/cpu/cortex-m3/drv/kdebug_stm32.h | 11 +---------- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/bertos/cpu/cortex-m3/drv/kdebug_lm3s.c b/bertos/cpu/cortex-m3/drv/kdebug_lm3s.c index 568920ec..30258846 100644 --- a/bertos/cpu/cortex-m3/drv/kdebug_lm3s.c +++ b/bertos/cpu/cortex-m3/drv/kdebug_lm3s.c @@ -42,8 +42,6 @@ #include #include "kdebug_lm3s.h" -#if CONFIG_KDEBUG_PORT == KDEBUG_PORT_DBGU - #if CONFIG_KDEBUG_PORT == 0 #define UART_BASE UART0_BASE #define UART_GPIO_BASE GPIO_PORTA_BASE @@ -76,10 +74,6 @@ typedef uint32_t kdbg_irqsave_t; -#else -#error CONFIG_KDEBUG_PORT should be KDEBUG_PORT_DBGU -#endif - INLINE void uart_hw_config(void) { unsigned long div, baud = CONFIG_KDEBUG_BAUDRATE; diff --git a/bertos/cpu/cortex-m3/drv/kdebug_lm3s.h b/bertos/cpu/cortex-m3/drv/kdebug_lm3s.h index 4335d898..faabef4e 100644 --- a/bertos/cpu/cortex-m3/drv/kdebug_lm3s.h +++ b/bertos/cpu/cortex-m3/drv/kdebug_lm3s.h @@ -38,16 +38,7 @@ #ifndef DRV_KDEBUG_LM3S_H #define DRV_KDEBUG_LM3S_H -/** - * \name Values for CONFIG_KDEBUG_PORT. - * - * Select which hardware UART to use for system debug. - * - * \{ - */ -#define KDEBUG_PORT_DBGU 0 ///< Debug on Debug Unit. - -#define KDEBUG_PORT_DEFAULT KDEBUG_PORT_DBGU ///< Default debug port. +#define KDEBUG_PORT_DEFAULT 0 ///< Default debug port. /* \} */ #endif /* DRV_KDEBUG_LM3S_H */ diff --git a/bertos/cpu/cortex-m3/drv/kdebug_stm32.c b/bertos/cpu/cortex-m3/drv/kdebug_stm32.c index f4368b7e..f50f3d89 100644 --- a/bertos/cpu/cortex-m3/drv/kdebug_stm32.c +++ b/bertos/cpu/cortex-m3/drv/kdebug_stm32.c @@ -111,8 +111,6 @@ struct stm32_usart #define USART_LASTBIT_DISABLE ((uint16_t)0x0000) #define USART_LASTBIT_ENABLE ((uint16_t)0x0100) -#if CONFIG_KDEBUG_PORT == KDEBUG_PORT_DBGU - #if CONFIG_KDEBUG_PORT == 0 #define UART_BASE ((struct stm32_usart *)USART1_BASE) #elif CONFIG_KDEBUG_PORT == 1 @@ -136,10 +134,6 @@ struct stm32_usart typedef uint32_t kdbg_irqsave_t; -#else -#error CONFIG_KDEBUG_PORT should be KDEBUG_PORT_DBGU -#endif - #define GPIO_USART1_TX_PIN (1 << 9) #define GPIO_USART1_RX_PIN (1 << 10) diff --git a/bertos/cpu/cortex-m3/drv/kdebug_stm32.h b/bertos/cpu/cortex-m3/drv/kdebug_stm32.h index ed51dbe1..acb71a56 100644 --- a/bertos/cpu/cortex-m3/drv/kdebug_stm32.h +++ b/bertos/cpu/cortex-m3/drv/kdebug_stm32.h @@ -38,16 +38,7 @@ #ifndef DRV_KDEBUG_STM32_H #define DRV_KDEBUG_STM32_H -/** - * \name Values for CONFIG_KDEBUG_PORT. - * - * Select which hardware UART to use for system debug. - * - * \{ - */ -#define KDEBUG_PORT_DBGU 1 ///< Debug on Debug Unit. - -#define KDEBUG_PORT_DEFAULT KDEBUG_PORT_DBGU ///< Default debug port. +#define KDEBUG_PORT_DEFAULT 1 ///< Default debug port. /* \} */ #endif /* DRV_KDEBUG_STM32_H */ -- 2.25.1