From a44fcb196bf907d51326ebf0b5da46cc194135b9 Mon Sep 17 00:00:00 2001 From: SarahW Date: Wed, 11 Oct 2017 21:36:41 +0100 Subject: [PATCH] NVR files now stored per-config. --- nvr/default/430vx.nvr | Bin 0 -> 128 bytes nvr/default/acer386.nvr | Bin 0 -> 128 bytes nvr/default/adgold.bin | Bin 0 -> 24 bytes nvr/default/aha1542c.nvr | Bin 0 -> 32 bytes nvr/default/ami286.nvr | Bin 0 -> 128 bytes nvr/default/ami386.nvr | Bin 0 -> 128 bytes nvr/default/ami386dx_opti495.nvr | Bin 0 -> 128 bytes nvr/default/ami486.nvr | Bin 0 -> 128 bytes nvr/default/at.nvr | Bin 0 -> 128 bytes nvr/default/award286.nvr | Bin 0 -> 128 bytes nvr/default/cmdpc30.nvr | Bin 0 -> 128 bytes nvr/default/dell200.nvr | Bin 0 -> 128 bytes nvr/default/deskpro386.nvr | Bin 0 -> 128 bytes nvr/default/endeavor.nvr | Bin 0 -> 128 bytes nvr/default/europc.nvr | Bin 0 -> 16 bytes nvr/default/gw286ct.nvr | Bin 0 -> 128 bytes nvr/default/hot-433.nvr | Bin 0 -> 128 bytes nvr/default/ibmps1_2011.nvr | Bin 0 -> 128 bytes nvr/default/ibmps1_2121.nvr | Bin 0 -> 128 bytes nvr/default/ibmps2_m50.nvr | Bin 0 -> 128 bytes nvr/default/ibmps2_m55sx.nvr | Bin 0 -> 128 bytes nvr/default/ibmps2_m60.nvr | Bin 0 -> 128 bytes nvr/default/ibmps2_m65sx.nvr | Bin 0 -> 128 bytes nvr/default/ibmps2_m70.nvr | Bin 0 -> 128 bytes nvr/default/ibmps2_m70_sec.nvr | Bin 0 -> 8192 bytes nvr/default/ibmps2_m80.nvr | Bin 0 -> 128 bytes nvr/default/ibmps2_m80_sec.nvr | Bin 0 -> 8192 bytes nvr/default/kmxc02.nvr | Bin 0 -> 128 bytes nvr/default/megapc.nvr | Bin 0 -> 128 bytes nvr/default/mr386dx_opti495.nvr | Bin 0 -> 128 bytes nvr/default/pc1512.nvr | Bin 0 -> 128 bytes nvr/default/pc1640.nvr | Bin 0 -> 128 bytes nvr/default/pc200.nvr | 1 + nvr/default/pc2086.nvr | Bin 0 -> 128 bytes nvr/default/pc3086.nvr | Bin 0 -> 128 bytes nvr/default/revenge.nvr | Bin 0 -> 128 bytes nvr/default/sis496.nvr | Bin 0 -> 128 bytes nvr/default/spc4200p.nvr | Bin 0 -> 128 bytes nvr/default/spc4216p.nvr | Bin 0 -> 128 bytes nvr/default/tandy1000hx.bin | Bin 0 -> 128 bytes nvr/default/tandy1000sl2.bin | Bin 0 -> 128 bytes nvr/default/win486.nvr | Bin 0 -> 128 bytes src/config.c | 1 + src/config.h | 1 + src/nvr.c | 25 +++++++++++++++++++++++-- src/vid_ati_eeprom.c | 5 +++-- src/wx-config_sel.c | 3 +++ 47 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 nvr/default/430vx.nvr create mode 100644 nvr/default/acer386.nvr create mode 100644 nvr/default/adgold.bin create mode 100644 nvr/default/aha1542c.nvr create mode 100644 nvr/default/ami286.nvr create mode 100644 nvr/default/ami386.nvr create mode 100644 nvr/default/ami386dx_opti495.nvr create mode 100644 nvr/default/ami486.nvr create mode 100644 nvr/default/at.nvr create mode 100644 nvr/default/award286.nvr create mode 100644 nvr/default/cmdpc30.nvr create mode 100644 nvr/default/dell200.nvr create mode 100644 nvr/default/deskpro386.nvr create mode 100644 nvr/default/endeavor.nvr create mode 100644 nvr/default/europc.nvr create mode 100644 nvr/default/gw286ct.nvr create mode 100644 nvr/default/hot-433.nvr create mode 100644 nvr/default/ibmps1_2011.nvr create mode 100644 nvr/default/ibmps1_2121.nvr create mode 100644 nvr/default/ibmps2_m50.nvr create mode 100644 nvr/default/ibmps2_m55sx.nvr create mode 100644 nvr/default/ibmps2_m60.nvr create mode 100644 nvr/default/ibmps2_m65sx.nvr create mode 100644 nvr/default/ibmps2_m70.nvr create mode 100644 nvr/default/ibmps2_m70_sec.nvr create mode 100644 nvr/default/ibmps2_m80.nvr create mode 100644 nvr/default/ibmps2_m80_sec.nvr create mode 100644 nvr/default/kmxc02.nvr create mode 100644 nvr/default/megapc.nvr create mode 100644 nvr/default/mr386dx_opti495.nvr create mode 100644 nvr/default/pc1512.nvr create mode 100644 nvr/default/pc1640.nvr create mode 100644 nvr/default/pc200.nvr create mode 100644 nvr/default/pc2086.nvr create mode 100644 nvr/default/pc3086.nvr create mode 100644 nvr/default/revenge.nvr create mode 100644 nvr/default/sis496.nvr create mode 100644 nvr/default/spc4200p.nvr create mode 100644 nvr/default/spc4216p.nvr create mode 100644 nvr/default/tandy1000hx.bin create mode 100644 nvr/default/tandy1000sl2.bin create mode 100644 nvr/default/win486.nvr diff --git a/nvr/default/430vx.nvr b/nvr/default/430vx.nvr new file mode 100644 index 0000000000000000000000000000000000000000..17ac54ec2b4a5170ccc4232c312d20c107d52345 GIT binary patch literal 128 zcmWIgulir)KRbtjxEfQze+GttCm)#k8<-gW=<65!2l7FHnc=^^!2kdM?CrU|8U83V z{D%Pk4YOZJp3>a=qrRi#fByG>Aklw+8GwrA1DAu9`~>O*0>}UV^?}BKm<%8W7=U;x GdH(@hqe12X literal 0 HcmV?d00001 diff --git a/nvr/default/acer386.nvr b/nvr/default/acer386.nvr new file mode 100644 index 0000000000000000000000000000000000000000..22bff6c1d5f70870d8937eb2ddc3d0166aa25dc0 GIT binary patch literal 128 zcmWGyP+<^dV2}_HRbvYHFTmi!@PWaxfr)|VKLZfhGccqGfEZA~yp@4Pf#DSc12atI HKZO7QJDf+3 literal 0 HcmV?d00001 diff --git a/nvr/default/adgold.bin b/nvr/default/adgold.bin new file mode 100644 index 0000000000000000000000000000000000000000..566bffc4abf2b00a1ce550dd0cef57386acaf960 GIT binary patch literal 24 bcmZQzU|{(FpN;JtBM<=DKp<>T$iM&qH%kMN literal 0 HcmV?d00001 diff --git a/nvr/default/aha1542c.nvr b/nvr/default/aha1542c.nvr new file mode 100644 index 0000000000000000000000000000000000000000..f62cc4bdef8aada151abd16edab1a7f24689a685 GIT binary patch literal 32 RcmZQC+{S*JApl2K B1|R?c literal 0 HcmV?d00001 diff --git a/nvr/default/ami386dx_opti495.nvr b/nvr/default/ami386dx_opti495.nvr new file mode 100644 index 0000000000000000000000000000000000000000..b6de20e01d144b622e8c6a2fb42496a8176f8ac0 GIT binary patch literal 128 zcma!GU|~>VVA5a{S7QqJ&%ofY`-1^*0~3RcKEnzo0R{#R1_pZu7|3QxWRQ_O$-vLh b01;y4hDqU~nH-)lT>U7}&;Zo(9}55gwY?z- literal 0 HcmV?d00001 diff --git a/nvr/default/ami486.nvr b/nvr/default/ami486.nvr new file mode 100644 index 0000000000000000000000000000000000000000..7055279865cf2ad0e11ef6bfb457ae57b6d1cfe9 GIT binary patch literal 128 zcmXqDFlSI;U}feIQe$vvVBieh{eO>t0~14yzW#q^f&c$G{xjSEXLf)v_I|Gws15liU`2ZUuBarc*LI3~= CVMLDr literal 0 HcmV?d00001 diff --git a/nvr/default/cmdpc30.nvr b/nvr/default/cmdpc30.nvr new file mode 100644 index 0000000000000000000000000000000000000000..3e6551836d0acdee935ee5d1a4db0a967e6d2aca GIT binary patch literal 128 zcmXr{ul`@)KPxkbP#c58e*p#;1_lPl1||j`APoYN5DH2%>M-#9-~S&08WBwLSODpi BQ@H>D literal 0 HcmV?d00001 diff --git a/nvr/default/dell200.nvr b/nvr/default/dell200.nvr new file mode 100644 index 0000000000000000000000000000000000000000..b16f18490881a1fcf6115c6dfe6d788aa8d1237a GIT binary patch literal 128 xcmZ=|;9wAEU=tS-WMgt@Fko=`&+y-|fr)|VKQf|UI!r6vt5pVP#$h138BO4gc|he~b$h7#Nt~N&ufnL literal 0 HcmV?d00001 diff --git a/nvr/default/ibmps1_2011.nvr b/nvr/default/ibmps1_2011.nvr new file mode 100644 index 0000000000000000000000000000000000000000..2029c7bf3088e975f104d454b17c43532bd871d7 GIT binary patch literal 128 zcmXq>$uv`JCW9iIs2W2+0|SE#0|O&N0}}%a13F*Pq_e+GuMdIn~O2BrpH1_)q;(hLo}K&hrF49(vz0ND!vsRRHm CR8%nl literal 0 HcmV?d00001 diff --git a/nvr/default/ibmps2_m50.nvr b/nvr/default/ibmps2_m50.nvr new file mode 100644 index 0000000000000000000000000000000000000000..9d63cdc75566cb636e444939529ae1cd7491de40 GIT binary patch literal 128 zcmY%R&-P#8Kbr=NI2%*Je+C8z1_lPk2Brp9=D`1V{{w;IhmWU1#esq#2_T;Tm{XvE NRT9Vo1CSC*002GsQL6v| literal 0 HcmV?d00001 diff --git a/nvr/default/ibmps2_m55sx.nvr b/nvr/default/ibmps2_m55sx.nvr new file mode 100644 index 0000000000000000000000000000000000000000..e83ab4fdcb7a65d6fcc2c0c867a8fbe30e72241e GIT binary patch literal 128 zcmWGzU}cbCU=n2&S7QqJFTmiyz`(%Rz{J4v|L%V<2o(nkfCQm<|AETD0GBdi#Q`N7Vw3;? literal 0 HcmV?d00001 diff --git a/nvr/default/ibmps2_m65sx.nvr b/nvr/default/ibmps2_m65sx.nvr new file mode 100644 index 0000000000000000000000000000000000000000..7bee33c481643131a166fc9d4164e399084c0d58 GIT binary patch literal 128 xcmZQ%2x1UpU=?E*S7QqJ&&1@wz@Wg`z{DW?9|xG9ct(IhR+0egUbXMcqM_#zyOCTqJ;r7BVYvp literal 0 HcmV?d00001 diff --git a/nvr/default/ibmps2_m80_sec.nvr b/nvr/default/ibmps2_m80_sec.nvr new file mode 100644 index 0000000000000000000000000000000000000000..e7e171ec012191ffb8663c4b2f158b40fbe96165 GIT binary patch literal 8192 zcmeIyF$%&!5CzcLU4tQ@q_fb%!Xs#(N-S*z+msf9H_#%5ttapnRu+2^?~pQ8#z`Ql zmZZ@H@ehP7^Ov3Q0-J0HinOAJ;+Nh{8ghx4squ(k+`^x!+aXAUwxh(y9v>0;Y<%0c z*_m&g-G6OHbe38QYxSg*=XC1LBU5+z7J>1?zbYF>#M1o)ncv7>}gVyNt*MeO3JruEP4=t00bZa0SG_<0uX=z b1Rwwb2tWV=5P$##AOHafKmY;|_=>FxUez1PEScInTf#`H|s2 X149GT|NjgP4F3rMA)q?k;0q%FUiD5M literal 0 HcmV?d00001 diff --git a/nvr/default/mr386dx_opti495.nvr b/nvr/default/mr386dx_opti495.nvr new file mode 100644 index 0000000000000000000000000000000000000000..9146987cb0319cca87dedd333b0d99c078f375fd GIT binary patch literal 128 zcmWGJ5PU%K0IRy7m>N^Te`W@Uo(~+X4NMF&`V18k3;zGNxBm|W3m61|^a2Ln(+o0_ i$;=;^KQu7@|F6Ix=*Ym#;MAb-fB^`s`~yL1Ndo}auT6CT literal 0 HcmV?d00001 diff --git a/nvr/default/pc1512.nvr b/nvr/default/pc1512.nvr new file mode 100644 index 0000000000000000000000000000000000000000..b1f758b3eb1e48c42a9253b22710a853d1f9c5b0 GIT binary patch literal 128 rcmXqIP-0MKU=tS-WMg1xP*Mi5Qh8I1KdUmkxEfQze+CAJ$pQ>~4NMF+3=RMPGjLlnpa7Oa1{;O{9~gjAM1rY|o0!~mt#!Ue9ClLGq literal 0 HcmV?d00001 diff --git a/nvr/default/sis496.nvr b/nvr/default/sis496.nvr new file mode 100644 index 0000000000000000000000000000000000000000..6d35a3cc52db23637d2a0bbf003f9fbed95287bc GIT binary patch literal 128 zcmdP+ulir|KQoJfxEfQze+CAJEey>34NMF*3=F^i1Nl(EBJltJe`b3Qe})=`1|Smz z*#AvE5&1uM$-n*vh5v6}wg344|KDE;`B{5D?fL)zYdu)aKQM`85X?XZpoEh6|Nj6* CBR%W@ literal 0 HcmV?d00001 diff --git a/nvr/default/spc4200p.nvr b/nvr/default/spc4200p.nvr new file mode 100644 index 0000000000000000000000000000000000000000..e1602c29df31d4c7b01d1ec9f9d7c6960721f8e0 GIT binary patch literal 128 zcmb1O5MdBwU=?E*S7QqJ&%ogD|G|I91||j|_zwYK8p;v5z`&sJ|NZ~}aKYywMfp&r L|9QP&EMjQ@oe^Li literal 0 HcmV?d00001 diff --git a/nvr/default/spc4216p.nvr b/nvr/default/spc4216p.nvr new file mode 100644 index 0000000000000000000000000000000000000000..f1ab56d90ec9510a3bed485de97d6c117881911c GIT binary patch literal 128 zcmY#q2x3rRU=|b*S7QqJ&%ogH|G|I91||j;28RC-0H&cFk!uVr3jg2#{|^^@4pO8K NRr;To3&tXr1^}~mUtype = 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;