diff --git a/mda.rom b/mda.rom deleted file mode 100644 index 1b92f04..0000000 Binary files a/mda.rom and /dev/null differ diff --git a/acer386.nvr b/nvr/acer386.nvr similarity index 100% rename from acer386.nvr rename to nvr/acer386.nvr diff --git a/ami286.nvr b/nvr/ami286.nvr similarity index 100% rename from ami286.nvr rename to nvr/ami286.nvr diff --git a/ami386.nvr b/nvr/ami386.nvr similarity index 100% rename from ami386.nvr rename to nvr/ami386.nvr diff --git a/ami486.nvr b/nvr/ami486.nvr similarity index 100% rename from ami486.nvr rename to nvr/ami486.nvr diff --git a/at.nvr b/nvr/at.nvr similarity index 100% rename from at.nvr rename to nvr/at.nvr diff --git a/cmdpc30.nvr b/nvr/cmdpc30.nvr similarity index 100% rename from cmdpc30.nvr rename to nvr/cmdpc30.nvr diff --git a/dell200.nvr b/nvr/dell200.nvr similarity index 100% rename from dell200.nvr rename to nvr/dell200.nvr diff --git a/deskpro386.nvr b/nvr/deskpro386.nvr similarity index 100% rename from deskpro386.nvr rename to nvr/deskpro386.nvr diff --git a/europc.nvr b/nvr/europc.nvr similarity index 100% rename from europc.nvr rename to nvr/europc.nvr diff --git a/hot-433.nvr b/nvr/hot-433.nvr similarity index 100% rename from hot-433.nvr rename to nvr/hot-433.nvr diff --git a/ibmps1_2011.nvr b/nvr/ibmps1_2011.nvr similarity index 100% rename from ibmps1_2011.nvr rename to nvr/ibmps1_2011.nvr diff --git a/megapc.nvr b/nvr/megapc.nvr similarity index 100% rename from megapc.nvr rename to nvr/megapc.nvr diff --git a/pc1512.nvr b/nvr/pc1512.nvr similarity index 100% rename from pc1512.nvr rename to nvr/pc1512.nvr diff --git a/pc1640.nvr b/nvr/pc1640.nvr similarity index 100% rename from pc1640.nvr rename to nvr/pc1640.nvr diff --git a/pc2086.nvr b/nvr/pc2086.nvr similarity index 100% rename from pc2086.nvr rename to nvr/pc2086.nvr diff --git a/pc3086.nvr b/nvr/pc3086.nvr similarity index 100% rename from pc3086.nvr rename to nvr/pc3086.nvr diff --git a/tandy1000hx.bin b/nvr/tandy1000hx.bin similarity index 100% rename from tandy1000hx.bin rename to nvr/tandy1000hx.bin diff --git a/tandy1000sl2.bin b/nvr/tandy1000sl2.bin similarity index 100% rename from tandy1000sl2.bin rename to nvr/tandy1000sl2.bin diff --git a/win486.nvr b/nvr/win486.nvr similarity index 100% rename from win486.nvr rename to nvr/win486.nvr diff --git a/src/mem.c b/src/mem.c index 6a2ec9b..8670c92 100644 --- a/src/mem.c +++ b/src/mem.c @@ -101,7 +101,7 @@ int loadbios() FILE *f=NULL,*ff=NULL; int c; - loadfont("mda.rom", 0); + loadfont("roms/mda.rom", 0); biosmask = 0xffff; diff --git a/src/nvr.c b/src/nvr.c index 211680a..e9f830e 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -130,30 +130,30 @@ void loadnvr() oldromset=romset; switch (romset) { - case ROM_PC1512: f = romfopen("pc1512.nvr", "rb"); break; - case ROM_PC1640: f = romfopen("pc1640.nvr", "rb"); break; - case ROM_PC200: f = romfopen("pc200.nvr", "rb"); break; - case ROM_PC2086: f = romfopen("pc2086.nvr", "rb"); break; - case ROM_PC3086: f = romfopen("pc3086.nvr", "rb"); break; - case ROM_IBMAT: f = romfopen("at.nvr", "rb"); break; - case ROM_IBMPS1_2011: f = romfopen("ibmps1_2011.nvr", "rb"); /*nvrmask = 127; */break; - case ROM_CMDPC30: f = romfopen("cmdpc30.nvr", "rb"); nvrmask = 127; break; - case ROM_AMI286: f = romfopen("ami286.nvr", "rb"); nvrmask = 127; break; - case ROM_DELL200: f = romfopen("dell200.nvr", "rb"); nvrmask = 127; break; - case ROM_IBMAT386: f = romfopen("at386.nvr", "rb"); nvrmask = 127; break; - case ROM_DESKPRO_386: f = romfopen("deskpro386.nvr", "rb"); break; - case ROM_ACER386: f = romfopen("acer386.nvr", "rb"); nvrmask = 127; break; - case ROM_MEGAPC: f = romfopen("megapc.nvr", "rb"); nvrmask = 127; break; - case ROM_AMI386: f = romfopen("ami386.nvr", "rb"); nvrmask = 127; break; - case ROM_AMI486: f = romfopen("ami486.nvr", "rb"); nvrmask = 127; break; - case ROM_WIN486: f = romfopen("win486.nvr", "rb"); nvrmask = 127; break; - case ROM_PCI486: f = romfopen("hot-433.nvr", "rb"); nvrmask = 127; break; - case ROM_SIS496: f = romfopen("sis496.nvr", "rb"); nvrmask = 127; break; - case ROM_430VX: f = romfopen("430vx.nvr", "rb"); nvrmask = 127; break; - case ROM_REVENGE: f = romfopen("revenge.nvr", "rb"); nvrmask = 127; break; - case ROM_ENDEAVOR: f = romfopen("endeavor.nvr", "rb"); nvrmask = 127; break; - case ROM_PX386: f = romfopen("px386.nvr", "rb"); nvrmask = 127; break; - case ROM_DTK386: f = romfopen("dtk386.nvr", "rb"); nvrmask = 127; break; + case ROM_PC1512: f = romfopen("nvr/pc1512.nvr", "rb"); break; + case ROM_PC1640: f = romfopen("nvr/pc1640.nvr", "rb"); break; + case ROM_PC200: f = romfopen("nvr/pc200.nvr", "rb"); break; + case ROM_PC2086: f = romfopen("nvr/pc2086.nvr", "rb"); break; + case ROM_PC3086: f = romfopen("nvr/pc3086.nvr", "rb"); break; + case ROM_IBMAT: f = romfopen("nvr/at.nvr", "rb"); break; + case ROM_IBMPS1_2011: f = romfopen("nvr/ibmps1_2011.nvr", "rb"); /*nvrmask = 127; */break; + case ROM_CMDPC30: f = romfopen("nvr/cmdpc30.nvr", "rb"); nvrmask = 127; break; + case ROM_AMI286: f = romfopen("nvr/ami286.nvr", "rb"); nvrmask = 127; break; + case ROM_DELL200: f = romfopen("nvr/dell200.nvr", "rb"); nvrmask = 127; break; + case ROM_IBMAT386: f = romfopen("nvr/at386.nvr", "rb"); nvrmask = 127; break; + case ROM_DESKPRO_386: f = romfopen("nvr/deskpro386.nvr", "rb"); break; + case ROM_ACER386: f = romfopen("nvr/acer386.nvr", "rb"); nvrmask = 127; break; + case ROM_MEGAPC: f = romfopen("nvr/megapc.nvr", "rb"); nvrmask = 127; break; + case ROM_AMI386: f = romfopen("nvr/ami386.nvr", "rb"); nvrmask = 127; break; + case ROM_AMI486: f = romfopen("nvr/ami486.nvr", "rb"); nvrmask = 127; break; + case ROM_WIN486: f = romfopen("nvr/win486.nvr", "rb"); nvrmask = 127; break; + case ROM_PCI486: f = romfopen("nvr/hot-433.nvr", "rb"); nvrmask = 127; break; + case ROM_SIS496: f = romfopen("nvr/sis496.nvr", "rb"); nvrmask = 127; break; + case ROM_430VX: f = romfopen("nvr/430vx.nvr", "rb"); nvrmask = 127; break; + case ROM_REVENGE: f = romfopen("nvr/revenge.nvr", "rb"); nvrmask = 127; break; + case ROM_ENDEAVOR: f = romfopen("nvr/endeavor.nvr", "rb"); nvrmask = 127; break; + case ROM_PX386: f = romfopen("nvr/px386.nvr", "rb"); nvrmask = 127; break; + case ROM_DTK386: f = romfopen("nvr/dtk386.nvr", "rb"); nvrmask = 127; break; default: return; } if (!f) @@ -173,30 +173,30 @@ void savenvr() FILE *f; switch (oldromset) { - case ROM_PC1512: f = romfopen("pc1512.nvr", "wb"); break; - case ROM_PC1640: f = romfopen("pc1640.nvr", "wb"); break; - case ROM_PC200: f = romfopen("pc200.nvr", "wb"); break; - case ROM_PC2086: f = romfopen("pc2086.nvr", "wb"); break; - case ROM_PC3086: f = romfopen("pc3086.nvr", "wb"); break; - case ROM_IBMAT: f = romfopen("at.nvr", "wb"); break; - case ROM_IBMPS1_2011: f = romfopen("ibmps1_2011.nvr", "wb"); break; - case ROM_CMDPC30: f = romfopen("cmdpc30.nvr", "wb"); break; - case ROM_AMI286: f = romfopen("ami286.nvr", "wb"); break; - case ROM_DELL200: f = romfopen("dell200.nvr", "wb"); break; - case ROM_IBMAT386: f = romfopen("at386.nvr", "wb"); break; - case ROM_DESKPRO_386: f = romfopen("deskpro386.nvr", "wb"); break; - case ROM_ACER386: f = romfopen("acer386.nvr", "wb"); break; - case ROM_MEGAPC: f = romfopen("megapc.nvr", "wb"); break; - case ROM_AMI386: f = romfopen("ami386.nvr", "wb"); break; - case ROM_AMI486: f = romfopen("ami486.nvr", "wb"); break; - case ROM_WIN486: f = romfopen("win486.nvr", "wb"); break; - case ROM_PCI486: f = romfopen("hot-433.nvr", "wb"); break; - case ROM_SIS496: f = romfopen("sis496.nvr", "wb"); break; - case ROM_430VX: f = romfopen("430vx.nvr", "wb"); break; - case ROM_REVENGE: f = romfopen("revenge.nvr", "wb"); break; - case ROM_ENDEAVOR: f = romfopen("endeavor.nvr", "wb"); break; - case ROM_PX386: f = romfopen("px386.nvr", "wb"); break; - case ROM_DTK386: f = romfopen("dtk386.nvr", "wb"); break; + case ROM_PC1512: f = romfopen("nvr/pc1512.nvr", "wb"); break; + case ROM_PC1640: f = romfopen("nvr/pc1640.nvr", "wb"); break; + case ROM_PC200: f = romfopen("nvr/pc200.nvr", "wb"); break; + case ROM_PC2086: f = romfopen("nvr/pc2086.nvr", "wb"); break; + case ROM_PC3086: f = romfopen("nvr/pc3086.nvr", "wb"); break; + case ROM_IBMAT: f = romfopen("nvr/at.nvr", "wb"); break; + case ROM_IBMPS1_2011: f = romfopen("nvr/ibmps1_2011.nvr", "wb"); break; + case ROM_CMDPC30: f = romfopen("nvr/cmdpc30.nvr", "wb"); break; + case ROM_AMI286: f = romfopen("nvr/ami286.nvr", "wb"); break; + case ROM_DELL200: f = romfopen("nvr/dell200.nvr", "wb"); break; + case ROM_IBMAT386: f = romfopen("nvr/at386.nvr", "wb"); break; + case ROM_DESKPRO_386: f = romfopen("nvr/deskpro386.nvr", "wb"); break; + case ROM_ACER386: f = romfopen("nvr/acer386.nvr", "wb"); break; + case ROM_MEGAPC: f = romfopen("nvr/megapc.nvr", "wb"); break; + case ROM_AMI386: f = romfopen("nvr/ami386.nvr", "wb"); break; + case ROM_AMI486: f = romfopen("nvr/ami486.nvr", "wb"); break; + case ROM_WIN486: f = romfopen("nvr/win486.nvr", "wb"); break; + case ROM_PCI486: f = romfopen("nvr/hot-433.nvr", "wb"); break; + case ROM_SIS496: f = romfopen("nvr/sis496.nvr", "wb"); break; + case ROM_430VX: f = romfopen("nvr/430vx.nvr", "wb"); break; + case ROM_REVENGE: f = romfopen("nvr/revenge.nvr", "wb"); break; + case ROM_ENDEAVOR: f = romfopen("nvr/endeavor.nvr", "wb"); break; + case ROM_PX386: f = romfopen("nvr/px386.nvr", "wb"); break; + case ROM_DTK386: f = romfopen("nvr/dtk386.nvr", "wb"); break; default: return; } fwrite(nvrram,128,1,f); diff --git a/src/tandy_eeprom.c b/src/tandy_eeprom.c index 690f375..c49ee5c 100644 --- a/src/tandy_eeprom.c +++ b/src/tandy_eeprom.c @@ -125,10 +125,10 @@ void *tandy_eeprom_init() switch (romset) { case ROM_TANDY1000HX: - f = romfopen("tandy1000hx.bin" ,"rb"); + f = romfopen("nvr/tandy1000hx.bin" ,"rb"); break; case ROM_TANDY1000SL2: - f = romfopen("tandy1000sl2.bin" ,"rb"); + f = romfopen("nvr/tandy1000sl2.bin" ,"rb"); break; } if (f) @@ -152,10 +152,10 @@ void tandy_eeprom_close(void *p) switch (eeprom->romset) { case ROM_TANDY1000HX: - f = romfopen("tandy1000hx.bin" ,"wb"); + f = romfopen("nvr/tandy1000hx.bin" ,"wb"); break; case ROM_TANDY1000SL2: - f = romfopen("tandy1000sl2.bin" ,"wb"); + f = romfopen("nvr/tandy1000sl2.bin" ,"wb"); break; } fwrite(eeprom->store, 128, 1, f);