diff --git a/common/buffers.h b/common/buffers.h index d1face2..45c99be 100644 --- a/common/buffers.h +++ b/common/buffers.h @@ -31,6 +31,9 @@ extern volatile uint8_t *hgr_p4; /* Videx VideoTerm */ extern volatile uint8_t *videx_page; +#define apple_tbcolor apple_memory[0xC022] +#define apple_border apple_memory[0xC034] + #endif extern volatile uint8_t *baseio; diff --git a/common/config.c b/common/config.c index a85dc07..4ec8d8f 100644 --- a/common/config.c +++ b/common/config.c @@ -201,7 +201,15 @@ void DELAYED_COPY_CODE(default_config)() { current_machine = MACHINE_AUTO; internal_flags |= (IFLAGS_IIE_REGS | IFLAGS_IIGS_REGS); #endif +#ifdef FUNCTION_VGA + apple_tbcolor = 0xf0; + apple_border = 0x00; + + terminal_tbcolor = 0xf0; + terminal_border = 0x00; + internal_flags |= IFLAGS_VIDEO7 | IFLAGS_V7_MODE3; +#endif } int DELAYED_COPY_CODE(make_config)(uint32_t rev) { diff --git a/vga/render.c b/vga/render.c index 9f5d892..93fae12 100644 --- a/vga/render.c +++ b/vga/render.c @@ -115,12 +115,6 @@ void DELAYED_COPY_CODE(render_init)() { if((soft_switches & SOFTSW_MODE_MASK) == 0) internal_flags |= IFLAGS_TEST; - apple_tbcolor = 0xf0; - apple_border = 0x00; - - terminal_tbcolor = 0xf0; - terminal_border = 0x00; - memcpy(terminal_character_rom, (void*)FLASH_VIDEX_BASE, 4096); memset(status_line, 0, sizeof(status_line)); diff --git a/vga/vgabuf.h b/vga/vgabuf.h index 7ddc13e..5709f47 100644 --- a/vga/vgabuf.h +++ b/vga/vgabuf.h @@ -17,9 +17,6 @@ extern uint8_t terminal_fifo_rdptr; extern volatile uint8_t terminal_row; extern volatile uint8_t terminal_col; -#define apple_tbcolor apple_memory[0xC022] -#define apple_border apple_memory[0xC034] - #define APPLE_FORE ((apple_tbcolor>>4) & 0xf) #define APPLE_BACK (apple_tbcolor & 0xf) #define APPLE_BORDER (apple_border & 0xf)