diff options
Diffstat (limited to 'testhal/TIVA/TM4C123x/SPI')
| -rw-r--r-- | testhal/TIVA/TM4C123x/SPI/Makefile | 9 | ||||
| -rw-r--r-- | testhal/TIVA/TM4C123x/SPI/main.c | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/testhal/TIVA/TM4C123x/SPI/Makefile b/testhal/TIVA/TM4C123x/SPI/Makefile index 43de29b..bfcb376 100644 --- a/testhal/TIVA/TM4C123x/SPI/Makefile +++ b/testhal/TIVA/TM4C123x/SPI/Makefile @@ -80,13 +80,14 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../../.. +CHIBIOS = ../../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. -include $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk +include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk -include $(CHIBIOS)/community/os/hal/ports/TIVA/TM4C123x/platform.mk -include $(CHIBIOS)/community/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk +include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk +include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/testhal/TIVA/TM4C123x/SPI/main.c b/testhal/TIVA/TM4C123x/SPI/main.c index 5ccab55..f779ad3 100644 --- a/testhal/TIVA/TM4C123x/SPI/main.c +++ b/testhal/TIVA/TM4C123x/SPI/main.c @@ -51,7 +51,7 @@ static const SPIConfig ls_spicfg = * SPI bus contender 1. */ static THD_WORKING_AREA(spi_thread_1_wa, 256); -static msg_t spi_thread_1(void *p) +static THD_FUNCTION(spi_thread_1, p) { (void)p; chRegSetThreadName("SPI thread 1"); @@ -65,14 +65,13 @@ static msg_t spi_thread_1(void *p) spiUnselect(&SPID1); /* Slave Select de-assertion. */ spiReleaseBus(&SPID1); /* Ownership release. */ } - return 0; } /* * SPI bus contender 2. */ static THD_WORKING_AREA(spi_thread_2_wa, 256); -static msg_t spi_thread_2(void *p) +static THD_FUNCTION(spi_thread_2, p) { (void)p; chRegSetThreadName("SPI thread 2"); @@ -86,7 +85,6 @@ static msg_t spi_thread_2(void *p) spiUnselect(&SPID1); /* Slave Select de-assertion. */ spiReleaseBus(&SPID1); /* Ownership release. */ } - return 0; } /* |