diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2017-08-08 17:29:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-08 17:29:28 +0200 |
| commit | bec3eada374945e6ebf9c12fe5722e99636718c4 (patch) | |
| tree | f26c2d640922440946595e17e819bf1cdd3d8840 /os/common | |
| parent | 2fb40b504f7596b154dc4cc940b222790ea1f580 (diff) | |
| parent | e04751c836619094826dbd1c106d50a3b6ace32f (diff) | |
| download | ChibiOS-Contrib-bec3eada374945e6ebf9c12fe5722e99636718c4.tar.gz ChibiOS-Contrib-bec3eada374945e6ebf9c12fe5722e99636718c4.tar.bz2 ChibiOS-Contrib-bec3eada374945e6ebf9c12fe5722e99636718c4.zip | |
Merge branch 'master' into usbh_devel
Diffstat (limited to 'os/common')
| -rw-r--r-- | os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h | 1 | ||||
| -rw-r--r-- | os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h index d2693b0..7c40591 100644 --- a/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h @@ -114,6 +114,7 @@ typedef int IRQn_Type; #include "inc/hw_ssi.h" #include "inc/hw_udma.h" #include "inc/hw_pwm.h" +#include "inc/hw_adc.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index b73032b..7bf68a0 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -99,6 +99,7 @@ typedef int IRQn_Type; #include "inc/hw_ssi.h" #include "inc/hw_udma.h" #include "inc/hw_pwm.h" +#include "inc/hw_adc.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" |