Revert "rebased to actual top"

This reverts commit 17dff90.

Author: robertinant

hardware/msp430/boards.txt

@@ -2,7 +2,6 @@
 lpmsp430g2452.name=LaunchPad w/ msp430g2452
 lpmsp430g2452.upload.protocol=rf2500
 lpmsp430g2452.upload.maximum_size=8192
-lpmsp430g2452.bootloader.lock_bits=0x0F
 lpmsp430g2452.build.mcu=msp430g2452
 lpmsp430g2452.build.f_cpu=16000000L
 lpmsp430g2452.build.core=msp430
@@ -13,7 +12,6 @@ lpmsp430g2452.build.variant=launchpad
 lpmsp430g2231.name=LaunchPad w/ msp430g2231
 lpmsp430g2231.upload.protocol=rf2500
 lpmsp430g2231.upload.maximum_size=2048
-lpmsp430g2231.bootloader.lock_bits=0x0F
 lpmsp430g2231.build.mcu=msp430g2231
 lpmsp430g2231.build.f_cpu=1000000L
 lpmsp430g2231.build.core=msp430
@@ -24,29 +22,8 @@ lpmsp430g2231.build.variant=launchpad
 lpmsp430g2553.name=LaunchPad w/ msp430g2553
 lpmsp430g2553.upload.protocol=rf2500
 lpmsp430g2553.upload.maximum_size=16384
-lpmsp430g2553.bootloader.lock_bits=0x0F
 lpmsp430g2553.build.mcu=msp430g2553
 lpmsp430g2553.build.f_cpu=16000000L
 lpmsp430g2553.build.core=msp430
 lpmsp430g2553.build.variant=launchpad
 ##############################################################
-
-lpmsp430f2274.name=LaunchPad w/ msp430f2274
-lpmsp430f2274.upload.protocol=rf2500
-lpmsp430f2274.upload.maximum_size=16384
-lpmsp430f2274.bootloader.lock_bits=0x0F
-lpmsp430f2274.build.mcu=msp430f2274
-lpmsp430f2274.build.f_cpu=16000000L
-lpmsp430f2274.build.core=msp430
-lpmsp430f2274.build.variant=eZ430-RF
-##############################################################
-
-lpmsp430fr5739.name=LaunchPad w/ msp430fr5739
-lpmsp430fr5739.upload.protocol=rf2500
-lpmsp430fr5739.upload.maximum_size=15872
-lpmsp430fr5739.bootloader.lock_bits=0x0F
-lpmsp430fr5739.build.mcu=msp430fr5739
-lpmsp430fr5739.build.f_cpu=8000000L
-lpmsp430fr5739.build.core=msp430
-lpmsp430fr5739.build.variant=EXP430FR57xx
-##############################################################

hardware/msp430/cores/msp430/Energia.h

