Apple-2-HW
/
analog-firmware
mirror of https://github.com/V2RetroComputing/analog-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move default mono colors initialization so config works

This commit is contained in:
David Kuder 2023-05-04 22:48:18 -04:00
parent 89367bca09
commit c8b4ce9631
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/buffers.h
View File

@ -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;

8
common/config.c
View File

@ -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) {

6
vga/render.c
View File

@ -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));

3
vga/vgabuf.h
View File

@ -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)