change/move softswitch declarations

This commit is contained in:
Aaron Culliney 2013-11-22 23:37:26 -08:00
parent 0df02c2dc6
commit 0cc0db17b2
3 changed files with 36 additions and 33 deletions

View File

@ -149,25 +149,6 @@
enabled.
----------------------------------------------------------------- */
.comm SN(softswitches),4
.comm SN(base_ramrd),4
.comm SN(base_ramwrt),4
.comm SN(base_textrd),4
.comm SN(base_textwrt),4
.comm SN(base_hgrrd),4
.comm SN(base_hgrwrt),4
.comm SN(base_stackzp),4
.comm SN(base_d000_rd),4
.comm SN(base_d000_wrt),4
.comm SN(base_e000_rd),4
.comm SN(base_e000_wrt),4
.comm SN(base_cxrom),4
.comm SN(base_c3rom),4
/* ram_nop, read_ram_default, write_ram_default: default ram/rom
read/write functions. */
E(ram_nop)

View File

@ -72,6 +72,26 @@ GLUE_BANK_READ(iie_read_slot3,base_c3rom)
GLUE_BANK_READ(iie_read_slotx,base_cxrom)
int32_t softswitches;
uint8_t *base_ramrd;
uint8_t *base_ramwrt;
uint8_t *base_textrd;
uint8_t *base_textwrt;
uint8_t *base_hgrrd;
uint8_t *base_hgrwrt;
uint8_t *base_stackzp;
uint8_t *base_d000_rd;
uint8_t *base_e000_rd;
uint8_t *base_d000_wrt;
uint8_t *base_e000_wrt;
uint8_t *base_c3rom;
void *base_c4rom;
void *base_c5rom;
uint8_t *base_cxrom;
/* -------------------------------------------------------------------------
c_set_altchar() - set alternate character set

View File

@ -63,25 +63,27 @@ char temp[ TEMPSIZE ]; /* should be >=4096 (stuff depends on this) */
/* memory offsets from softswitches */
int c8rom_offset;
extern unsigned char *base_ramrd;
extern unsigned char *base_ramwrt;
extern unsigned char *base_textrd;
extern unsigned char *base_textwrt;
extern unsigned char *base_hgrrd;
extern unsigned char *base_hgrwrt;
extern uint8_t *base_ramrd;
extern uint8_t *base_ramwrt;
extern uint8_t *base_textrd;
extern uint8_t *base_textwrt;
extern uint8_t *base_hgrrd;
extern uint8_t *base_hgrwrt;
extern unsigned char *base_stackzp;
extern unsigned char *base_d000_rd;
extern unsigned char *base_e000_rd;
extern unsigned char *base_d000_wrt;
extern unsigned char *base_e000_wrt;
extern uint8_t *base_stackzp;
extern uint8_t *base_d000_rd;
extern uint8_t *base_e000_rd;
extern uint8_t *base_d000_wrt;
extern uint8_t *base_e000_wrt;
extern unsigned char *base_c3rom;
extern unsigned char *base_cxrom;
extern uint8_t *base_c3rom;
extern void *base_c4rom; // points to function or memory vector
extern void *base_c5rom; // points to function or memory vector
extern uint8_t *base_cxrom;
/* softswitches */
extern int softswitches;
extern int32_t softswitches;
#endif /* !__ASSEMBLER__ */