From ae3acc651a459500bc11ba938607875c6ae21f3a Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Mon, 31 Aug 2020 15:24:50 +0200
Subject: msp430fr: rename spi_b to spi to be consistent with other
 architectures

---
 src/arch/msp430fr5994lp/Kconfig         |  2 +-
 src/arch/msp430fr5994lp/Makefile.inc    | 16 ++-----
 src/arch/msp430fr5994lp/driver/spi.cc   | 75 +++++++++++++++++++++++++++++++++
 src/arch/msp430fr5994lp/driver/spi_b.cc | 75 ---------------------------------
 4 files changed, 80 insertions(+), 88 deletions(-)
 create mode 100644 src/arch/msp430fr5994lp/driver/spi.cc
 delete mode 100644 src/arch/msp430fr5994lp/driver/spi_b.cc

(limited to 'src/arch/msp430fr5994lp')

diff --git a/src/arch/msp430fr5994lp/Kconfig b/src/arch/msp430fr5994lp/Kconfig
index 385b59c..e240c2b 100644
--- a/src/arch/msp430fr5994lp/Kconfig
+++ b/src/arch/msp430fr5994lp/Kconfig
@@ -16,7 +16,7 @@ select meta_driver_i2c
 #bool "SPI on eUSCI_A1"
 #select meta_driver_spi
 
-config arch_msp430fr5994lp_driver_spi_b
+config arch_msp430fr5994lp_driver_spi
 bool "SPI on eUSCI_B1"
 select meta_driver_spi
 
diff --git a/src/arch/msp430fr5994lp/Makefile.inc b/src/arch/msp430fr5994lp/Makefile.inc
index 9446aeb..68d3894 100644
--- a/src/arch/msp430fr5994lp/Makefile.inc
+++ b/src/arch/msp430fr5994lp/Makefile.inc
@@ -58,12 +58,8 @@ else ifneq ($(findstring i2c,${arch_drivers}), )
 	CONFIG_arch_msp430fr5994lp_driver_i2c = y
 endif
 
-ifneq ($(findstring spi_a1,${arch_drivers}), )
-	CONFIG_arch_msp430fr5994lp_driver_spi_a1 = y
-endif
-
-ifneq ($(findstring spi_b,${arch_drivers}), )
-	CONFIG_arch_msp430fr5994lp_driver_spi_b = y
+ifneq ($(findstring spi,${arch_drivers}), )
+	CONFIG_arch_msp430fr5994lp_driver_spi = y
 endif
 
 ifneq ($(findstring timer,${arch_drivers}), )
@@ -93,12 +89,8 @@ ifdef CONFIG_arch_msp430fr5994lp_driver_i2c
 	COMMON_FLAGS += -DDRIVER_I2C
 endif
 
-ifdef CONFIG_arch_msp430fr5994lp_driver_spi_a1
-	CXX_TARGETS += src/arch/msp430fr5994lp/driver/spi_a1.cc
-endif
-
-ifdef CONFIG_arch_msp430fr5994lp_driver_spi_b
-	CXX_TARGETS += src/arch/msp430fr5994lp/driver/spi_b.cc
+ifdef CONFIG_arch_msp430fr5994lp_driver_spi
+	CXX_TARGETS += src/arch/msp430fr5994lp/driver/spi.cc
 endif
 
 ifdef CONFIG_arch_msp430fr5994lp_driver_timer
