diff --git a/src/disk.c b/src/disk.c index 4bcf07e0..cbd568e6 100644 --- a/src/disk.c +++ b/src/disk.c @@ -691,10 +691,10 @@ GLUE_C_READ(disk_read_prepare_out) GLUE_C_WRITE(disk_write_latch) { - disk6.disk_byte = d; + disk6.disk_byte = b; } -void disk_install(int slot) +void disk_io_initialize(unsigned int slot) { FILE *f; int i; @@ -722,7 +722,8 @@ void disk_install(int slot) memcpy(apple_ii_64k[0] + 0xC600, slot6_rom, 0x100); - /* disk softswitches */ + // disk softswitches + // 0xC0Xi : X = slot 0x6 + 0x8 == 0xE cpu65_vmem[0xC0E0].r = cpu65_vmem[0xC0E2].r = cpu65_vmem[0xC0E4].r = cpu65_vmem[0xC0E6].r = ram_nop; diff --git a/src/disk.h b/src/disk.h index db4fa4cc..e14e9942 100644 --- a/src/disk.h +++ b/src/disk.h @@ -50,7 +50,7 @@ extern struct drive disk6; void c_init_6(); int c_new_diskette_6(int, char*, int, int, int); void c_eject_6(int); -void disk_install(int slot); +void disk_io_initialize(unsigned int slot); void disk_read_nop(), disk_read_phase(), diff --git a/src/misc.c b/src/misc.c index 3faa24bc..441bc3be 100644 --- a/src/misc.c +++ b/src/misc.c @@ -480,7 +480,11 @@ void c_initialize_tables() { video_set(0); - disk_install(6); /* Put a Disk ][ Controller in slot 6 */ + // Peripheral card slot initializations ... + + // HACK TODO FIXME : this needs to be tied to the UI/configuration system (once we have more/conflicting options) + + disk_io_initialize(6); /* Put a Disk ][ Controller in slot 6 */ } /* -------------------------------------------------------------------------