diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/sh7034.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/firmware/sh7034.h b/firmware/sh7034.h index 57f617d544..25bfcfa4a4 100644 --- a/firmware/sh7034.h +++ b/firmware/sh7034.h | |||
| @@ -37,18 +37,14 @@ | |||
| 37 | #define SSR1_ADDR 0x05FFFECC | 37 | #define SSR1_ADDR 0x05FFFECC |
| 38 | #define RDR1_ADDR 0x05FFFECD | 38 | #define RDR1_ADDR 0x05FFFECD |
| 39 | 39 | ||
| 40 | #define ADDRA_ADDR 0x05FFFEE0 | ||
| 41 | #define ADDRAH_ADDR 0x05FFFEE0 | 40 | #define ADDRAH_ADDR 0x05FFFEE0 |
| 42 | #define ADDRAL_ADDR 0x05FFFEE1 | 41 | #define ADDRAL_ADDR 0x05FFFEE1 |
| 43 | #define ADDRB_ADDR 0x05FFFEE2 | ||
| 44 | #define ADDRBH_ADDR 0x05FFFEE2 | 42 | #define ADDRBH_ADDR 0x05FFFEE2 |
| 45 | #define ADDRBL_ADDR 0x05FFFEE3 | 43 | #define ADDRBL_ADDR 0x05FFFEE3 |
| 46 | #define ADDRC_ADDR 0x05FFFEE4 | ||
| 47 | #define ADDRCH_ADDR 0x05FFFEE4 | 44 | #define ADDRCH_ADDR 0x05FFFEE4 |
| 48 | #define ADDRCL_ADDR 0x05FFFEE5 | 45 | #define ADDRCL_ADDR 0x05FFFEE5 |
| 49 | #define ADDRD_ADDR 0x05FFFEE6 | ||
| 50 | #define ADDRDH_ADDR 0x05FFFEE6 | 46 | #define ADDRDH_ADDR 0x05FFFEE6 |
| 51 | #define ADDRDL_ADDR 0x05FFFEE6 | 47 | #define ADDRDL_ADDR 0x05FFFEE7 |
| 52 | #define ADCSR_ADDR 0x05FFFEE8 | 48 | #define ADCSR_ADDR 0x05FFFEE8 |
| 53 | #define ADCR_ADDR 0x05FFFEE9 | 49 | #define ADCR_ADDR 0x05FFFEE9 |
| 54 | 50 | ||
| @@ -173,16 +169,16 @@ | |||
| 173 | #define SSR1 (*((volatile unsigned char*)SSR1_ADDR)) | 169 | #define SSR1 (*((volatile unsigned char*)SSR1_ADDR)) |
| 174 | #define RDR1 (*((volatile unsigned char*)RDR1_ADDR)) | 170 | #define RDR1 (*((volatile unsigned char*)RDR1_ADDR)) |
| 175 | 171 | ||
| 176 | #define ADDRA (*((volatile unsigned short*)ADDRA_ADDR)) | 172 | #define ADDRA (*((volatile unsigned short*)ADDRAH_ADDR)) /* combined */ |
| 177 | #define ADDRAH (*((volatile unsigned char*)ADDRAH_ADDR)) | 173 | #define ADDRAH (*((volatile unsigned char*)ADDRAH_ADDR)) |
| 178 | #define ADDRAL (*((volatile unsigned char*)ADDRAL_ADDR)) | 174 | #define ADDRAL (*((volatile unsigned char*)ADDRAL_ADDR)) |
| 179 | #define ADDRB (*((volatile unsigned short*)ADDRB_ADDR)) | 175 | #define ADDRB (*((volatile unsigned short*)ADDRBH_ADDR)) /* combined */ |
| 180 | #define ADDRBH (*((volatile unsigned char*)ADDRBH_ADDR)) | 176 | #define ADDRBH (*((volatile unsigned char*)ADDRBH_ADDR)) |
| 181 | #define ADDRBL (*((volatile unsigned char*)ADDRBL_ADDR)) | 177 | #define ADDRBL (*((volatile unsigned char*)ADDRBL_ADDR)) |
| 182 | #define ADDRC (*((volatile unsigned short*)ADDRC_ADDR)) | 178 | #define ADDRC (*((volatile unsigned short*)ADDRCJ_ADDR)) /* combined */ |
| 183 | #define ADDRCH (*((volatile unsigned char*)ADDRCH_ADDR)) | 179 | #define ADDRCH (*((volatile unsigned char*)ADDRCH_ADDR)) |
| 184 | #define ADDRCL (*((volatile unsigned char*)ADDRCL_ADDR)) | 180 | #define ADDRCL (*((volatile unsigned char*)ADDRCL_ADDR)) |
| 185 | #define ADDRD (*((volatile unsigned short*)ADDRD_ADDR)) | 181 | #define ADDRD (*((volatile unsigned short*)ADDRDH_ADDR)) /* combined */ |
| 186 | #define ADDRDH (*((volatile unsigned char*)ADDRDH_ADDR)) | 182 | #define ADDRDH (*((volatile unsigned char*)ADDRDH_ADDR)) |
| 187 | #define ADDRDL (*((volatile unsigned char*)ADDRDL_ADDR)) | 183 | #define ADDRDL (*((volatile unsigned char*)ADDRDL_ADDR)) |
| 188 | #define ADCSR (*((volatile unsigned char*)ADCSR_ADDR)) | 184 | #define ADCSR (*((volatile unsigned char*)ADCSR_ADDR)) |
| @@ -258,8 +254,10 @@ | |||
| 258 | #define IPRE (*((volatile unsigned short*)IPRE_ADDR)) | 254 | #define IPRE (*((volatile unsigned short*)IPRE_ADDR)) |
| 259 | #define ICR (*((volatile unsigned short*)ICR_ADDR)) | 255 | #define ICR (*((volatile unsigned short*)ICR_ADDR)) |
| 260 | 256 | ||
| 257 | #define BAR (*((volatile unsigned long*)BARH_ADDR)) /* combined */ | ||
| 261 | #define BARH (*((volatile unsigned short*)BARH_ADDR)) | 258 | #define BARH (*((volatile unsigned short*)BARH_ADDR)) |
| 262 | #define BARL (*((volatile unsigned short*)BARL_ADDR)) | 259 | #define BARL (*((volatile unsigned short*)BARL_ADDR)) |
| 260 | #define BAMR (*((volatile unsigned long*)BAMRH_ADDR)) /* combined */ | ||
| 263 | #define BAMRH (*((volatile unsigned short*)BAMRH_ADDR)) | 261 | #define BAMRH (*((volatile unsigned short*)BAMRH_ADDR)) |
| 264 | #define BAMRL (*((volatile unsigned short*)BAMRL_ADDR)) | 262 | #define BAMRL (*((volatile unsigned short*)BAMRL_ADDR)) |
| 265 | #define BBR (*((volatile unsigned short*)BBR_ADDR)) | 263 | #define BBR (*((volatile unsigned short*)BBR_ADDR)) |