|
|
| version 1.42, 2004/07/01 11:42:54 | version 1.43, 2005/02/07 14:46:07 |
|---|---|
| Line 186 sfo_err1: | Line 186 sfo_err1: |
| static int statflag_closesection(SFFILEH sffh) { | static int statflag_closesection(SFFILEH sffh) { |
| UINT leng; | UINT leng; |
| BYTE zero[16]; | UINT8 zero[16]; |
| if (sffh == NULL) { | if (sffh == NULL) { |
| goto sfcs_err1; | goto sfcs_err1; |
| Line 547 static int nevent_write(STFLAGH sfh, int | Line 547 static int nevent_write(STFLAGH sfh, int |
| UINT i; | UINT i; |
| ZeroMemory(&nit, sizeof(nit)); | ZeroMemory(&nit, sizeof(nit)); |
| for (i=0; i<sizeof(evtnum)/sizeof(ENUMTBL); i++) { | for (i=0; i<NELEMENTS(evtnum); i++) { |
| if (evtnum[i].num == num) { | if (evtnum[i].num == num) { |
| nit.id = evtnum[i].id; | nit.id = evtnum[i].id; |
| break; | break; |
| Line 591 static int nevent_read(STFLAGH sfh, UINT | Line 591 static int nevent_read(STFLAGH sfh, UINT |
| ret = statflag_read(sfh, &nit, sizeof(nit)); | ret = statflag_read(sfh, &nit, sizeof(nit)); |
| for (i=0; i<sizeof(evtnum)/sizeof(ENUMTBL); i++) { | for (i=0; i<NELEMENTS(evtnum); i++) { |
| if (nit.id == evtnum[i].id) { | if (nit.id == evtnum[i].id) { |
| break; | break; |
| } | } |
| } | } |
| if (i < (sizeof(evtnum)/sizeof(ENUMTBL))) { | if (i < NELEMENTS(evtnum)) { |
| num = evtnum[i].num; | num = evtnum[i].num; |
| nevent.item[num].clock = nit.clock; | nevent.item[num].clock = nit.clock; |
| nevent.item[num].flag = nit.flag; | nevent.item[num].flag = nit.flag; |
| Line 671 static int flagsave_gij(STFLAGH sfh, con | Line 671 static int flagsave_gij(STFLAGH sfh, con |
| int ret; | int ret; |
| int i; | int i; |
| int j; | int j; |
| const BYTE *fnt; | const UINT8 *fnt; |
| ret = STATFLAG_SUCCESS; | ret = STATFLAG_SUCCESS; |
| for (i=0; i<2; i++) { | for (i=0; i<2; i++) { |
| Line 690 static int flagload_gij(STFLAGH sfh, con | Line 690 static int flagload_gij(STFLAGH sfh, con |
| int ret; | int ret; |
| int i; | int i; |
| int j; | int j; |
| BYTE *fnt; | UINT8 *fnt; |
| ret = 0; | ret = 0; |
| for (i=0; i<2; i++) { | for (i=0; i<2; i++) { |
| Line 725 enum { | Line 725 enum { |
| }; | }; |
| typedef struct { | typedef struct { |
| BYTE keyreg[OPNCH_MAX]; | UINT8 keyreg[OPNCH_MAX]; |
| BYTE extop[4]; | UINT8 extop[4]; |
| } OPNKEY; | } OPNKEY; |
| static int flagsave_fm(STFLAGH sfh, const SFENTRY *tbl) { | static int flagsave_fm(STFLAGH sfh, const SFENTRY *tbl) { |
| Line 961 static int disksave(STFLAGH sfh, const c | Line 961 static int disksave(STFLAGH sfh, const c |
| static int flagsave_disk(STFLAGH sfh, const SFENTRY *tbl) { | static int flagsave_disk(STFLAGH sfh, const SFENTRY *tbl) { |
| int ret; | int ret; |
| BYTE i; | UINT8 i; |
| sxsi_flash(); | sxsi_flash(); |
| ret = STATFLAG_SUCCESS; | ret = STATFLAG_SUCCESS; |
| Line 1187 const SFENTRY *tblterm; | Line 1187 const SFENTRY *tblterm; |
| ret = STATFLAG_SUCCESS; | ret = STATFLAG_SUCCESS; |
| tbl = np2tbl; | tbl = np2tbl; |
| tblterm = tbl + (sizeof(np2tbl)/sizeof(SFENTRY)); | tblterm = tbl + NELEMENTS(np2tbl); |
| while(tbl < tblterm) { | while(tbl < tblterm) { |
| ret |= statflag_createsection(sffh, tbl); | ret |= statflag_createsection(sffh, tbl); |
| switch(tbl->type) { | switch(tbl->type) { |
| Line 1274 const SFENTRY *tblterm; | Line 1274 const SFENTRY *tblterm; |
| while((!done) && (ret != STATFLAG_FAILURE)) { | while((!done) && (ret != STATFLAG_FAILURE)) { |
| ret |= statflag_readsection(sffh); | ret |= statflag_readsection(sffh); |
| tbl = np2tbl; | tbl = np2tbl; |
| tblterm = tbl + (sizeof(np2tbl)/sizeof(SFENTRY)); | tblterm = tbl + NELEMENTS(np2tbl); |
| while(tbl < tblterm) { | while(tbl < tblterm) { |
| if (!memcmp(sffh->sfh.hdr.index, tbl->index, 10)) { | if (!memcmp(sffh->sfh.hdr.index, tbl->index, 10)) { |
| break; | break; |
| Line 1374 const SFENTRY *tblterm; | Line 1374 const SFENTRY *tblterm; |
| while((!done) && (ret != STATFLAG_FAILURE)) { | while((!done) && (ret != STATFLAG_FAILURE)) { |
| ret |= statflag_readsection(sffh); | ret |= statflag_readsection(sffh); |
| tbl = np2tbl + 1; | tbl = np2tbl + 1; |
| tblterm = np2tbl + (sizeof(np2tbl)/sizeof(SFENTRY)); | tblterm = np2tbl + NELEMENTS(np2tbl); |
| while(tbl < tblterm) { | while(tbl < tblterm) { |
| if (!memcmp(sffh->sfh.hdr.index, tbl->index, 10)) { | if (!memcmp(sffh->sfh.hdr.index, tbl->index, 10)) { |
| break; | break; |