diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-03-28 19:34:50 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-03-29 00:49:06 +0100 |
| commit | 6450cbbdca62fe5fa9e58b835b29b35bf4079286 (patch) | |
| tree | c1f2a6185faf2a4f761c3af8575e46a744885306 | |
| parent | 022dfe7ab3ae17987763a1838e274dd7be4482d6 (diff) | |
| download | rockbox-6450cbbdca62fe5fa9e58b835b29b35bf4079286.tar.gz rockbox-6450cbbdca62fe5fa9e58b835b29b35bf4079286.zip | |
headers: Don't blindly include <inttypes.h> in files used by ASM
Causes things to go boom with newer toolchains.
Change-Id: Ibd00edc9ea16aae8115b63ebce08ac920b0608a2
| -rw-r--r-- | firmware/export/pl080.h | 1 | ||||
| -rw-r--r-- | firmware/export/s5l8700.h | 4 | ||||
| -rw-r--r-- | firmware/export/s5l8702.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/firmware/export/pl080.h b/firmware/export/pl080.h index 9e48f07f0c..fe0013b59d 100644 --- a/firmware/export/pl080.h +++ b/firmware/export/pl080.h | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | /* | 24 | /* |
| 25 | * ARM PrimeCell PL080 Multiple Master DMA controller | 25 | * ARM PrimeCell PL080 Multiple Master DMA controller |
| 26 | */ | 26 | */ |
| 27 | #include <stdint.h> | ||
| 27 | #include <stddef.h> | 28 | #include <stddef.h> |
| 28 | #include <stdbool.h> | 29 | #include <stdbool.h> |
| 29 | 30 | ||
diff --git a/firmware/export/s5l8700.h b/firmware/export/s5l8700.h index b559992c6a..945cf932cd 100644 --- a/firmware/export/s5l8700.h +++ b/firmware/export/s5l8700.h | |||
| @@ -19,7 +19,9 @@ | |||
| 19 | * | 19 | * |
| 20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
| 21 | 21 | ||
| 22 | #include <inttypes.h> | 22 | #ifndef ASM |
| 23 | #include <stdint.h> | ||
| 24 | #endif | ||
| 23 | 25 | ||
| 24 | #define REG8_PTR_T volatile uint8_t * | 26 | #define REG8_PTR_T volatile uint8_t * |
| 25 | #define REG16_PTR_T volatile uint16_t * | 27 | #define REG16_PTR_T volatile uint16_t * |
diff --git a/firmware/export/s5l8702.h b/firmware/export/s5l8702.h index f9bf99ed3b..4b22e25366 100644 --- a/firmware/export/s5l8702.h +++ b/firmware/export/s5l8702.h | |||
| @@ -22,7 +22,9 @@ | |||
| 22 | #ifndef __S5L8702_H__ | 22 | #ifndef __S5L8702_H__ |
| 23 | #define __S5L8702_H__ | 23 | #define __S5L8702_H__ |
| 24 | 24 | ||
| 25 | #include <inttypes.h> | 25 | #ifndef ASM |
| 26 | #include <stdint.h> | ||
| 27 | #endif | ||
| 26 | 28 | ||
| 27 | #define REG8_PTR_T volatile uint8_t * | 29 | #define REG8_PTR_T volatile uint8_t * |
| 28 | #define REG16_PTR_T volatile uint16_t * | 30 | #define REG16_PTR_T volatile uint16_t * |