diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-13 15:47:26 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-13 15:48:31 -0400 |
commit | 431caa4311c13a0937ae60ac225e780c0a0670b9 (patch) | |
tree | 319db80e0ce77663b70d04391ee81ccae2012c0b /firmware/target/arm/imx31/gigabeat-s | |
parent | f8bd54d5759c78d0777f25cad287a6dbeb0b45ea (diff) | |
download | rockbox-431caa4311c13a0937ae60ac225e780c0a0670b9.tar.gz rockbox-431caa4311c13a0937ae60ac225e780c0a0670b9.zip |
imx31: Work around an apparently not-quite-kosher abuse of CPP
(we were trying to foward-declare functions from within static
initializer context. GCC no longer accepts this)
Change-Id: I58f316ecc84c8ab45fffc054955727a55714b0a3
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/gpio-target.h | 5 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/mc13783-target.h | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/gpio-target.h b/firmware/target/arm/imx31/gigabeat-s/gpio-target.h index 543b25f244..9204e6cd9d 100644 --- a/firmware/target/arm/imx31/gigabeat-s/gpio-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/gpio-target.h | |||
@@ -28,6 +28,11 @@ | |||
28 | 28 | ||
29 | #ifdef DEFINE_GPIO_VECTOR_TABLE | 29 | #ifdef DEFINE_GPIO_VECTOR_TABLE |
30 | 30 | ||
31 | GPIO_EVENT_VECTOR_CB(GPIO1_31); | ||
32 | #if CONFIG_TUNER | ||
33 | GPIO_EVENT_VECTOR_CB(GPIO1_27); | ||
34 | #endif | ||
35 | |||
31 | GPIO_VECTOR_TBL_START() | 36 | GPIO_VECTOR_TBL_START() |
32 | /* mc13783 keeps the PRIINT high (no low pulse) if other unmasked | 37 | /* mc13783 keeps the PRIINT high (no low pulse) if other unmasked |
33 | * interrupts become active when clearing them or if a source being | 38 | * interrupts become active when clearing them or if a source being |
diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h b/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h index 4bb148e36c..e656e4e08f 100644 --- a/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h | |||
@@ -42,6 +42,15 @@ static struct spi_node mc13783_spi = | |||
42 | 0, /* SPI clock - no wait states */ | 42 | 0, /* SPI clock - no wait states */ |
43 | }; | 43 | }; |
44 | 44 | ||
45 | MC13783_EVENT_VECTOR_CB(ADCDONE); | ||
46 | #if CONFIG_RTC | ||
47 | MC13783_EVENT_VECTOR_CB(1HZ); | ||
48 | #endif | ||
49 | MC13783_EVENT_VECTOR_CB(ONOFD1); | ||
50 | MC13783_EVENT_VECTOR_CB(SE1); | ||
51 | MC13783_EVENT_VECTOR_CB(USB); | ||
52 | MC13783_EVENT_VECTOR_CB(ONOFD2); | ||
53 | |||
45 | /* Gigabeat S definitions for static MC13783 event registration */ | 54 | /* Gigabeat S definitions for static MC13783 event registration */ |
46 | MC13783_EVENT_VECTOR_TBL_START() | 55 | MC13783_EVENT_VECTOR_TBL_START() |
47 | /* ADC conversion complete */ | 56 | /* ADC conversion complete */ |