From: batt Date: Fri, 5 Nov 2010 16:48:19 +0000 (+0000) Subject: Remove MSP430 port; still incomplete. X-Git-Tag: 2.6.0~1 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=72240301885fcf3156dd0cc82fa904c8d3286f50;p=bertos.git Remove MSP430 port; still incomplete. git-svn-id: https://src.develer.com/svnoss/bertos/branches/2.6@4526 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/cpu/msp430/drv/kdebug_msp430.c b/bertos/cpu/msp430/drv/kdebug_msp430.c deleted file mode 100644 index 3407c01d..00000000 --- a/bertos/cpu/msp430/drv/kdebug_msp430.c +++ /dev/null @@ -1,134 +0,0 @@ -/** - * \file - * - * - * \brief MSP430 debug support (implementation). - * - * \author Mohamed Tarek - */ - -#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 -#include - -#include - -#if CONFIG_KDEBUG_PORT == 0 - - #ifndef KDBG_UART0_BUS_INIT - #define KDBG_UART0_BUS_INIT do {} while (0) - #endif - #ifndef KDBG_UART0_BUS_RX - #define KDBG_UART0_BUS_RX do {} while (0) - #endif - #ifndef KDBG_UART0_BUS_TX - #define KDBG_UART0_BUS_TX do {} while (0) - #endif - - /* USCI Register definitions */ - #define UCSTAT UCA0STAT - #define UCTXBUF UCA0TXBUF - #define UCRXBUF UCA0RXBUF - #define UCTXIFG UCA0TXIFG - #define UCRXIFG UCA0RXIFG - #define UCTXIE UCA0TXIE - #define UCRXIE UCA0RXIE - #define UCCTL0 UCA0CTL0 - #define UCCTL1 UCA0CTL1 - #define UCBR0 UCA0BR0 - #define UCBR1 UCA0BR1 - #define UCMCTL UCA0MCTL - #define IE IE2 - #define IFG IFG2 - - #if CPU_MSP430F2274 - #define KDBG_MSP430_UART_PINS_INIT() do{ P3SEL = 0x30; }while(0) - #endif - -#else - - #if CPU_MSP430F2274 - #error only 1 UART availbale, CONFIG_KDEBUG_PORT should be 0 - #endif - -#endif - -#define KDBG_WAIT_READY() do { while((UCSTAT & UCBUSY)); } while(0) -#define KDBG_WAIT_TXDONE() do { while(!(IFG & UCTXIFG)); } while(0) - -#define KDBG_WRITE_CHAR(c) do { UCTXBUF = (c); } while(0) - -#define KDBG_MASK_IRQ(old) do { \ - (old) = IE; \ - IE &= ~(UCTXIE|UCRXIE);\ -} while(0) - -#define KDBG_RESTORE_IRQ(old) do { \ - KDBG_WAIT_TXDONE(); \ - IE = (old); \ -} while(0) - -#if CONFIG_KDEBUG_CLOCK_FREQ - #define KDBG_MSP430_FREQ CONFIG_KDEBUG_CLOCK_FREQ -#else - #define KDBG_MSP430_FREQ CPU_FREQ -#endif - -typedef uint8_t kdbg_irqsave_t; - -INLINE void kdbg_hw_init(void) -{ - /* Compute the clock prescaler for the desired baudrate */ - uint16_t quot = DIV_ROUND(KDBG_MSP430_FREQ, CONFIG_KDEBUG_BAUDRATE); - KDBG_MSP430_UART_PINS_INIT(); // Configure USCI TX/RX pins - -#if (CONFIG_KDEBUG_CLOCK_SOURCE == KDBG_UART_SMCLK) - UCCTL1 |= UCSSEL_SMCLK; -#else - UCCTL1 |= UCSSEL_ACLK; -#endif - - UCBR0 = quot & 0xFF; // Setup clock prescaler for the UART - UCBR1 = quot >> 8; - - UCMCTL = UCBRS0; // No Modulation - UCCTL0 = 0; // Default UART settings (8N1) - UCCTL1 &= ~UCSWRST; // Initialize USCI state machine - KDBG_MASK_IRQ(IE2); // Disable USCI interrupts -} - diff --git a/bertos/cpu/msp430/drv/kdebug_msp430.h b/bertos/cpu/msp430/drv/kdebug_msp430.h deleted file mode 100644 index 496f3ce4..00000000 --- a/bertos/cpu/msp430/drv/kdebug_msp430.h +++ /dev/null @@ -1,47 +0,0 @@ -/** - * \file - * - * - * \brief MSP430 debug support (implementation). - * - * \author Mohamed Tarek - */ - -#include "cfg/cfg_debug.h" - -/** - * UART Clock source. - * - * $WIZ$ kdbg_clk_src = "KDBG_UART_ACLK", "KDBG_UART_SMCLK" - */ -#define KDBG_UART_ACLK 0 -#define KDBG_UART_SMCLK 1 diff --git a/bertos/cpu/msp430/info/MSP430F2274.cdef b/bertos/cpu/msp430/info/MSP430F2274.cdef deleted file mode 100644 index f357c3cd..00000000 --- a/bertos/cpu/msp430/info/MSP430F2274.cdef +++ /dev/null @@ -1,57 +0,0 @@ -# -#-*- coding: utf-8 -*- -# -# \file -# -# -# Cpu info of the MSP430f2274. -# -# This file contains all the info for the BeRTOS wizard. -# -# \author Mohamed Tarek -# -# - -# Import the common settings for the path. -include("msp430.common") - -# Short description of the cpu. -CPU_DESC += [ "32 Kbytes Flash", - "1 Kbyte internal SRAM", - "256 bytes Information Flash"] - -# If we use the GCC compiler we should pass some flags. -CORE_CPU = "msp430x2274" - -# GCC flags for this cpu. -MK_CPU_CPPFLAGS += " -D__MSP430F2274__" - -include("msp430_post.common") diff --git a/bertos/cpu/msp430/info/msp430.common b/bertos/cpu/msp430/info/msp430.common deleted file mode 100644 index 057b1228..00000000 --- a/bertos/cpu/msp430/info/msp430.common +++ /dev/null @@ -1,69 +0,0 @@ -# -#-*- coding: utf-8 -*- -# -# \file -# -# -# General CPU info denfinition MSP430 family. -# -# This file contains all the info for the BeRTOS wizard. -# -# \author Mohamed Tarek -# -# - -# Import the common settings for the path. -include("../../path.common") - -# Short description of the cpu. -CPU_DESC = [ "Texas Instruments MSP430 Microcontroller ", - "16-bit RISC Architecture"] - -# Type of the toolchain we should use to compile the source for this CPU. -TOOLCHAIN = "msp430" - -# Special CPU related tags. -CPU_TAGS = ["Von Neumann", TOOLCHAIN] - -# CPU default clock frequency -CPU_DEFAULT_FREQ = "1000000UL" - -# Where are locate the bertos directories -SCRIPT_DIR = CPU_DIR + "msp430/scripts/" - -MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "msp430/flash.sh" -MK_STOPFLASH_SCRIPT = PRG_SCRIPTS_DIR + "msp430/stopflash.sh" -MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "nodebug.sh" -MK_STOPDEBUG_SCRIPT = PRG_SCRIPTS_DIR + "none.sh" - -# Common GCC flags. -MK_CPU_CPPFLAGS = "-Os -I" + CPU_DIR + "msp430/" - diff --git a/bertos/cpu/msp430/info/msp430_post.common b/bertos/cpu/msp430/info/msp430_post.common deleted file mode 100644 index 6705724a..00000000 --- a/bertos/cpu/msp430/info/msp430_post.common +++ /dev/null @@ -1,8 +0,0 @@ -# CPU type used for flashing -MK_PROGRAMMER_CPU = CORE_CPU - -# Name of the flag used by the build system to pass to the compiler the CPU type. -MK_MCU = CORE_CPU - -# Add CPU core to tags -CPU_TAGS += [ CORE_CPU ]