From 903812f0a7a0b81f62205a3a4382790a6e7919d4 Mon Sep 17 00:00:00 2001 From: asterix Date: Fri, 22 Oct 2010 20:04:11 +0000 Subject: [PATCH] Fix copyright. Reorder include and remove deprecated. Comply the core cpu macro name. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4453 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/msp430/drv/kdebug_msp430.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/bertos/cpu/msp430/drv/kdebug_msp430.c b/bertos/cpu/msp430/drv/kdebug_msp430.c index 7e5a11bd..3407c01d 100644 --- a/bertos/cpu/msp430/drv/kdebug_msp430.c +++ b/bertos/cpu/msp430/drv/kdebug_msp430.c @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. * - * Copyright 2003, 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/) + * Copyright 2010 Develer S.r.l. (http://www.develer.com/) * Copyright 2010 Mohamed * * --> @@ -36,13 +36,12 @@ * \author Mohamed Tarek */ -#include /* for CPU_FREQ */ -#include "hw/hw_ser.h" /* bus macros overrides */ +#include "kdebug_msp430.h" /* for UART clock source definitions */ +#include "hw/hw_ser.h" /* bus macros overrides */ #include "cfg/cfg_debug.h" -#include /* for DIV_ROUND */ -#include "kdebug_msp430.h" /* for UART clock source definitions */ +#include /* for DIV_ROUND */ #include #include @@ -77,13 +76,13 @@ #define IE IE2 #define IFG IFG2 - #if (CPU_MSP430_2274) + #if CPU_MSP430F2274 #define KDBG_MSP430_UART_PINS_INIT() do{ P3SEL = 0x30; }while(0) #endif #else - #if (CPU_MSP430_2274) + #if CPU_MSP430F2274 #error only 1 UART availbale, CONFIG_KDEBUG_PORT should be 0 #endif @@ -124,10 +123,10 @@ INLINE void kdbg_hw_init(void) UCCTL1 |= UCSSEL_ACLK; #endif - UCBR0 = quot & 0xFF; // Setup clock prescaler for the UART - UCBR1 = quot >> 8; + UCBR0 = quot & 0xFF; // Setup clock prescaler for the UART + UCBR1 = quot >> 8; - UCMCTL = UCBRS0; // No Modulation + UCMCTL = UCBRS0; // No Modulation UCCTL0 = 0; // Default UART settings (8N1) UCCTL1 &= ~UCSWRST; // Initialize USCI state machine KDBG_MASK_IRQ(IE2); // Disable USCI interrupts -- 2.25.1