summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/arch/msp430fr5969lp/driver/spi.h (renamed from include/arch/msp430fr5969lp/driver/spi_b.h)0
-rw-r--r--include/arch/msp430fr5994lp/driver/spi.h (renamed from include/arch/msp430fr5994lp/driver/spi_b.h)0
-rw-r--r--model/driver/nrf24l01.dfa2
-rw-r--r--model/driver/sharp96.dfa4
-rw-r--r--src/app/sharp96test/Makefile.inc2
-rw-r--r--src/app/sharp96test/main.cc2
-rw-r--r--src/app/transactiontest/main.cc11
-rw-r--r--src/app/transactiontest/util.S9
-rw-r--r--src/arch/msp430fr5969lp/Kconfig2
-rw-r--r--src/arch/msp430fr5969lp/Makefile.inc16
-rw-r--r--src/arch/msp430fr5969lp/driver/spi.cc (renamed from src/arch/msp430fr5969lp/driver/spi_b.cc)2
-rw-r--r--src/arch/msp430fr5994lp/Kconfig2
-rw-r--r--src/arch/msp430fr5994lp/Makefile.inc16
-rw-r--r--src/arch/msp430fr5994lp/driver/spi.cc (renamed from src/arch/msp430fr5994lp/driver/spi_b.cc)2
-rw-r--r--src/driver/nrf24l01.cc8
-rw-r--r--src/driver/sharp96.cc2
16 files changed, 27 insertions, 53 deletions
diff --git a/include/arch/msp430fr5969lp/driver/spi_b.h b/include/arch/msp430fr5969lp/driver/spi.h
index 4be7346..4be7346 100644
--- a/include/arch/msp430fr5969lp/driver/spi_b.h
+++ b/include/arch/msp430fr5969lp/driver/spi.h
diff --git a/include/arch/msp430fr5994lp/driver/spi_b.h b/include/arch/msp430fr5994lp/driver/spi.h
index 4be7346..4be7346 100644
--- a/include/arch/msp430fr5994lp/driver/spi_b.h
+++ b/include/arch/msp430fr5994lp/driver/spi.h
diff --git a/model/driver/nrf24l01.dfa b/model/driver/nrf24l01.dfa
index 8d8d0b7..b5bcb6e 100644
--- a/model/driver/nrf24l01.dfa
+++ b/model/driver/nrf24l01.dfa
@@ -2,7 +2,7 @@ codegen:
class: Nrf24l01
instance: nrf24l01
includes: ['driver/nrf24l01.h']
- flags: ['drivers=nrf24l01', 'arch_drivers=spi_b']
+ flags: ['drivers=nrf24l01', 'arch_drivers=spi']
dummygen:
enum:
diff --git a/model/driver/sharp96.dfa b/model/driver/sharp96.dfa
index 9ea510d..c342dc7 100644
--- a/model/driver/sharp96.dfa
+++ b/model/driver/sharp96.dfa
@@ -1,8 +1,8 @@
codegen:
instance: sharp96
- includes: ['driver/spi_b.h', 'driver/sharp96.h']
+ includes: ['driver/spi.h', 'driver/sharp96.h']
setup: ['spi.setup();', 'sharp96.setup();']
- flags: ['drivers=sharp96', 'arch_drivers=spi_b,counter']
+ flags: ['drivers=sharp96', 'arch_drivers=spi,counter']
states:
- UNINITIALIZED
diff --git a/src/app/sharp96test/Makefile.inc b/src/app/sharp96test/Makefile.inc
index 37bb857..a63136a 100644
--- a/src/app/sharp96test/Makefile.inc
+++ b/src/app/sharp96test/Makefile.inc
@@ -1,5 +1,5 @@
ifdef app
override loop = 1
- override arch_drivers += spi_b
+ override arch_drivers += spi
override drivers += sharp96
endif
diff --git a/src/app/sharp96test/main.cc b/src/app/sharp96test/main.cc
index bbf9258..38a8a3d 100644
--- a/src/app/sharp96test/main.cc
+++ b/src/app/sharp96test/main.cc
@@ -1,7 +1,7 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#include "driver/spi_b.h"
+#include "driver/spi.h"
#include "driver/sharp96.h"
unsigned char const lynx[12 * 96] = {
diff --git a/src/app/transactiontest/main.cc b/src/app/transactiontest/main.cc
index 1ca7f67..12d995f 100644
--- a/src/app/transactiontest/main.cc
+++ b/src/app/transactiontest/main.cc
@@ -2,13 +2,9 @@
#include "driver/gpio.h"
#include "driver/stdout.h"
#include "driver/uptime.h"
-#include "driver/spi_b.h"
+#include "driver/spi.h"
#include "driver/sharp96.h"
-#ifndef TIMER_CYCLES
-#error makeflag timer_cycles=1 required
-#endif
-
unsigned char const lynx[12 * 96] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -117,6 +113,9 @@ extern "C" {
uint16_t i = 0;
class Transaction {
+ /**
+ * Transactions objects must not be nested.
+ */
public:
inline Transaction() { asm_save_all(); }
inline ~Transaction() {}
@@ -126,7 +125,6 @@ class Transaction {
void loop(void)
{
- gpio.led_toggle(1);
{
Transaction tx;
kout << dec << i << endl;
@@ -153,7 +151,6 @@ int main(void)
sharp96.setup();
sharp96.powerOn();
- gpio.led_on(0);
gpio.input(GPIO::p4_5, 1);
asm_load_all();
diff --git a/src/app/transactiontest/util.S b/src/app/transactiontest/util.S
index 1a12736..ea298b6 100644
--- a/src/app/transactiontest/util.S
+++ b/src/app/transactiontest/util.S
@@ -6,6 +6,7 @@
#define SRAM_SIZE 4096
; SRAM and stack pointer backup space
+; two backup areas allow for consistency in case of a power loss during backup
sp_backup1:
.space 2
sram_backup1:
@@ -20,7 +21,8 @@ sram_backup2:
backup_cookie:
.space 2
-; save entire SRAM and CPU register state to persistent FRAM
+; save entire SRAM and CPU register state to persistent FRAM.
+; Must be called with interrupts disabled
asm_save_all:
; r4 to r11 are callee saved -> push them to the stack.
@@ -65,9 +67,8 @@ save_sram_word:
; load entire SRAM and CPU register state from persistent FRAM,
; if it contains valid backup data. Execution will resume at the
-; last place where asm_save_all() was called is if nothing in between
-; had happened. Does not take possible the state of hardware peripherals
-; into account.
+; last place where asm_save_all() was called as if nothing in between
+; had happened. Does not take the state of hardware peripherals into account.
asm_load_all:
; check if we have backup data
diff --git a/src/arch/msp430fr5969lp/Kconfig b/src/arch/msp430fr5969lp/Kconfig
index 549c54f..6b085ae 100644
--- a/src/arch/msp430fr5969lp/Kconfig
+++ b/src/arch/msp430fr5969lp/Kconfig
@@ -16,7 +16,7 @@ select meta_driver_i2c
#bool "SPI on eUSCI_A1"
#select meta_driver_spi
-config arch_msp430fr5969lp_driver_spi_b
+config arch_msp430fr5969lp_driver_spi
bool "SPI on eUSCI_B0"
select meta_driver_spi
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index 8a48859..af285ac 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -47,12 +47,8 @@ else ifneq ($(findstring i2c,${arch_drivers}), )
CONFIG_arch_msp430fr5969lp_driver_i2c = y
endif
-ifneq ($(findstring spi_a1,${arch_drivers}), )
- CONFIG_arch_msp430fr5969lp_driver_spi_a1 = y
-endif
-
-ifneq ($(findstring spi_b,${arch_drivers}), )
- CONFIG_arch_msp430fr5969lp_driver_spi_b = y
+ifneq ($(findstring spi,${arch_drivers}), )
+ CONFIG_arch_msp430fr5969lp_driver_spi = y
endif
ifneq ($(findstring timer,${arch_drivers}), )
@@ -82,12 +78,8 @@ ifdef CONFIG_arch_msp430fr5969lp_driver_i2c
COMMON_FLAGS += -DDRIVER_I2C
endif
-ifdef CONFIG_arch_msp430fr5969lp_driver_spi_a1
- CXX_TARGETS += src/arch/msp430fr5969lp/driver/spi_a1.cc
-endif
-
-ifdef CONFIG_arch_msp430fr5969lp_driver_spi_b
- CXX_TARGETS += src/arch/msp430fr5969lp/driver/spi_b.cc
+ifdef CONFIG_arch_msp430fr5969lp_driver_spi
+ CXX_TARGETS += src/arch/msp430fr5969lp/driver/spi.cc
endif
ifdef CONFIG_arch_msp430fr5969lp_driver_timer
diff --git a/src/arch/msp430fr5969lp/driver/spi_b.cc b/src/arch/msp430fr5969lp/driver/spi.cc
index 0fa71da..f34a76b 100644
--- a/src/arch/msp430fr5969lp/driver/spi_b.cc
+++ b/src/arch/msp430fr5969lp/driver/spi.cc
@@ -1,4 +1,4 @@
-#include "driver/spi_b.h"
+#include "driver/spi.h"
#include <msp430.h>
#ifndef F_I2C
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_b.cc b/src/arch/msp430fr5994lp/driver/spi.cc
index 8624a40..543987d 100644
--- a/src/arch/msp430fr5994lp/driver/spi_b.cc
+++ b/src/arch/msp430fr5994lp/driver/spi.cc
@@ -1,4 +1,4 @@
-#include "driver/spi_b.h"
+#include "driver/spi.h"
#include <msp430.h>
#ifndef F_I2C
diff --git a/src/driver/nrf24l01.cc b/src/driver/nrf24l01.cc
index a381fd0..1cde2ba 100644
--- a/src/driver/nrf24l01.cc
+++ b/src/driver/nrf24l01.cc
@@ -6,15 +6,7 @@
#include "driver/nrf24l01.h"
#include "driver/nrf24l01/registers.h"
-#ifdef MULTIPASS_ARCH_arduino_nano
#include "driver/spi.h"
-#endif
-#ifdef MULTIPASS_ARCH_msp430fr5969lp
-#include "driver/spi_b.h"
-#endif
-#ifdef MULTIPASS_ARCH_msp430fr5994lp
-#include "driver/spi_b.h"
-#endif
#include "driver/gpio.h"
#include "arch.h"
diff --git a/src/driver/sharp96.cc b/src/driver/sharp96.cc
index 1e9a2ec..2bd46d7 100644
--- a/src/driver/sharp96.cc
+++ b/src/driver/sharp96.cc
@@ -1,5 +1,5 @@
#include "driver/sharp96.h"
-#include "driver/spi_b.h"
+#include "driver/spi.h"
#include "driver/gpio.h"
#ifndef SHARP96_POWER_PIN
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 03:46:31 +0000