• R/O
  • SSH
  • HTTPS

oswan: Commit


Commit MetaInfo

Revision97 (tree)
Time2010-05-19 08:16:59
Authorbird_may_nike

Log Message

(empty log message)

Change Summary

Incremental Difference

--- oswanj/trunk/src/WSMain.cpp (revision 96)
+++ oswanj/trunk/src/WSMain.cpp (revision 97)
@@ -50,7 +50,7 @@
5050 hInst = hCurInst;
5151 accel = LoadAccelerators(hCurInst, MAKEINTRESOURCE(IDR_ACCELERATOR1));
5252 WsSetDir();
53- WsLoadIEep();
53+ WsLoadEeprom();
5454 ConfigCreate();
5555 SetRecentRoms(NULL);
5656 apuInit();
@@ -92,7 +92,7 @@
9292 Sleep(2);
9393 }
9494 }
95- WsSaveIEep();
95+ WsSaveEeprom();
9696 WsRelease();
9797 drawDestroy();
9898 drawFinalize();
--- oswanj/trunk/src/WSFileio.cpp (revision 96)
+++ oswanj/trunk/src/WSFileio.cpp (revision 97)
@@ -77,7 +77,6 @@
7777 if ((fp = _wfopen(CartName, L"rb")) == NULL)
7878 {
7979 ErrorMsg(ERR_FOPEN);
80- MessageBox(NULL, CartName, NULL, MB_OK);
8180 return -1;
8281 }
8382 fseek(fp, -10, 2);
@@ -334,7 +333,7 @@
334333 StateName[0] = '\0';
335334 }
336335
337-void WsLoadIEep(void)
336+void WsLoadEeprom(void)
338337 {
339338 FILE* fp;
340339 wchar_t buf[512];
@@ -353,7 +352,7 @@
353352 }
354353 }
355354
356-void WsSaveIEep(void)
355+void WsSaveEeprom(void)
357356 {
358357 FILE* fp;
359358 wchar_t buf[512];
--- oswanj/trunk/src/WSFileio.h (revision 96)
+++ oswanj/trunk/src/WSFileio.h (revision 97)
@@ -10,8 +10,8 @@
1010
1111 int WsCreate(wchar_t *CartName);
1212 void WsRelease(void);
13-void WsLoadIEep(void);
14-void WsSaveIEep(void);
13+void WsLoadEeprom(void);
14+void WsSaveEeprom(void);
1515 void WsLoadState(int num);
1616 void WsSaveState(int num);
1717
--- oswanj/trunk/src/WS.cpp (revision 96)
+++ oswanj/trunk/src/WS.cpp (revision 97)
@@ -52,7 +52,7 @@
5252 MONO(0x7), MONO(0x6), MONO(0x5), MONO(0x4), MONO(0x3), MONO(0x2), MONO(0x1), MONO(0x0)
5353 };
5454
55-void ComEEP(struct EEPROM *eeprom, WORD *cmd, WORD *data)
55+void ComEeprom(struct EEPROM *eeprom, WORD *cmd, WORD *data)
5656 {
5757 int i, j, op, addr;
5858 const int tblmask[16][5]=
@@ -531,7 +531,7 @@
531531 IO[IRQACK] &= (BYTE)~V;
532532 return;
533533 case 0xBE:
534- ComEEP(&sIEep, (WORD*)(IO + EEPCMD), (WORD*)(IO + EEPDATA));
534+ ComEeprom(&sIEep, (WORD*)(IO + EEPCMD), (WORD*)(IO + EEPDATA));
535535 V >>= 4;
536536 break;
537537 case 0xC0:
@@ -574,7 +574,7 @@
574574 Page[3] = ROMMap[V];
575575 break;
576576 case 0xC8:
577- ComEEP(&sCEep, (WORD*)(IO + CEEPCMD), (WORD*)(IO + CEEPDATA));
577+ ComEeprom(&sCEep, (WORD*)(IO + CEEPCMD), (WORD*)(IO + CEEPDATA));
578578 if(V & 0x10)
579579 {
580580 V >>= 4;
Show on old repository browser