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/export | |
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/export')
-rw-r--r-- | firmware/export/mc13783.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/firmware/export/mc13783.h b/firmware/export/mc13783.h index d427830786..83edd31904 100644 --- a/firmware/export/mc13783.h +++ b/firmware/export/mc13783.h | |||
@@ -1067,7 +1067,7 @@ enum mc13783_regs_enum | |||
1067 | #define MC13783_ICHRG_1064MA (0xc << 3) /* 967 1064 1170 */ | 1067 | #define MC13783_ICHRG_1064MA (0xc << 3) /* 967 1064 1170 */ |
1068 | #define MC13783_ICHRG_1152MA (0xd << 3) /* 1048 1152 1268 */ | 1068 | #define MC13783_ICHRG_1152MA (0xd << 3) /* 1048 1152 1268 */ |
1069 | #define MC13783_ICHRG_1596MA (0xe << 3) /* 1450 1596 1755 */ | 1069 | #define MC13783_ICHRG_1596MA (0xe << 3) /* 1450 1596 1755 */ |
1070 | #define MC13783_ICHRG_FULLY_ON (0xf << 3) /* Disallow HW FET turn on */ | 1070 | #define MC13783_ICHRG_FULLY_ON (0xf << 3) /* Disallow HW FET turn on */ |
1071 | #define MC13783_ICHRGTR (0x7 << 7) /* Min Nom Max */ | 1071 | #define MC13783_ICHRGTR (0x7 << 7) /* Min Nom Max */ |
1072 | #define MC13783_ICHRGTR_POS (7) | 1072 | #define MC13783_ICHRGTR_POS (7) |
1073 | #define MC13783_ICHRGTR_0MA (0x0 << 7) /* 0 0 0 */ | 1073 | #define MC13783_ICHRGTR_0MA (0x0 << 7) /* 0 0 0 */ |
@@ -1340,11 +1340,12 @@ struct mc13783_event | |||
1340 | { \ | 1340 | { \ |
1341 | static const struct mc13783_event __tbl[] = { | 1341 | static const struct mc13783_event __tbl[] = { |
1342 | 1342 | ||
1343 | #define MC13783_EVENT_VECTOR_CB(__name) void MC13783_EVENT_CB_##__name(void) | ||
1344 | |||
1343 | #define MC13783_EVENT_VECTOR(__name, __sense) \ | 1345 | #define MC13783_EVENT_VECTOR(__name, __sense) \ |
1344 | { .id = MC13783_INT_ID_##__name, \ | 1346 | { .id = MC13783_INT_ID_##__name, \ |
1345 | .sense = (__sense), \ | 1347 | .sense = (__sense), \ |
1346 | .callback = ({ void MC13783_EVENT_CB_##__name(void); \ | 1348 | .callback = (MC13783_EVENT_CB_##__name) }, |
1347 | MC13783_EVENT_CB_##__name; }) }, | ||
1348 | 1349 | ||
1349 | #define MC13783_EVENT_VECTOR_TBL_END() \ | 1350 | #define MC13783_EVENT_VECTOR_TBL_END() \ |
1350 | }; \ | 1351 | }; \ |