aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/TIVA
diff options
context:
space:
mode:
authormarcoveeneman <marco-veeneman@hotmail.com>2016-10-27 23:52:24 +0200
committermarcoveeneman <marco-veeneman@hotmail.com>2016-10-27 23:52:24 +0200
commit041c87831be9062b67602c935dbd9c61a5aaa115 (patch)
tree9372b12379c12240a761690dc967c5c56afe1855 /testhal/TIVA
parent538eba7b6fbc4dcc08bfa459d5edbaac4b1672b0 (diff)
downloadChibiOS-Contrib-041c87831be9062b67602c935dbd9c61a5aaa115.tar.gz
ChibiOS-Contrib-041c87831be9062b67602c935dbd9c61a5aaa115.tar.bz2
ChibiOS-Contrib-041c87831be9062b67602c935dbd9c61a5aaa115.zip
Some missing changes.
Diffstat (limited to 'testhal/TIVA')
-rw-r--r--testhal/TIVA/TM4C123x/SPI/main.c4
-rw-r--r--testhal/TIVA/TM4C123x/WDG/main.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/testhal/TIVA/TM4C123x/SPI/main.c b/testhal/TIVA/TM4C123x/SPI/main.c
index f04cdbf..7fa05ee 100644
--- a/testhal/TIVA/TM4C123x/SPI/main.c
+++ b/testhal/TIVA/TM4C123x/SPI/main.c
@@ -31,7 +31,7 @@ static const SPIConfig hs_spicfg =
NULL,
GPIOA,
3,
- TIVA_CR0_DSS(8) | /*TIVA_CR0_SPH | TIVA_CR_SPO |*/ TIVA_CR0_SRC(0),
+ SSI_CR0_DSS_8 | /*SSI_CR0_SPH | SSI_CR0_SPO |*/ SSI_CR0_SCR(0),
16
};
@@ -43,7 +43,7 @@ static const SPIConfig ls_spicfg =
NULL,
GPIOA,
3,
- TIVA_CR0_DSS(8) | /*TIVA_CR0_SPH | TIVA_CR_SPO |*/ TIVA_CR0_SRC(0),
+ SSI_CR0_DSS_8 | /*SSI_CR0_SPH | SSI_CR0_SPO |*/ SSI_CR0_SCR(0),
80
};
diff --git a/testhal/TIVA/TM4C123x/WDG/main.c b/testhal/TIVA/TM4C123x/WDG/main.c
index da08cfb..d5fa9e6 100644
--- a/testhal/TIVA/TM4C123x/WDG/main.c
+++ b/testhal/TIVA/TM4C123x/WDG/main.c
@@ -36,7 +36,7 @@ static const WDGConfig wdgcfg =
{
TIVA_SYSCLK,
watchdog_timeout,
- TEST_STALL
+ WDT_TEST_STALL
};
/*