diff --git a/src/arch/msp430fr5994lp/driver/spi.cc b/src/arch/msp430fr5994lp/driver/spi.cc
new file mode 100644
index 0000000..543987d
--- /dev/null
+++ b/src/arch/msp430fr5994lp/driver/spi.cc
@@ -0,0 +1,75 @@
+#include "driver/spi.h"
+#include <msp430.h>
+
+#ifndef F_I2C
+#define F_I2C 1000000UL
+#endif
+
+void SPI::setup()
+{
+	UCB1CTLW0 |= UCSWRST;
+
+	/* UCB1CLK Pin 5.2 */
+	P5SEL1 &= ~BIT2;
+	P5SEL0 |= BIT2;
+	P5DIR |= BIT2;
+
+	/* UCB1SIMO Pin 5.0 */
+	P5SEL1 &= ~BIT0;
+	P5SEL0 |= BIT0;
+	P5DIR |= BIT0;
+
+	/* UCB1SOMI Pin 5.1 */
+	P5SEL1 &= ~BIT1;
+	P5SEL0 |= BIT1;
+	P5DIR &= ~BIT1;
+	//P1REN |= BIT6;
+
+	UCB1CTLW0 = UCCKPH | UCMSB | UCMST | UCSYNC | UCMODE_0 | UCSSEL__SMCLK | UCSWRST;
+	UCB1BRW = (F_CPU/F_I2C)-1; // /16 -> 1MHz
+	// UCB1BRW = (F_CPU / F_I2C) - 1
+	UCB1CTLW0 &= ~UCSWRST;
+}
+
+static inline unsigned char clean_rxbuf()
+{
+	return UCB1RXBUF;
+}
+
+signed char SPI::xmit(unsigned char tx_len, unsigned char *tx_buf,
+		unsigned char rx_len, unsigned char *rx_buf)
+{
+	if (tx_len < 1) {
+		return -1;
+	}
+
+	while (UCB1STATW & UCBUSY) ;
+
+	if (!(UCB1IFG & UCTXIFG)) {
+		return -1;
+	}
+
+	UCB1IFG &= ~UCRXIFG;
+	UCB1TXBUF = tx_buf[0];
+
+	unsigned char tx_pos = 1;
+	unsigned char rx_pos = 0;
+
+	while (tx_pos < tx_len || rx_pos < rx_len) {
+		if ((tx_pos < tx_len) && (UCB1IFG & UCTXIFG)) {
+			UCB1TXBUF = tx_buf[tx_pos++];
+		}
+		if (UCB1IFG & UCRXIFG) {
+			if (rx_pos < rx_len) {
+				rx_buf[rx_pos] = UCB1RXBUF;
+			} else {
+				UCB1IFG &= ~UCRXIFG;
+			}
+			rx_pos++;
+		}
+	}
+	while (UCB1STATW & UCBUSY) ;
+	return 0;
+}
+
+SPI spi;
diff --git a/src/arch/msp430fr5994lp/driver/spi_b.cc b/src/arch/msp430fr5994lp/driver/spi_b.cc
deleted file mode 100644
index 8624a40..0000000
--- a/src/arch/msp430fr5994lp/driver/spi_b.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "driver/spi_b.h"
-#include <msp430.h>
-
-#ifndef F_I2C
-#define F_I2C 1000000UL
-#endif
-
-void SPI::setup()
-{
-	UCB1CTLW0 |= UCSWRST;
-
-	/* UCB1CLK Pin 5.2 */
-	P5SEL1 &= ~BIT2;
-	P5SEL0 |= BIT2;
-	P5DIR |= BIT2;
-
-	/* UCB1SIMO Pin 5.0 */
-	P5SEL1 &= ~BIT0;
-	P5SEL0 |= BIT0;
-	P5DIR |= BIT0;
-
-	/* UCB1SOMI Pin 5.1 */
-	P5SEL1 &= ~BIT1;
-	P5SEL0 |= BIT1;
-	P5DIR &= ~BIT1;
-	//P1REN |= BIT6;
-
-	UCB1CTLW0 = UCCKPH | UCMSB | UCMST | UCSYNC | UCMODE_0 | UCSSEL__SMCLK | UCSWRST;
-	UCB1BRW = (F_CPU/F_I2C)-1; // /16 -> 1MHz
-	// UCB1BRW = (F_CPU / F_I2C) - 1
-	UCB1CTLW0 &= ~UCSWRST;
-}
-
-static inline unsigned char clean_rxbuf()
-{
-	return UCB1RXBUF;
-}
-
-signed char SPI::xmit(unsigned char tx_len, unsigned char *tx_buf,
-		unsigned char rx_len, unsigned char *rx_buf)
-{
-	if (tx_len < 1) {
-		return -1;
-	}
-
-	while (UCB1STATW & UCBUSY) ;
-
-	if (!(UCB1IFG & UCTXIFG)) {
-		return -1;
-	}
-
-	UCB1IFG &= ~UCRXIFG;
-	UCB1TXBUF = tx_buf[0];
-
-	unsigned char tx_pos = 1;
-	unsigned char rx_pos = 0;
-
-	while (tx_pos < tx_len || rx_pos < rx_len) {
-		if ((tx_pos < tx_len) && (UCB1IFG & UCTXIFG)) {
-			UCB1TXBUF = tx_buf[tx_pos++];
-		}
-		if (UCB1IFG & UCRXIFG) {
-			if (rx_pos < rx_len) {
-				rx_buf[rx_pos] = UCB1RXBUF;
-			} else {
-				UCB1IFG &= ~UCRXIFG;
-			}
-			rx_pos++;
-		}
-	}
-	while (UCB1STATW & UCBUSY) ;
-	return 0;
-}
-
-SPI spi;
-- 
cgit v1.2.3