diff --git a/nvr/default/430vx.nvr b/nvr/default/430vx.nvr new file mode 100644 index 0000000..17ac54e Binary files /dev/null and b/nvr/default/430vx.nvr differ diff --git a/nvr/default/acer386.nvr b/nvr/default/acer386.nvr new file mode 100644 index 0000000..22bff6c Binary files /dev/null and b/nvr/default/acer386.nvr differ diff --git a/nvr/default/adgold.bin b/nvr/default/adgold.bin new file mode 100644 index 0000000..566bffc Binary files /dev/null and b/nvr/default/adgold.bin differ diff --git a/nvr/default/aha1542c.nvr b/nvr/default/aha1542c.nvr new file mode 100644 index 0000000..f62cc4b Binary files /dev/null and b/nvr/default/aha1542c.nvr differ diff --git a/nvr/default/ami286.nvr b/nvr/default/ami286.nvr new file mode 100644 index 0000000..bfb993f Binary files /dev/null and b/nvr/default/ami286.nvr differ diff --git a/nvr/default/ami386.nvr b/nvr/default/ami386.nvr new file mode 100644 index 0000000..2256301 Binary files /dev/null and b/nvr/default/ami386.nvr differ diff --git a/nvr/default/ami386dx_opti495.nvr b/nvr/default/ami386dx_opti495.nvr new file mode 100644 index 0000000..b6de20e Binary files /dev/null and b/nvr/default/ami386dx_opti495.nvr differ diff --git a/nvr/default/ami486.nvr b/nvr/default/ami486.nvr new file mode 100644 index 0000000..7055279 Binary files /dev/null and b/nvr/default/ami486.nvr differ diff --git a/nvr/default/at.nvr b/nvr/default/at.nvr new file mode 100644 index 0000000..b5c94c1 Binary files /dev/null and b/nvr/default/at.nvr differ diff --git a/nvr/default/award286.nvr b/nvr/default/award286.nvr new file mode 100644 index 0000000..223aa99 Binary files /dev/null and b/nvr/default/award286.nvr differ diff --git a/nvr/default/cmdpc30.nvr b/nvr/default/cmdpc30.nvr new file mode 100644 index 0000000..3e65518 Binary files /dev/null and b/nvr/default/cmdpc30.nvr differ diff --git a/nvr/default/dell200.nvr b/nvr/default/dell200.nvr new file mode 100644 index 0000000..b16f184 Binary files /dev/null and b/nvr/default/dell200.nvr differ diff --git a/nvr/default/deskpro386.nvr b/nvr/default/deskpro386.nvr new file mode 100644 index 0000000..95ab63b Binary files /dev/null and b/nvr/default/deskpro386.nvr differ diff --git a/nvr/default/endeavor.nvr b/nvr/default/endeavor.nvr new file mode 100644 index 0000000..f9910df Binary files /dev/null and b/nvr/default/endeavor.nvr differ diff --git a/nvr/default/europc.nvr b/nvr/default/europc.nvr new file mode 100644 index 0000000..6757695 Binary files /dev/null and b/nvr/default/europc.nvr differ diff --git a/nvr/default/gw286ct.nvr b/nvr/default/gw286ct.nvr new file mode 100644 index 0000000..8a712f9 Binary files /dev/null and b/nvr/default/gw286ct.nvr differ diff --git a/nvr/default/hot-433.nvr b/nvr/default/hot-433.nvr new file mode 100644 index 0000000..104e711 Binary files /dev/null and b/nvr/default/hot-433.nvr differ diff --git a/nvr/default/ibmps1_2011.nvr b/nvr/default/ibmps1_2011.nvr new file mode 100644 index 0000000..2029c7b Binary files /dev/null and b/nvr/default/ibmps1_2011.nvr differ diff --git a/nvr/default/ibmps1_2121.nvr b/nvr/default/ibmps1_2121.nvr new file mode 100644 index 0000000..0501a36 Binary files /dev/null and b/nvr/default/ibmps1_2121.nvr differ diff --git a/nvr/default/ibmps2_m50.nvr b/nvr/default/ibmps2_m50.nvr new file mode 100644 index 0000000..9d63cdc Binary files /dev/null and b/nvr/default/ibmps2_m50.nvr differ diff --git a/nvr/default/ibmps2_m55sx.nvr b/nvr/default/ibmps2_m55sx.nvr new file mode 100644 index 0000000..e83ab4f Binary files /dev/null and b/nvr/default/ibmps2_m55sx.nvr differ diff --git a/nvr/default/ibmps2_m60.nvr b/nvr/default/ibmps2_m60.nvr new file mode 100644 index 0000000..33c5fb6 Binary files /dev/null and b/nvr/default/ibmps2_m60.nvr differ diff --git a/nvr/default/ibmps2_m65sx.nvr b/nvr/default/ibmps2_m65sx.nvr new file mode 100644 index 0000000..7bee33c Binary files /dev/null and b/nvr/default/ibmps2_m65sx.nvr differ diff --git a/nvr/default/ibmps2_m70.nvr b/nvr/default/ibmps2_m70.nvr new file mode 100644 index 0000000..c4c5578 Binary files /dev/null and b/nvr/default/ibmps2_m70.nvr differ diff --git a/nvr/default/ibmps2_m70_sec.nvr b/nvr/default/ibmps2_m70_sec.nvr new file mode 100644 index 0000000..4ed6224 Binary files /dev/null and b/nvr/default/ibmps2_m70_sec.nvr differ diff --git a/nvr/default/ibmps2_m80.nvr b/nvr/default/ibmps2_m80.nvr new file mode 100644 index 0000000..4e26e24 Binary files /dev/null and b/nvr/default/ibmps2_m80.nvr differ diff --git a/nvr/default/ibmps2_m80_sec.nvr b/nvr/default/ibmps2_m80_sec.nvr new file mode 100644 index 0000000..e7e171e Binary files /dev/null and b/nvr/default/ibmps2_m80_sec.nvr differ diff --git a/nvr/default/kmxc02.nvr b/nvr/default/kmxc02.nvr new file mode 100644 index 0000000..0b281a8 Binary files /dev/null and b/nvr/default/kmxc02.nvr differ diff --git a/nvr/default/megapc.nvr b/nvr/default/megapc.nvr new file mode 100644 index 0000000..3892761 Binary files /dev/null and b/nvr/default/megapc.nvr differ diff --git a/nvr/default/mr386dx_opti495.nvr b/nvr/default/mr386dx_opti495.nvr new file mode 100644 index 0000000..9146987 Binary files /dev/null and b/nvr/default/mr386dx_opti495.nvr differ diff --git a/nvr/default/pc1512.nvr b/nvr/default/pc1512.nvr new file mode 100644 index 0000000..b1f758b Binary files /dev/null and b/nvr/default/pc1512.nvr differ diff --git a/nvr/default/pc1640.nvr b/nvr/default/pc1640.nvr new file mode 100644 index 0000000..7171e74 Binary files /dev/null and b/nvr/default/pc1640.nvr differ diff --git a/nvr/default/pc200.nvr b/nvr/default/pc200.nvr new file mode 100644 index 0000000..fcb1cb6 --- /dev/null +++ b/nvr/default/pc200.nvr @@ -0,0 +1 @@ +Xÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ \ No newline at end of file diff --git a/nvr/default/pc2086.nvr b/nvr/default/pc2086.nvr new file mode 100644 index 0000000..40f5636 Binary files /dev/null and b/nvr/default/pc2086.nvr differ diff --git a/nvr/default/pc3086.nvr b/nvr/default/pc3086.nvr new file mode 100644 index 0000000..f340d66 Binary files /dev/null and b/nvr/default/pc3086.nvr differ diff --git a/nvr/default/revenge.nvr b/nvr/default/revenge.nvr new file mode 100644 index 0000000..c10c53c Binary files /dev/null and b/nvr/default/revenge.nvr differ diff --git a/nvr/default/sis496.nvr b/nvr/default/sis496.nvr new file mode 100644 index 0000000..6d35a3c Binary files /dev/null and b/nvr/default/sis496.nvr differ diff --git a/nvr/default/spc4200p.nvr b/nvr/default/spc4200p.nvr new file mode 100644 index 0000000..e1602c2 Binary files /dev/null and b/nvr/default/spc4200p.nvr differ diff --git a/nvr/default/spc4216p.nvr b/nvr/default/spc4216p.nvr new file mode 100644 index 0000000..f1ab56d Binary files /dev/null and b/nvr/default/spc4216p.nvr differ diff --git a/nvr/default/tandy1000hx.bin b/nvr/default/tandy1000hx.bin new file mode 100644 index 0000000..e69de4f Binary files /dev/null and b/nvr/default/tandy1000hx.bin differ diff --git a/nvr/default/tandy1000sl2.bin b/nvr/default/tandy1000sl2.bin new file mode 100644 index 0000000..e69de4f Binary files /dev/null and b/nvr/default/tandy1000sl2.bin differ diff --git a/nvr/default/win486.nvr b/nvr/default/win486.nvr new file mode 100644 index 0000000..9722138 Binary files /dev/null and b/nvr/default/win486.nvr differ diff --git a/src/config.c b/src/config.c index e888507..663c349 100644 --- a/src/config.c +++ b/src/config.c @@ -5,6 +5,7 @@ #include "config.h" char config_file_default[256]; +char config_name[256]; static char config_file[256]; diff --git a/src/config.h b/src/config.h index 16d513e..dd2dceb 100644 --- a/src/config.h +++ b/src/config.h @@ -21,6 +21,7 @@ void config_dump(int is_global); void config_free(int is_global); extern char config_file_default[256]; +extern char config_name[256]; #define CFG_MACHINE 0 #define CFG_GLOBAL 1 diff --git a/src/nvr.c b/src/nvr.c index 0e27a02..35a2a83 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -23,11 +23,32 @@ static int rtctime; FILE *nvrfopen(char *fn, char *mode) { char s[512]; - + FILE *f; + strcpy(s, nvr_path); put_backslash(s); + strcat(s, config_name); + strcat(s, "."); strcat(s, fn); - return fopen(s, mode); + pclog("NVR try opening %s\n", s); + f = fopen(s, mode); + if (f) + return f; + + if (mode[0] == 'r') + { + strcpy(s, nvr_path); + put_backslash(s); + strcat(s, "default"); + put_backslash(s); + strcat(s, fn); + return fopen(s, mode); + } + else + { + pclog("Failed to open file '%s' for write\n", s); + return NULL; + } } void getnvrtime() diff --git a/src/vid_ati_eeprom.c b/src/vid_ati_eeprom.c index 61d7389..3586894 100644 --- a/src/vid_ati_eeprom.c +++ b/src/vid_ati_eeprom.c @@ -1,4 +1,5 @@ #include "ibm.h" +#include "nvr.h" #include "vid_ati_eeprom.h" enum @@ -33,7 +34,7 @@ void ati_eeprom_load(ati_eeprom_t *eeprom, char *fn, int type) FILE *f; eeprom->type = type; strcpy(eeprom->fn, fn); - f = romfopen(eeprom->fn, "rb"); + f = nvrfopen(eeprom->fn, "rb"); if (!f) { memset(eeprom->data, 0, eeprom->type ? 512 : 128); @@ -45,7 +46,7 @@ void ati_eeprom_load(ati_eeprom_t *eeprom, char *fn, int type) void ati_eeprom_save(ati_eeprom_t *eeprom) { - FILE *f = romfopen(eeprom->fn, "wb"); + FILE *f = nvrfopen(eeprom->fn, "wb"); if (!f) return; fwrite(eeprom->data, 1, eeprom->type ? 512 : 128, f); fclose(f); diff --git a/src/wx-config_sel.c b/src/wx-config_sel.c index 962c194..e4253a3 100644 --- a/src/wx-config_sel.c +++ b/src/wx-config_sel.c @@ -98,6 +98,9 @@ static int run(void* hdlg) pclog("Config name %s\n", cfg); strcpy(config_file_default, cfg); + strcpy(config_name, s); + if (config_name[strlen(config_name)-1] == '.') + config_name[strlen(config_name)-1] = 0; wx_enddialog(hdlg, 1); // pause = 0;