From e7b9b1f22c2f76353daf32287fb6be1d8f8dc4dc Mon Sep 17 00:00:00 2001 From: Stefan Arentz Date: Sun, 18 Dec 2016 20:33:04 -0500 Subject: [PATCH] Move sources and roms into src directory --- Makefile => src/Makefile | 0 alc.c => src/alc.c | 2 +- alc.h => src/alc.h | 0 chr.c => src/chr.c | 4 ++-- chr.h => src/chr.h | 0 cpu.c => src/cpu.c | 0 cpu.h => src/cpu.h | 0 cpu_test.c => src/cpu_test.c | 4 ++-- dsk.c => src/dsk.c | 0 dsk.h => src/dsk.h | 0 ewm.c => src/ewm.c | 0 fmt.c => src/fmt.c | 0 fmt.h => src/fmt.h | 0 ins.c => src/ins.c | 0 ins.h => src/ins.h | 0 mem.c => src/mem.c | 0 mem.h => src/mem.h | 0 one.c => src/one.c | 4 ++-- one.h => src/one.h | 0 pia.c => src/pia.c | 0 pia.h => src/pia.h | 0 {roms => src/rom}/341-0011.bin | Bin {roms => src/rom}/341-0012.bin | Bin {roms => src/rom}/341-0013.bin | Bin {roms => src/rom}/341-0014.bin | Bin {roms => src/rom}/341-0015.bin | Bin {roms => src/rom}/341-0020.bin | Bin {roms => src/rom}/3410036.bin | Bin {roms => src/rom}/6502_functional_test.bin | Bin {roms => src/rom}/65C02_extended_opcodes_test.bin | Bin {roms => src/rom}/a2p.rom | Bin {roms => src/rom}/apple1.rom | Bin {roms => src/rom}/applesoft-lite.bin | Bin {roms => src/rom}/krusader.rom | Bin scr.c => src/scr.c | 2 +- scr.h => src/scr.h | 0 scr_test.c => src/scr_test.c | 0 tty.c => src/tty.c | 2 +- tty.h => src/tty.h | 0 two.c => src/two.c | 12 ++++++------ two.h => src/two.h | 0 41 files changed, 15 insertions(+), 15 deletions(-) rename Makefile => src/Makefile (100%) rename alc.c => src/alc.c (99%) rename alc.h => src/alc.h (100%) rename chr.c => src/chr.c (96%) rename chr.h => src/chr.h (100%) rename cpu.c => src/cpu.c (100%) rename cpu.h => src/cpu.h (100%) rename cpu_test.c => src/cpu_test.c (94%) rename dsk.c => src/dsk.c (100%) rename dsk.h => src/dsk.h (100%) rename ewm.c => src/ewm.c (100%) rename fmt.c => src/fmt.c (100%) rename fmt.h => src/fmt.h (100%) rename ins.c => src/ins.c (100%) rename ins.h => src/ins.h (100%) rename mem.c => src/mem.c (100%) rename mem.h => src/mem.h (100%) rename one.c => src/one.c (98%) rename one.h => src/one.h (100%) rename pia.c => src/pia.c (100%) rename pia.h => src/pia.h (100%) rename {roms => src/rom}/341-0011.bin (100%) rename {roms => src/rom}/341-0012.bin (100%) rename {roms => src/rom}/341-0013.bin (100%) rename {roms => src/rom}/341-0014.bin (100%) rename {roms => src/rom}/341-0015.bin (100%) rename {roms => src/rom}/341-0020.bin (100%) rename {roms => src/rom}/3410036.bin (100%) rename {roms => src/rom}/6502_functional_test.bin (100%) rename {roms => src/rom}/65C02_extended_opcodes_test.bin (100%) rename {roms => src/rom}/a2p.rom (100%) rename {roms => src/rom}/apple1.rom (100%) rename {roms => src/rom}/applesoft-lite.bin (100%) rename {roms => src/rom}/krusader.rom (100%) rename scr.c => src/scr.c (99%) rename scr.h => src/scr.h (100%) rename scr_test.c => src/scr_test.c (100%) rename tty.c => src/tty.c (97%) rename tty.h => src/tty.h (100%) rename two.c => src/two.c (96%) rename two.h => src/two.h (100%) diff --git a/Makefile b/src/Makefile similarity index 100% rename from Makefile rename to src/Makefile diff --git a/alc.c b/src/alc.c similarity index 99% rename from alc.c rename to src/alc.c index dd39bfe..9d5aa4c 100644 --- a/alc.c +++ b/src/alc.c @@ -184,7 +184,7 @@ int ewm_alc_init(struct ewm_alc_t *alc, struct cpu_t *cpu) { // addresses. So we register the ROM first, which means we never // have to disable it. - alc->rom = cpu_add_rom_file(cpu, 0xf800, "roms/341-0020.bin"); + alc->rom = cpu_add_rom_file(cpu, 0xf800, "rom/341-0020.bin"); alc->iom = cpu_add_iom(cpu, 0xc080, 0xc08f, alc, alc_iom_read, alc_iom_write); alc->iom->description = "iom/alc/$C080"; alc->ram1 = cpu_add_ram(cpu, 0xd000, 0xd000 + 4096 - 1); diff --git a/alc.h b/src/alc.h similarity index 100% rename from alc.h rename to src/alc.h diff --git a/chr.c b/src/chr.c similarity index 96% rename from chr.c rename to src/chr.c index 60d886e..8254c45 100644 --- a/chr.c +++ b/src/chr.c @@ -146,9 +146,9 @@ int ewm_chr_init(struct ewm_chr_t *chr, char *rom_path, int rom_type, SDL_Render #if 0 int main() { - struct ewm_chr_t *chr = ewm_chr_create("roms/3410036.bin", EWM_CHR_ROM_TYPE_2716); + struct ewm_chr_t *chr = ewm_chr_create("rom/3410036.bin", EWM_CHR_ROM_TYPE_2716); if (chr == NULL) { - printf("Failed to load character ROM %s\n", "roms/3410036.bin"); + printf("Failed to load character ROM %s\n", "rom/3410036.bin"); exit(1); } return 0; diff --git a/chr.h b/src/chr.h similarity index 100% rename from chr.h rename to src/chr.h diff --git a/cpu.c b/src/cpu.c similarity index 100% rename from cpu.c rename to src/cpu.c diff --git a/cpu.h b/src/cpu.h similarity index 100% rename from cpu.h rename to src/cpu.h diff --git a/cpu_test.c b/src/cpu_test.c similarity index 94% rename from cpu_test.c rename to src/cpu_test.c index 8442cc5..407d7eb 100644 --- a/cpu_test.c +++ b/src/cpu_test.c @@ -78,7 +78,7 @@ int test(int model, uint16_t start_addr, uint16_t success_addr, char *rom_path) int main(int argc, char **argv) { fprintf(stderr, "TEST Running 6502 tests\n"); - test(EWM_CPU_MODEL_6502, 0x0400, 0x3399, "roms/6502_functional_test.bin"); + test(EWM_CPU_MODEL_6502, 0x0400, 0x3399, "rom/6502_functional_test.bin"); fprintf(stderr, "TEST Running 65C02 tests\n"); - test(EWM_CPU_MODEL_65C02, 0x0400, 0x24a8, "roms/65C02_extended_opcodes_test.bin"); + test(EWM_CPU_MODEL_65C02, 0x0400, 0x24a8, "rom/65C02_extended_opcodes_test.bin"); } diff --git a/dsk.c b/src/dsk.c similarity index 100% rename from dsk.c rename to src/dsk.c diff --git a/dsk.h b/src/dsk.h similarity index 100% rename from dsk.h rename to src/dsk.h diff --git a/ewm.c b/src/ewm.c similarity index 100% rename from ewm.c rename to src/ewm.c diff --git a/fmt.c b/src/fmt.c similarity index 100% rename from fmt.c rename to src/fmt.c diff --git a/fmt.h b/src/fmt.h similarity index 100% rename from fmt.h rename to src/fmt.h diff --git a/ins.c b/src/ins.c similarity index 100% rename from ins.c rename to src/ins.c diff --git a/ins.h b/src/ins.h similarity index 100% rename from ins.h rename to src/ins.h diff --git a/mem.c b/src/mem.c similarity index 100% rename from mem.c rename to src/mem.c diff --git a/mem.h b/src/mem.h similarity index 100% rename from mem.h rename to src/mem.h diff --git a/one.c b/src/one.c similarity index 98% rename from one.c rename to src/one.c index aa55a34..047ac81 100644 --- a/one.c +++ b/src/one.c @@ -51,7 +51,7 @@ int ewm_one_init(struct ewm_one_t *one, int type, SDL_Renderer *renderer) { case EWM_ONE_TYPE_APPLE1: one->cpu = cpu_create(EWM_CPU_MODEL_6502); cpu_add_ram(one->cpu, 0x0000, 8 * 1024 - 1); - cpu_add_rom_file(one->cpu, 0xff00, "roms/apple1.rom"); + cpu_add_rom_file(one->cpu, 0xff00, "rom/apple1.rom"); one->tty = ewm_tty_create(renderer); one->pia = ewm_pia_create(one->cpu); one->pia->callback = ewm_one_pia_callback; @@ -60,7 +60,7 @@ int ewm_one_init(struct ewm_one_t *one, int type, SDL_Renderer *renderer) { case EWM_ONE_TYPE_REPLICA1: one->cpu = cpu_create(EWM_CPU_MODEL_65C02); cpu_add_ram(one->cpu, 0x0000, 32 * 1024 - 1); - cpu_add_rom_file(one->cpu, 0xe000, "roms/krusader.rom"); + cpu_add_rom_file(one->cpu, 0xe000, "rom/krusader.rom"); one->tty = ewm_tty_create(renderer); one->pia = ewm_pia_create(one->cpu); one->pia->callback = ewm_one_pia_callback; diff --git a/one.h b/src/one.h similarity index 100% rename from one.h rename to src/one.h diff --git a/pia.c b/src/pia.c similarity index 100% rename from pia.c rename to src/pia.c diff --git a/pia.h b/src/pia.h similarity index 100% rename from pia.h rename to src/pia.h diff --git a/roms/341-0011.bin b/src/rom/341-0011.bin similarity index 100% rename from roms/341-0011.bin rename to src/rom/341-0011.bin diff --git a/roms/341-0012.bin b/src/rom/341-0012.bin similarity index 100% rename from roms/341-0012.bin rename to src/rom/341-0012.bin diff --git a/roms/341-0013.bin b/src/rom/341-0013.bin similarity index 100% rename from roms/341-0013.bin rename to src/rom/341-0013.bin diff --git a/roms/341-0014.bin b/src/rom/341-0014.bin similarity index 100% rename from roms/341-0014.bin rename to src/rom/341-0014.bin diff --git a/roms/341-0015.bin b/src/rom/341-0015.bin similarity index 100% rename from roms/341-0015.bin rename to src/rom/341-0015.bin diff --git a/roms/341-0020.bin b/src/rom/341-0020.bin similarity index 100% rename from roms/341-0020.bin rename to src/rom/341-0020.bin diff --git a/roms/3410036.bin b/src/rom/3410036.bin similarity index 100% rename from roms/3410036.bin rename to src/rom/3410036.bin diff --git a/roms/6502_functional_test.bin b/src/rom/6502_functional_test.bin similarity index 100% rename from roms/6502_functional_test.bin rename to src/rom/6502_functional_test.bin diff --git a/roms/65C02_extended_opcodes_test.bin b/src/rom/65C02_extended_opcodes_test.bin similarity index 100% rename from roms/65C02_extended_opcodes_test.bin rename to src/rom/65C02_extended_opcodes_test.bin diff --git a/roms/a2p.rom b/src/rom/a2p.rom similarity index 100% rename from roms/a2p.rom rename to src/rom/a2p.rom diff --git a/roms/apple1.rom b/src/rom/apple1.rom similarity index 100% rename from roms/apple1.rom rename to src/rom/apple1.rom diff --git a/roms/applesoft-lite.bin b/src/rom/applesoft-lite.bin similarity index 100% rename from roms/applesoft-lite.bin rename to src/rom/applesoft-lite.bin diff --git a/roms/krusader.rom b/src/rom/krusader.rom similarity index 100% rename from roms/krusader.rom rename to src/rom/krusader.rom diff --git a/scr.c b/src/scr.c similarity index 99% rename from scr.c rename to src/scr.c index 3ff62cd..c273ce0 100644 --- a/scr.c +++ b/src/scr.c @@ -272,7 +272,7 @@ int ewm_scr_init(struct scr_t *scr, struct ewm_two_t *two, SDL_Renderer *rendere memset(scr, 0x00, sizeof(struct scr_t)); scr->two = two; scr->renderer = renderer; - scr->chr = ewm_chr_create("roms/3410036.bin", EWM_CHR_ROM_TYPE_2716, renderer); + scr->chr = ewm_chr_create("rom/3410036.bin", EWM_CHR_ROM_TYPE_2716, renderer); if (scr->chr == NULL) { fprintf(stderr, "[SCR] Failed to initialize character generator\n"); return -1; diff --git a/scr.h b/src/scr.h similarity index 100% rename from scr.h rename to src/scr.h diff --git a/scr_test.c b/src/scr_test.c similarity index 100% rename from scr_test.c rename to src/scr_test.c diff --git a/tty.c b/src/tty.c similarity index 97% rename from tty.c rename to src/tty.c index 5b47356..482bbdb 100644 --- a/tty.c +++ b/src/tty.c @@ -27,7 +27,7 @@ struct ewm_tty_t *ewm_tty_create(SDL_Renderer *renderer) { struct ewm_tty_t *tty = malloc(sizeof(struct ewm_tty_t)); memset(tty, 0, sizeof(struct ewm_tty_t)); tty->renderer = renderer; - tty->chr = ewm_chr_create("roms/3410036.bin", EWM_CHR_ROM_TYPE_2716, renderer); + tty->chr = ewm_chr_create("rom/3410036.bin", EWM_CHR_ROM_TYPE_2716, renderer); ewm_tty_reset(tty); return tty; } diff --git a/tty.h b/src/tty.h similarity index 100% rename from tty.h rename to src/tty.h diff --git a/two.c b/src/two.c similarity index 96% rename from two.c rename to src/two.c index 67432f0..dca26ae 100644 --- a/two.c +++ b/src/two.c @@ -254,12 +254,12 @@ static int ewm_two_init(struct ewm_two_t *two, int type, SDL_Renderer *renderer) two->cpu = cpu_create(EWM_CPU_MODEL_6502); two->ram = cpu_add_ram(two->cpu, 0x0000, 48 * 1024); - two->roms[0] = cpu_add_rom_file(two->cpu, 0xd000, "roms/341-0011.bin"); // AppleSoft BASIC D000 - two->roms[1] = cpu_add_rom_file(two->cpu, 0xd800, "roms/341-0012.bin"); // AppleSoft BASIC D800 - two->roms[2] = cpu_add_rom_file(two->cpu, 0xe000, "roms/341-0013.bin"); // AppleSoft BASIC E000 - two->roms[3] = cpu_add_rom_file(two->cpu, 0xe800, "roms/341-0014.bin"); // AppleSoft BASIC E800 - two->roms[4] = cpu_add_rom_file(two->cpu, 0xf000, "roms/341-0015.bin"); // AppleSoft BASIC E800 - two->roms[5] = cpu_add_rom_file(two->cpu, 0xf800, "roms/341-0020.bin"); // AppleSoft BASIC Autostart Monitor F8000 + two->roms[0] = cpu_add_rom_file(two->cpu, 0xd000, "rom/341-0011.bin"); // AppleSoft BASIC D000 + two->roms[1] = cpu_add_rom_file(two->cpu, 0xd800, "rom/341-0012.bin"); // AppleSoft BASIC D800 + two->roms[2] = cpu_add_rom_file(two->cpu, 0xe000, "rom/341-0013.bin"); // AppleSoft BASIC E000 + two->roms[3] = cpu_add_rom_file(two->cpu, 0xe800, "rom/341-0014.bin"); // AppleSoft BASIC E800 + two->roms[4] = cpu_add_rom_file(two->cpu, 0xf000, "rom/341-0015.bin"); // AppleSoft BASIC E800 + two->roms[5] = cpu_add_rom_file(two->cpu, 0xf800, "rom/341-0020.bin"); // AppleSoft BASIC Autostart Monitor F8000 two->iom = cpu_add_iom(two->cpu, 0xc000, 0xc07f, two, ewm_two_iom_read, ewm_two_iom_write); two->dsk = ewm_dsk_create(two->cpu); diff --git a/two.h b/src/two.h similarity index 100% rename from two.h rename to src/two.h