--- np2/win9xc/ini.cpp 2003/12/04 06:41:23 1.5 +++ np2/win9xc/ini.cpp 2005/02/07 14:46:15 1.9 @@ -15,10 +15,10 @@ const INITBL *tblterm; UINT count; } _INIARG, *INIARG; -static void inirdarg8(BYTE *dst, int dsize, const char *src) { +static void inirdarg8(UINT8 *dst, int dsize, const char *src) { int i; - BYTE val; + UINT8 val; BOOL set; char c; @@ -75,16 +75,16 @@ const INITBL *p; break; case INITYPE_BOOL: - *((BYTE *)p->value) = (!milstr_cmp(data, str_true))?1:0; + *((UINT8 *)p->value) = (!milstr_cmp(data, str_true))?1:0; break; case INITYPE_BYTEARG: - inirdarg8((BYTE *)p->value, p->size, data); + inirdarg8((UINT8 *)p->value, p->size, data); break; case INITYPE_SINT8: case INITYPE_UINT8: - *((BYTE *)p->value) = (BYTE)milstr_solveINT(data); + *((UINT8 *)p->value) = (UINT8)milstr_solveINT(data); break; case INITYPE_SINT16: @@ -98,7 +98,7 @@ const INITBL *p; break; case INITYPE_HEX8: - *((BYTE *)p->value) = (BYTE)milstr_solveHEX(data); + *((UINT8 *)p->value) = (UINT8)milstr_solveHEX(data); break; case INITYPE_HEX16: @@ -178,7 +178,7 @@ iwss_extend: } } -static void iniwrsetarg8(char *work, int size, const BYTE *ptr, int arg) { +static void iniwrsetarg8(char *work, int size, const UINT8 *ptr, int arg) { int i; char tmp[8]; @@ -222,12 +222,12 @@ const INITBL *pterm; break; case INITYPE_BOOL: - milstr_ncpy(work, (*((BYTE *)p->value))?str_true:str_false, + milstr_ncpy(work, (*((UINT8 *)p->value))?str_true:str_false, sizeof(work)); break; case INITYPE_BYTEARG: - iniwrsetarg8(work, sizeof(work), (BYTE *)p->value, p->size); + iniwrsetarg8(work, sizeof(work), (UINT8 *)p->value, p->size); break; case INITYPE_SINT8: @@ -243,7 +243,7 @@ const INITBL *pterm; break; case INITYPE_UINT8: - SPRINTF(work, "%u", *((BYTE *)p->value)); + SPRINTF(work, "%u", *((UINT8 *)p->value)); break; case INITYPE_UINT16: @@ -255,7 +255,7 @@ const INITBL *pterm; break; case INITYPE_HEX8: - SPRINTF(work, "%x", *((BYTE *)p->value)); + SPRINTF(work, "%x", *((UINT8 *)p->value)); break; case INITYPE_HEX16: @@ -296,6 +296,10 @@ static const INITBL iniitem[] = { {"bmap_Dir", INITYPE_STR, bmpfilefolder, MAX_PATH}, {"fontfile", INITYPE_STR, np2cfg.fontfile, MAX_PATH}, {"biospath", INITYPE_STR, np2cfg.biospath, MAX_PATH}, +#if defined(SUPPORT_HOSTDRV) + {"hdrvroot", INITYPE_STR, np2cfg.hdrvroot, MAX_PATH}, + {"hdrv_acc", INITYPE_UINT8, &np2cfg.hdrvacc, 0}, +#endif {"pc_model", INITYPE_STR, &np2cfg.model, sizeof(np2cfg.model)}, @@ -307,8 +311,8 @@ static const INITBL iniitem[] = { {"ExMemory", INITYPE_UINT8, &np2cfg.EXTMEM, 0}, {"ITF_WORK", INITYPE_BOOL, &np2cfg.ITF_WORK, 0}, - {"HDD1FILE", INITYPE_STR, np2cfg.hddfile[0], MAX_PATH}, - {"HDD2FILE", INITYPE_STR, np2cfg.hddfile[1], MAX_PATH}, + {"HDD1FILE", INITYPE_STR, np2cfg.sasihdd[0], MAX_PATH}, + {"HDD2FILE", INITYPE_STR, np2cfg.sasihdd[1], MAX_PATH}, {"SampleHz", INITYPE_UINT16, &np2cfg.samplingrate, 0}, {"Latencys", INITYPE_UINT16, &np2cfg.delayms, 0}, @@ -362,6 +366,8 @@ static const INITBL iniitem[] = { {"pc9861_j", INITYPE_BYTEARG, np2cfg.pc9861jmp, 6}, {"calendar", INITYPE_BOOL, &np2cfg.calendar, 0}, {"USE144FD", INITYPE_BOOL, &np2cfg.usefd144, 0}, + {"e_resume", INITYPE_BOOL, &np2oscfg.resume, 0}, + {"jast_snd", INITYPE_BOOL, &np2oscfg.jastsnd, 0}, // ver0.73 {"I286SAVE", INITYPE_BOOL, &np2oscfg.I286SAVE, 0}}; #define INIITEMS (sizeof(iniitem) / sizeof(INITBL))