@@ -25,18 +25,10 @@ extern "C"{
 #define FALLING 1
 #define RISING 0
 
-//#define INPUT 0x0
-//#define OUTPUT 0x1
-//#define INPUT_PULLUP 0x2
-//#define INPUT_PULLDOWN 0x3
-
 #define INPUT 0x0
 #define OUTPUT 0x1
 #define INPUT_PULLUP 0x2
-#define INPUT_PULLDOWN 0x4
-#define PORT_SELECTION0 0x10
-#define PORT_SELECTION1 0x20
-
+#define INPUT_PULLDOWN 0x3
 
 #define true 0x1
 #define false 0x0
@@ -54,59 +46,26 @@ extern "C"{
 #define EXTERNAL SREF_2
 #endif
 
-#if defined(__MSP430_HAS_ADC10_B__)
-#define DEFAULT ADC10SREF_0
-#define INTERNAL1V5 ADC10SREF_1 + ADC10REFON
-#define INTERNAL2V5 ADC10SREF_1 + ADC10REFON + ADC10REF2_5V
-#define EXTERNAL ADC10SREF_2
-#endif
-
-enum{
-  P1 = 1,
-  P2,
-#ifdef __MSP430_HAS_PORT3_R__
-  P3,
-#endif  
-#ifdef __MSP430_HAS_PORT4_R__
-  P4,
-#endif  
-#ifdef __MSP430_HAS_PORT5_R__
-  P5,
-#endif  
-#ifdef __MSP430_HAS_PORT6_R__
-  P6,
-#endif  
-#ifdef __MSP430_HAS_PORT7_R__
-  P7,
-#endif  
-#ifdef __MSP430_HAS_PORTJ_R__
-  PJ,
-#endif  
-  };
-
-enum{
-  T0A0,
-  T0A1,
-  T0A2,
-  T1A0,
-  T1A1,
-  T1A2,
-  T1A3,
-  T1A4,
-  T1A5,
-  T2A0,
-  T2A1,
-  T2A2,
-  T0B0,
-  T0B1,
-  T0B2,
-  T1B0,
-  T1B1,
-  T1B2,
-  T2B0,
-  T2B1,
-  T2B2
-  };
+#define P1 1
+#define P2 2
+#define P3 3
+#define P4 4
+#define P5 5
+#define P6 6
+#define P7 7
+
+#define T0A0 0
+#define T0A1 1
+#define T0A2 2
+#define T1A0 3
+#define T1A1 4
+#define T1A2 5
+#define T1A3 6
+#define T1A4 7
+#define T1A5 8
+#define T2A0 9
+#define T2A1 10
+#define T2A2 11
 
 typedef uint8_t boolean;
 typedef uint8_t byte;
@@ -165,29 +124,21 @@ void detachInterrupt(uint8_t);
 extern const uint8_t digital_pin_to_timer[];
 extern const uint8_t digital_pin_to_port[];
 extern const uint8_t digital_pin_to_bit_mask[];
-extern const uint16_t port_to_sel0[];
-extern const uint16_t port_to_sel1[];
+extern const uint16_t port_to_sel[];
 extern const uint16_t port_to_sel2[];
 extern const uint16_t port_to_input[];
 extern const uint16_t port_to_output[];
 
-#define digitalPinToPort(P)    ( digital_pin_to_port[P] )
+#define digitalPinToPort(P) ( digital_pin_to_port[P] )
 #define digitalPinToBitMask(P) ( digital_pin_to_bit_mask[P] )
-#define digitalPinToTimer(P)   ( digital_pin_to_timer[P] )
-#define portDirRegister(P)     ( (volatile uint8_t *)( port_to_dir[P]) )
-/* 
- * We either of the compination   PxSEL and PxSEL2   or   PxSEL0 and PxSEL1
- * So we can remap  PxSEL and PxSEL2   to   PxSEL0 and PxSEL1
-*/ 
-#define portSelRegister(P)     ( (volatile uint8_t *)( port_to_sel0[P]) )
-#define portSel2Register(P)    ( (volatile uint8_t *)( port_to_sel2[P]) )
-
-#define portSel0Register(P)    ( (volatile uint8_t *)( port_to_sel0[P]) )
-#define portSel1Register(P)    ( (volatile uint8_t *)( port_to_sel1[P]) )
-#define portRenRegister(P)     ( (volatile uint8_t *)( port_to_ren[P]) )
-#define portOutputRegister(P)  ( (volatile uint8_t *)( port_to_output[P]) )
-#define portInputRegister(P)   ( (volatile uint8_t *)( port_to_input[P]) )
-#define digitalPinToTimer(P)   ( digital_pin_to_timer[P] )
+#define digitalPinToTimer(P) ( digital_pin_to_timer[P] )
+#define portDirRegister(P) ( (volatile uint16_t *)( port_to_dir[P]) )
+#define portSelRegister(P) ( (volatile uint16_t *)( port_to_sel[P]) )
+#define portSel2Register(P) ( (volatile uint16_t *)( port_to_sel2[P]) )
+#define portRenRegister(P) ( (volatile uint16_t *)( port_to_ren[P]) )
+#define portOutputRegister(P) ( (volatile uint16_t *)( port_to_output[P]) )
+#define portInputRegister(P) ( (volatile uint16_t *)( port_to_input[P]) )
+#define digitalPinToTimer(P) ( digital_pin_to_timer[P] )
 
 // Implemented in wiring.c
 void delayMicroseconds(unsigned int us);

hardware/msp430/cores/msp430/HardwareSerial.cpp

@@ -36,12 +36,21 @@
 #include "Energia.h"
 #include "wiring_private.h"
 
-#if defined(__MSP430_HAS_USCI__) || defined(__MSP430_HAS_EUSCI_A0__)
+#if defined(__MSP430_HAS_USCI__)
 
 #include "HardwareSerial.h"
 
 HardwareSerial *SerialPtr;
 
+/**
+ * Receive Data (RXD) at P1.1
+ */
+#define RXD		BIT1
+
+/**
+ * Receive Data (TXD) at P1.2
+ */
+#define TXD		BIT2
 
 
 #define SERIAL_BUFFER_SIZE 16
@@ -83,12 +92,8 @@ HardwareSerial::HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_buffer)
 
 void HardwareSerial::begin(unsigned long baud)
 {
-	unsigned int mod, divider;
-	unsigned char oversampling;
-//	uint8_t bit;
-//	uint8_t port;
-//	volatile uint8_t *sel;
-	
+	unsigned int divider;
+	unsigned char mod, oversampling;
 
 	if (SMCLK/baud>=48) {                                                // requires SMCLK for oversampling
 		oversampling = 1;
@@ -99,44 +104,27 @@ void HardwareSerial::begin(unsigned long baud)
 
 	divider=(SMCLK<<4)/baud;
 
-	SerialPtr = this;
-
-	pinMode(UARTRXD, UARTRXD_SET_MODE);
-	pinMode(UARTTXD, UARTTXD_SET_MODE);	
-
-	UCA0CTL1 = UCSWRST;
-	UCA0CTL1 = UCSSEL_2;                                // SMCLK
-	UCA0CTL0 = 0;
-	UCA0ABCTL = 0;
-#if defined(__MSP430_HAS_EUSCI_A0__)
-	if(!oversampling) {
-		mod = ((divider&0xF)+1)&0xE;                    // UCBRSx (bit 1-3)
-		divider >>=4;
-	} else {
-		mod = divider&0xFFF0;                           // UCBRFx = INT([(N/16) – INT(N/16)] × 16)
-		divider>>=8;
-	}
-	UCA0BR0 = divider;
-	UCA0BR1 = divider>>8;
-	UCA0MCTLW = (oversampling ? UCOS16:0) | mod;
-#else
 	if(!oversampling) {
-		mod = ((divider&0xF)+1)&0xE;                    // UCBRSx (bit 1-3)
+		mod = ((divider&0xF)+1)&0xE;                                                // UCBRSx (bit 1-3)
 		divider >>=4;
 	} else {
-		mod = ((divider&0xf8)+0x8)&0xf0;                // UCBRFx (bit 4-7)
+		mod = ((divider&0xf8)+0x8)&0xf0;                                            // UCBRFx (bit 4-7)
 		divider>>=8;
 	}
+
+	SerialPtr = this;
+	P1SEL  = RXD + TXD;
+	P1SEL2  = RXD + TXD;
+
+	UCA0CTL1 = UCSWRST;
+	UCA0CTL1 = UCSSEL_2;        //SMCLK
+	UCA0CTL0 = 0;
+	UCA0ABCTL = 0;
 	UCA0BR0 = divider;
 	UCA0BR1 = divider>>8;
-	UCA0MCTL = (unsigned char)(oversampling ? UCOS16:0) | mod;
-#endif	
+	UCA0MCTL = (oversampling ? UCOS16:0) | mod;
 	UCA0CTL1 &= ~UCSWRST;
-#if defined(__MSP430_HAS_EUSCI_A0__)
-	UCA0IE = UCRXIE;
-#else
 	UC0IE = UCA0RXIE;
-#endif	
 }
 
 void HardwareSerial::end()
@@ -190,11 +178,7 @@ size_t HardwareSerial::write(uint8_t c)
 	_tx_buffer->buffer[_tx_buffer->head] = c;
 	_tx_buffer->head = i;
 
-#if defined(__MSP430_HAS_EUSCI_A0__)
-	UCA0IE |= UCTXIE;
-#else
-	UC0IE |= UCA0TXIE;
-#endif	
+	IE2 |= UCA0TXIE;
 
 	return 1;
 }
@@ -205,49 +189,30 @@ void HardwareSerial::ProcessRXInt(void)
 	store_char(c, &rx_buffer);
 }
 
