Move sources and roms into src directory

This commit is contained in:
Stefan Arentz 2016-12-18 20:33:04 -05:00
parent c667ec4c1e
commit e7b9b1f22c
41 changed files with 15 additions and 15 deletions

View File

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

View File

View File

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

View File

View File

View File

View File

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

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

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

View File

View File

View File

View File

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

View File

View File

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

View File

View File

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

View File