diff options
| author | Fabio Utzig <utzig@utzig.org> | 2016-04-04 22:53:09 -0300 |
|---|---|---|
| committer | Fabio Utzig <utzig@utzig.org> | 2016-04-04 22:53:09 -0300 |
| commit | 44ac27a5c51688a9180fca6dee63fb24d8660ade (patch) | |
| tree | 162db735816b5059b28fb01d243c10911611eac7 /testhal/TIVA/TM4C123x/PWM | |
| parent | 653c72ccc3c8ff29bb2f2cffa00d1898c96c8ecf (diff) | |
| download | ChibiOS-Contrib-44ac27a5c51688a9180fca6dee63fb24d8660ade.tar.gz ChibiOS-Contrib-44ac27a5c51688a9180fca6dee63fb24d8660ade.tar.bz2 ChibiOS-Contrib-44ac27a5c51688a9180fca6dee63fb24d8660ade.zip | |
Fix testhal for OS compatibility
Diffstat (limited to 'testhal/TIVA/TM4C123x/PWM')
| -rw-r--r-- | testhal/TIVA/TM4C123x/PWM/Makefile | 6 | ||||
| -rw-r--r-- | testhal/TIVA/TM4C123x/PWM/chconf.h | 25 |
2 files changed, 28 insertions, 3 deletions
diff --git a/testhal/TIVA/TM4C123x/PWM/Makefile b/testhal/TIVA/TM4C123x/PWM/Makefile index bfcb376..f171975 100644 --- a/testhal/TIVA/TM4C123x/PWM/Makefile +++ b/testhal/TIVA/TM4C123x/PWM/Makefile @@ -83,7 +83,7 @@ PROJECT = ch CHIBIOS = ../../../../../ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. -include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk +include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk @@ -91,7 +91,7 @@ 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 -include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). # Define linker script file here @@ -206,5 +206,5 @@ ULIBS = # End of user defines ############################################################################## -RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC +RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk diff --git a/testhal/TIVA/TM4C123x/PWM/chconf.h b/testhal/TIVA/TM4C123x/PWM/chconf.h index 25b16cc..5e7c63d 100644 --- a/testhal/TIVA/TM4C123x/PWM/chconf.h +++ b/testhal/TIVA/TM4C123x/PWM/chconf.h @@ -1,6 +1,8 @@ #ifndef _CHCONF_H_ #define _CHCONF_H_ +#define _CHIBIOS_RT_CONF_ + /*===========================================================================*/ /** * @name System timers settings @@ -414,6 +416,20 @@ } /** + * @brief ISR enter hook. + */ +#define CH_CFG_IRQ_PROLOGUE_HOOK() { \ + /* IRQ prologue code here.*/ \ +} + +/** + * @brief ISR exit hook. + */ +#define CH_CFG_IRQ_EPILOGUE_HOOK() { \ + /* IRQ epilogue code here.*/ \ +} + +/** * @brief Idle thread enter hook. * @note This hook is invoked within a critical zone, no OS functions * should be invoked from here. @@ -457,6 +473,15 @@ /* System halt code here.*/ \ } +/** + * @brief Trace hook. + * @details This hook is invoked each time a new record is written in the + * trace buffer. + */ +#define CH_CFG_TRACE_HOOK(tep) { \ + /* Trace code here.*/ \ +} + /** @} */ /*===========================================================================*/ |