+__attribute__((interrupt(USCIAB0RX_VECTOR)))
+void HardwareSerial::USCI0RX_ISR(void)
+{
+	SerialPtr->ProcessRXInt();
+}
 
 void HardwareSerial::ProcessTXInt(void)
 {
 	if (tx_buffer.head == tx_buffer.tail) {
 		// Buffer empty, so disable interrupts
-#if defined(__MSP430_HAS_EUSCI_A0__)
-		UCA0IE &= ~UCTXIE;
-		UCA0IFG |= UCTXIFG;    // Set Flag again
-#else
-		UC0IE &= ~UCA0TXIE;
-#endif	
+		IE2 &= ~UCA0TXIE;
 		return;
 	}
 
 	unsigned char c = tx_buffer.buffer[tx_buffer.tail];
 	tx_buffer.tail = (tx_buffer.tail + 1) % SERIAL_BUFFER_SIZE;
 	UCA0TXBUF = c;
 }
-#if defined(__MSP430_HAS_EUSCI_A0__)
-__attribute__((interrupt(USCI_A0_VECTOR)))
-void HardwareSerial::USCIA0_ISR(void)
-{
-  switch ( UCA0IV ) 
-  { 
-    case USCI_UART_UCRXIFG: SerialPtr->ProcessRXInt(); break;
-    case USCI_UART_UCTXIFG: SerialPtr->ProcessTXInt(); break;
-  }  
-	
-	
-}
-#else
-__attribute__((interrupt(USCIAB0RX_VECTOR)))
-void HardwareSerial::USCI0RX_ISR(void)
-{
-	SerialPtr->ProcessRXInt();
-}
 
 __attribute__((interrupt(USCIAB0TX_VECTOR))) 
 void HardwareSerial::USCI0TX_ISR(void)
 {
 	SerialPtr->ProcessTXInt();
 }
-#endif	
 
 // Preinstantiate Objects //////////////////////////////////////////////////////
 

hardware/msp430/cores/msp430/HardwareSerial.h

@@ -41,12 +41,8 @@ class HardwareSerial : public Stream
 		uint8_t lock;
 		ring_buffer *_rx_buffer;
 		ring_buffer *_tx_buffer;
-#if defined(__MSP430_HAS_EUSCI_A0__)
-		static void USCIA0_ISR (void);
-#else
 		static void USCI0RX_ISR (void);
 		static void USCI0TX_ISR (void);
-#endif		
 		void ProcessTXInt(void);
 		void ProcessRXInt(void);
 	public: