diff options
| author | marcoveeneman <marco-veeneman@hotmail.com> | 2016-10-27 23:52:24 +0200 |
|---|---|---|
| committer | marcoveeneman <marco-veeneman@hotmail.com> | 2016-10-27 23:52:24 +0200 |
| commit | 041c87831be9062b67602c935dbd9c61a5aaa115 (patch) | |
| tree | 9372b12379c12240a761690dc967c5c56afe1855 | |
| parent | 538eba7b6fbc4dcc08bfa459d5edbaac4b1672b0 (diff) | |
| download | ChibiOS-Contrib-041c87831be9062b67602c935dbd9c61a5aaa115.tar.gz ChibiOS-Contrib-041c87831be9062b67602c935dbd9c61a5aaa115.tar.bz2 ChibiOS-Contrib-041c87831be9062b67602c935dbd9c61a5aaa115.zip | |
Some missing changes.
| -rw-r--r-- | demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h | 2 | ||||
| -rw-r--r-- | testhal/TIVA/TM4C123x/SPI/main.c | 4 | ||||
| -rw-r--r-- | testhal/TIVA/TM4C123x/WDG/main.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h index 3abab92..c3e5921 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h @@ -31,7 +31,7 @@ * HAL driver system settings. */ #define TIVA_MOSC_SINGLE_ENDED FALSE -#define TIVA_RSCLKCFG_OSCSRC RSCLKCFG_OSCSRC_MOSC +#define TIVA_RSCLKCFG_OSCSRC SYSCTL_RSCLKCFG_OSCSRC_MOSC /* * GPT driver system settings. 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 }; /* |