Mercurial > nand-ecoscentric
changeset 3349:a99daf62e693
Redefine CYGNUM_HAL_INTERRUPT_RTC_RTC because of
conflict with same named macro defined in hal_intr.h (Cortex-M architecture).
Define some interrrupt numbers, previously reservrd.
Upgrade RTC registers. [ Bugzilla 1001904 ]
| author | vae |
|---|---|
| date | Fri, 20 Sep 2013 20:53:37 +0000 |
| parents | 4baa86091c2c |
| children | 04cc2ad81e4f |
| files | packages/hal/cortexm/kinetis/var/current/ChangeLog packages/hal/cortexm/kinetis/var/current/include/var_intr.h packages/hal/cortexm/kinetis/var/current/include/var_io.h |
| diffstat | 3 files changed, 34 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/hal/cortexm/kinetis/var/current/ChangeLog +++ b/packages/hal/cortexm/kinetis/var/current/ChangeLog @@ -1,3 +1,10 @@ +2013-04-28 Ilija Kocho <ilijak@siva.com.mk> + + * include/var_intr.h : Redefine CYGNUM_HAL_INTERRUPT_RTC_RTC because of + conflict with same named macro defined in hal_intr.h (Cortex-M architecture). + Define some interrrupt numbers, previously reservrd. + * include/var_io.h : Upgrade RTC registers. [ Bugzilla 1001904 ] + 2013-06-12 Mike Jones <mike@proclivis.com> * include/var_io_gpio.h
--- a/packages/hal/cortexm/kinetis/var/current/include/var_intr.h +++ b/packages/hal/cortexm/kinetis/var/current/include/var_intr.h @@ -127,8 +127,8 @@ typedef enum { CYGNUM_HAL_INTERRUPT_FTM1, // FTM1 fault, overflow and channels int CYGNUM_HAL_INTERRUPT_FTM2, // FTM2 fault, overflow and channels int CYGNUM_HAL_INTERRUPT_CMT, // CMT int - CYGNUM_HAL_INTERRUPT_RTC, // RTC int - CYGNUM_HAL_INTERRUPT_Reserved83, // Reserved int 83 + CYGNUM_HAL_INTERRUPT_RTC_RTC, // RTC int + CYGNUM_HAL_INTERRUPT_RTC_SECONDS, // RTC seconds interrupt CYGNUM_HAL_INTERRUPT_PIT0, // PIT timer channel 0 int CYGNUM_HAL_INTERRUPT_PIT1, // PIT timer channel 1 int CYGNUM_HAL_INTERRUPT_PIT2, // PIT timer channel 2 int @@ -153,24 +153,26 @@ typedef enum { CYGNUM_HAL_INTERRUPT_PORTC, // Port C int CYGNUM_HAL_INTERRUPT_PORTD, // Port D int CYGNUM_HAL_INTERRUPT_PORTE, // Port E int - CYGNUM_HAL_INTERRUPT_Reserved108, // Reserved int 108 - CYGNUM_HAL_INTERRUPT_Reserved109, // Reserved int 109 - CYGNUM_HAL_INTERRUPT_Reserved110, // Reserved int 110 - CYGNUM_HAL_INTERRUPT_Reserved111, // Reserved int 111 - CYGNUM_HAL_INTERRUPT_Reserved112, // Reserved int 112 - CYGNUM_HAL_INTERRUPT_Reserved113, // Reserved int 113 - CYGNUM_HAL_INTERRUPT_Reserved114, // Reserved int 114 - CYGNUM_HAL_INTERRUPT_Reserved115, // Reserved int 115 - CYGNUM_HAL_INTERRUPT_Reserved116, // Reserved int 116 - CYGNUM_HAL_INTERRUPT_Reserved117, // Reserved int 117 - CYGNUM_HAL_INTERRUPT_Reserved118, // Reserved int 118 - CYGNUM_HAL_INTERRUPT_Reserved119 // Reserved int 119 + CYGNUM_HAL_INTERRUPT_PORTF, // Port F interrupt + CYGNUM_HAL_INTERRUPT_DDR, // DDR interrupt + CYGNUM_HAL_INTERRUPT_SWI, // Software interrupt + CYGNUM_HAL_INTERRUPT_NFC, // NAND flash controller interrupt + CYGNUM_HAL_INTERRUPT_USBHS, // USB high speed OTG interrupt + CYGNUM_HAL_INTERRUPT_GLCD, // Graphical LCD interrupt + CYGNUM_HAL_INTERRUPT_CMP3, // CMP3 interrupt + CYGNUM_HAL_INTERRUPT_TAMPER, // Tamper detect interrupt + CYGNUM_HAL_INTERRUPT_Reserved116, // Reserved interrupt 116 + CYGNUM_HAL_INTERRUPT_FTM3, // FTM3 fault, overflow and channels interrupt + CYGNUM_HAL_INTERRUPT_ADC2, // ADC2 interrupt + CYGNUM_HAL_INTERRUPT_ADC3, // ADC3 interrupt + CYGNUM_HAL_INTERRUPT_I2S1_TX, // I2S1 transmit interrupt + CYGNUM_HAL_INTERRUPT_I2S1_RX // I2S1 receive interrupt } KinetisExtInterrupt_e; -#define CYGNUM_HAL_INTERRUPT_NVIC_MAX (CYGNUM_HAL_INTERRUPT_Reserved119) +#define CYGNUM_HAL_INTERRUPT_NVIC_MAX (CYGNUM_HAL_INTERRUPT_I2S1_RX) #define CYGNUM_HAL_ISR_MIN 0 -#define CYGNUM_HAL_ISR_MAX CYGNUM_HAL_INTERRUPT_Reserved119 +#define CYGNUM_HAL_ISR_MAX CYGNUM_HAL_INTERRUPT_I2S1_RX #define CYGNUM_HAL_ISR_COUNT (CYGNUM_HAL_ISR_MAX + 1) #define CYGNUM_HAL_VSR_MIN 0
--- a/packages/hal/cortexm/kinetis/var/current/include/var_io.h +++ b/packages/hal/cortexm/kinetis/var/current/include/var_io.h @@ -409,7 +409,15 @@ typedef volatile struct cyghwr_hal_kinet cyg_uint32 sr; // Status Register cyg_uint32 lr; // Lock Register cyg_uint32 ier; // Enterrupt Enable Register - cyg_uint8 reserved[2016]; + cyg_uint32 ttsr; // Tamper Times Seconds Register + cyg_uint32 mer; // Monotonic Enable Register + cyg_uint32 mclr; // Monotonic Counter Low Register + cyg_uint32 mchr; // Monotonic Counter High Register + cyg_uint32 ter; // Tamper Enable Register + cyg_uint32 tdr; // Tamper Detect Register + cyg_uint32 ttr; // Tamper Trim Register + cyg_uint32 tir; // Tamper Interrupt Register + cyg_uint8 reserved[1984]; cyg_uint32 war; // Write Access Register cyg_uint32 rar; // Read Access Register } cyghwr_hal_kinetis_rtc_t;