tsiry-sandratraina.com / rockbox-zig
Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

misc: respect standard __ASSEMBLER__ define in CPU headers

The JZ47xx and S5L87xx processor families used their own
special defines (__ASSEMBLY__ and ASM respectively) in
their CPU headers to check if they were included from an
assembly source file.

For GCC the standard seems to be __ASSEMBLER__, so check
for that instead and remove the non-standard symbols.
Being more consistent across platforms makes it easier to
include cpu.h from cross-platform files (eg. plugin.lds).

Change-Id: I282930cad34e1a2ff18166f3b4338548b34f4a49

Aidan MacDonald f44b6c78 5a236963

+19 -23
+6 -6
firmware/export/jz4740.h
··· 40 40 #ifndef __JZ4740_H__ 41 41 #define __JZ4740_H__ 42 42 43 - #ifndef __ASSEMBLY__ 43 + #ifndef __ASSEMBLER__ 44 44 45 45 #define REG8(addr) (*(volatile unsigned char *)(addr)) 46 46 #define REG16(addr) (*(volatile unsigned short *)(addr)) 47 47 #define REG32(addr) (*(volatile unsigned int *)(addr)) 48 48 49 - #endif /* !ASSEMBLY */ 49 + #endif /* !__ASSEMBLER__ */ 50 50 51 51 /************************************************************************* 52 52 * Boot ROM Specification ··· 2528 2528 // Module Operation Definitions 2529 2529 // 2530 2530 //---------------------------------------------------------------------- 2531 - #ifndef __ASSEMBLY__ 2531 + #ifndef __ASSEMBLER__ 2532 2532 2533 2533 /*************************************************************************** 2534 2534 * GPIO ··· 4975 4975 }while(0) 4976 4976 4977 4977 4978 - #endif /* !__ASSEMBLY__ */ 4978 + #endif /* !__ASSEMBLER__ */ 4979 4979 4980 4980 4981 4981 #ifndef _IPU_H_ ··· 4986 4986 #define IPU_V_BASE 0xB3080000 4987 4987 #define IPU__SIZE 0x00001000 4988 4988 4989 - #ifndef __ASSEMBLY__ 4989 + #ifndef __ASSEMBLER__ 4990 4990 struct ipu_module 4991 4991 { 4992 4992 unsigned int reg_ctrl; // 0x0 ··· 5023 5023 float ratio; 5024 5024 int n, m; 5025 5025 }; 5026 - #endif /* !__ASSEMBLY__ */ 5026 + #endif /* !__ASSEMBLER__ */ 5027 5027 5028 5028 // Register offset 5029 5029 #define REG_CTRL 0x0
+1 -1
firmware/export/jz4760b.h
··· 37 37 #ifndef __JZ4760B_H__ 38 38 #define __JZ4760B_H__ 39 39 40 - #if defined(__ASSEMBLY__) || defined(__LANGUAGE_ASSEMBLY) 40 + #if defined(__ASSEMBLER__) 41 41 #ifndef __MIPS_ASSEMBLER 42 42 #define __MIPS_ASSEMBLER 43 43 #endif
+2 -2
firmware/export/mipsregs.h
··· 485 485 #define CEB_KERNEL 2 /* Count events in kernel mode EXL = ERL = 0 */ 486 486 #define CEB_EXL 1 /* Count events with EXL = 1, ERL = 0 */ 487 487 488 - #ifndef __ASSEMBLY__ 488 + #ifndef __ASSEMBLER__ 489 489 490 490 #define CAUSE_EXCCODE(x) ((CAUSEF_EXCCODE & (x->cp0_cause)) >> CAUSEB_EXCCODE) 491 491 #define CAUSE_EPC(x) (x->cp0_epc + (((x->cp0_cause & CAUSEF_BD) >> CAUSEB_BD) << 2)) ··· 959 959 #define set_cp0_cause(x) set_c0_cause(x) 960 960 #define set_cp0_config(x) set_c0_config(x) 961 961 962 - #endif /* !__ASSEMBLY__ */ 962 + #endif /* !__ASSEMBLER__ */ 963 963 964 964 #endif /* _ASM_MIPSREGS_H */
+1 -1
firmware/export/s5l87xx.h
··· 22 22 #ifndef __S5L87XX_H__ 23 23 #define __S5L87XX_H__ 24 24 25 - #ifndef ASM 25 + #ifndef __ASSEMBLER__ 26 26 #include <stdint.h> 27 27 #endif 28 28
-1
firmware/target/arm/mmu-arm.S
··· 18 18 * KIND, either express or implied. 19 19 * 20 20 ****************************************************************************/ 21 - #define ASM 22 21 #include "config.h" 23 22 #include "cpu.h" 24 23
-1
firmware/target/arm/rk27xx/crt0.S
··· 19 19 * KIND, either express or implied. 20 20 * 21 21 ****************************************************************************/ 22 - #define ASM 23 22 #include "config.h" 24 23 #include "cpu.h" 25 24
+1 -1
firmware/target/arm/s5l8702/app.lds
··· 1 - #define ASM 1 + #define __ASSEMBLER__ 2 2 #include "config.h" 3 3 #include "cpu.h" 4 4
+1 -1
firmware/target/arm/s5l8702/boot.lds
··· 1 - #define ASM 1 + #define __ASSEMBLER__ 2 2 #include "config.h" 3 3 #include "cpu.h" 4 4 #include "crypto-s5l8702.h" /* IM3HDR_SZ */
-1
firmware/target/arm/s5l8702/crt0.S
··· 19 19 * KIND, either express or implied. 20 20 * 21 21 ****************************************************************************/ 22 - #define ASM 23 22 #include "config.h" 24 23 #include "cpu.h" 25 24
+2 -2
firmware/target/arm/s5l8702/crypto-s5l8702.h
··· 40 40 #define SHA1_SZ 20 /* bytes */ 41 41 #define SIGN_SZ 16 42 42 43 - #ifndef ASM 43 + #ifndef __ASSEMBLER__ 44 44 #define IM3INFO_SZ (sizeof(struct Im3Info)) 45 45 #define IM3INFOSIGN_SZ (offsetof(struct Im3Info, info_sign)) 46 46 ··· 92 92 void im3_crypt(enum hwkeyaes_direction direction, 93 93 struct Im3Info *hinfo, void *fw_addr); 94 94 95 - #endif /* ASM */ 95 + #endif /* !__ASSEMBLER__ */ 96 96 97 97 #endif /* __CRYPTO_S5L8702_H__ */
-1
firmware/target/arm/s5l8702/lcd-asm-s5l8702.S
··· 50 50 #define YUV2RGB_VERSION VERSION_ARMV5TE_WST 51 51 52 52 53 - #define ASM 54 53 #include "config.h" 55 54 #include "cpu.h" 56 55
+1 -1
firmware/target/mips/ingenic_jz47xx/app.lds
··· 1 + #define __ASSEMBLER__ 1 2 #include "config.h" 2 - #define __ASSEMBLY__ 3 3 #include "cpu.h" 4 4 5 5 OUTPUT_FORMAT("elf32-littlemips")
+1 -1
utils/hwstub/stub/jz4760b/jz4760b.h
··· 15 15 #ifndef __JZ4760B_H__ 16 16 #define __JZ4760B_H__ 17 17 18 - #if defined(__ASSEMBLY__) || defined(__LANGUAGE_ASSEMBLY) 18 + #if defined(__ASSEMBLER__) 19 19 #ifndef __MIPS_ASSEMBLER 20 20 #define __MIPS_ASSEMBLER 21 21 #endif
+1 -1
utils/mks5lboot/dualboot/dualboot.lds
··· 1 - #define ASM 1 + #define __ASSEMBLER__ 2 2 #include "config.h" 3 3 #include "cpu.h" 4 4 #include "mks5lboot.h"
+2 -2
utils/mks5lboot/mks5lboot.h
··· 30 30 #define BIN_OFFSET (CERT_OFFSET + ((CERT_SIZE + 0x3) & ~ 0x3)) 31 31 #define MAX_PAYLOAD (DFU_MAXSIZE - BIN_OFFSET) 32 32 33 - #ifndef ASM 33 + #ifndef __ASSEMBLER__ 34 34 #include <stddef.h> 35 35 #include <stdint.h> 36 36 ··· 124 124 #ifdef __cplusplus 125 125 }; 126 126 #endif 127 - #endif /* ASM */ 127 + #endif /* __ASSEMBLER__ */ 128 128 129 129 #endif /* __MK6GBOOT_H__ */