libretro/xmil-libretro
1
0
Fork 0
mirror of https://github.com/libretro/xmil-libretro.git synced 2024-11-26 18:00:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolves BOOL/BRESULT

Browse Source 
refs #90
 svn merge -r 176:177 https://amethyst.yui.ne.jp/svn-dev/x1/xmil/branches/yui/WORK_01
 svn merge -r 214:216 https://amethyst.yui.ne.jp/svn-dev/x1/xmil/branches/yui/WORK_01
This commit is contained in:
yui 2015-11-13 14:04:30 +00:00
parent ec09dc6e79
commit 8031987c1a
32 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adv/patch/ctc.c
View File

@ -227,11 +227,11 @@ void neitem_ctc(UINT id) {
}
}
BRESULT ieitem_ctc(UINT id) {
BOOL ieitem_ctc(UINT id) {
CTCCH *ch;
REG8 intr;
BRESULT r;
BOOL r;
UINT i;
REG8 bit;

2
adv/patch/ctc.h
View File

@ -40,7 +40,7 @@ extern "C" {
#endif
void neitem_ctc(UINT id);
BRESULT ieitem_ctc(UINT id);
BOOL ieitem_ctc(UINT id);
void ieeoi_ctc(UINT id);
void IOOUTCALL ctc_o(UINT port, REG8 dat); // x1_ctc_w

2
adv/patch/subcpu.c
View File

@ -33,7 +33,7 @@ void neitem_scpu(UINT id) {
}
}
BRESULT ieitem_scpu(UINT id) {
BOOL ieitem_scpu(UINT id) {
UINT key;
UINT8 keydata;

2
adv/xmil.c
View File

@ -168,7 +168,7 @@ static void exec1frame(XMILMAIN *xmm) {
joymng_setflags();
advpsg_sync(&advpsg);
pccore_exec((BRESULT)(xmm->framecnt == 0));
pccore_exec(xmm->framecnt == 0);
xmm->framecnt++;
}

4
fdd/fdd_2d.c
View File

@ -26,7 +26,7 @@ static REG8 fdd2d_read(FDDFILE fdd, REG8 media, UINT track, REG8 sc,
UINT rsize;
FILEH fh;
long pos;
BRESULT b;
BOOL b;
if ((media != fdd->inf.xdf.media) || (track >= fdd->inf.xdf.tracks) ||
(sc == 0) || (sc > fdd->inf.xdf.sectors)) {
@ -61,7 +61,7 @@ static REG8 fdd2d_write(FDDFILE fdd, REG8 media, UINT track, REG8 sc,
UINT secsize;
FILEH fh;
long pos;
BRESULT b;
BOOL b;
if ((media != fdd->inf.xdf.media) || (track >= fdd->inf.xdf.tracks) ||
(sc == 0) || (sc > fdd->inf.xdf.sectors)) {

2
fdd/fdd_d88.c
View File

@ -462,7 +462,7 @@ BRESULT fddd88_set(FDDFILE fdd, const OEMCHAR *fname) {
short attr;
FILEH fh;
BRESULT r;
BOOL r;
UINT8 ptr[D88_TRACKMAX][4];
UINT i;

2
fdd/fdd_ini.c
View File

@ -4,7 +4,7 @@
#include "fdd_ini.h"
BRESULT is_d8ufile(const OEMCHAR *fname) {
BOOL is_d8ufile(const OEMCHAR *fname) {
(void)fname;
return(FALSE);

2
fdd/fdd_ini.h
View File

@ -3,7 +3,7 @@
extern "C" {
#endif
BRESULT is_d8ufile(const OEMCHAR *fname);
BOOL is_d8ufile(const OEMCHAR *fname);
BRESULT fdd_ini(const OEMCHAR *filename);
#ifdef __cplusplus

4
fdd/fddfile.c
View File

@ -96,7 +96,7 @@ const OEMCHAR *fddfile_diskname(REG8 drv) {
return(fddfile[drv].fname);
}
BRESULT fddfile_diskready(REG8 drv) {
BOOL fddfile_diskready(REG8 drv) {
if ((drv >= MAX_FDDFILE) || (fddfile[drv].type == DISKTYPE_NOTREADY)) {
return(FALSE);
@ -104,7 +104,7 @@ BRESULT fddfile_diskready(REG8 drv) {
return(TRUE);
}
BRESULT fddfile_diskprotect(REG8 drv) {
BOOL fddfile_diskprotect(REG8 drv) {
if ((drv >= MAX_FDDFILE) || (!fddfile[drv].protect)) {
return(FALSE);

4
fdd/fddfile.h
View File

@ -105,8 +105,8 @@ extern _FDDFILE fddfile[MAX_FDDFILE];
void fddfile_initialize(void);
const OEMCHAR *fddfile_diskname(REG8 drv);
BRESULT fddfile_diskready(REG8 drv);
BRESULT fddfile_diskprotect(REG8 drv);
BOOL fddfile_diskready(REG8 drv);
BOOL fddfile_diskprotect(REG8 drv);
BRESULT fddfile_set(REG8 drv, const OEMCHAR *fname, UINT ftype, int ro);
void fddfile_eject(REG8 drv);

2
font/font.c
View File

@ -87,7 +87,7 @@ static void font_cnvx1t2x1(void) {
}
REG8 font_load(const OEMCHAR *filename, BRESULT force) {
REG8 font_load(const OEMCHAR *filename, BOOL force) {
OEMCHAR fname[MAX_PATH];
REG8 type;

2
font/font.h
View File

@ -12,7 +12,7 @@ extern UINT8 font_knjx1[0x20000];
extern UINT8 font_knjx1t[0x40000];
UINT8 *font_adrsx1t(UINT jis);
REG8 font_load(const OEMCHAR *filename, BRESULT force);
REG8 font_load(const OEMCHAR *filename, BOOL force);
#ifdef __cplusplus
}

2
font/fontmake.c
View File

@ -65,7 +65,7 @@ const JISPAIR *tblterm;
return(jis);
}
static BRESULT isx1jis(UINT jis) {
static BOOL isx1jis(UINT jis) {
const UINT8 *p;
UINT tmp;

4
ievent.c
View File

@ -9,9 +9,9 @@
/* ここでデイジーチェイン */
typedef BRESULT (*IEVENTFN)(UINT id);
typedef BOOL (*IEVENTFN)(UINT id);
static BRESULT dummy(UINT id) {
static BOOL dummy(UINT id) {
(void)id;
return(FALSE);

4
io/ctc.c
View File

@ -185,11 +185,11 @@ void neitem_ctc(UINT id) {
}
}
BRESULT ieitem_ctc(UINT id) {
BOOL ieitem_ctc(UINT id) {
CTCCH *ch;
REG8 intr;
BRESULT r;
BOOL r;
UINT i;
REG8 bit;

2
io/ctc.h
View File

@ -40,7 +40,7 @@ extern "C" {
#endif
void neitem_ctc(UINT id);
BRESULT ieitem_ctc(UINT id);
BOOL ieitem_ctc(UINT id);
void ieeoi_ctc(UINT id);
void IOOUTCALL ctc_o(UINT port, REG8 dat);

4
io/dmac.c
View File

@ -26,7 +26,7 @@ static REG8 iswork(const DMAC *d) {
return(1);
}
void dmac_sendready(BRESULT ready) {
void dmac_sendready(BOOL ready) {
DMAC *d;
REG8 working;
@ -58,7 +58,7 @@ void dmac_sendready(BRESULT ready) {
}
BRESULT ieitem_dmac(UINT id) {
BOOL ieitem_dmac(UINT id) {
DMAC *d;
REG8 vect;

4
io/dmac.h
View File

@ -186,8 +186,8 @@ typedef struct {
extern "C" {
#endif
void dmac_sendready(BRESULT ready);
BRESULT ieitem_dmac(UINT id);
void dmac_sendready(BOOL ready);
BOOL ieitem_dmac(UINT id);
void IOOUTCALL dmac_o(UINT port, REG8 dat);
REG8 IOINPCALL dmac_i(UINT port);

2
io/fdc.c
View File

@ -502,7 +502,7 @@ static REG8 crccmd(FDC *f) {
static void fdcenddata(FDC *f) {
BRESULT r;
BOOL r;
REG8 stat;
r = FALSE;

4
io/subcpu.c
View File

@ -63,7 +63,7 @@ static const SCPUTBL scputbl[0x20] = {
void neitem_scpu(UINT id) {
BRESULT intr;
BOOL intr;
intr = FALSE;
/* こうすると同時押しが判定できないのでキーバッファを持つべし */
@ -85,7 +85,7 @@ void neitem_scpu(UINT id) {
}
}
BRESULT ieitem_scpu(UINT id) {
BOOL ieitem_scpu(UINT id) {
UINT key;
UINT8 keydata;

2
io/subcpu.h
View File

@ -31,7 +31,7 @@ extern "C" {
#endif
void neitem_scpu(UINT id);
BRESULT ieitem_scpu(UINT id);
BOOL ieitem_scpu(UINT id);
void subcpu_sendkey(void);
void IOOUTCALL subcpu_o(UINT port, REG8 dat);

4
nds/patch/ctc.c
View File

@ -198,11 +198,11 @@ void neitem_ctc(UINT uId)
}
}
BRESULT ieitem_ctc(UINT uId)
BOOL ieitem_ctc(UINT uId)
{
CTCCH *pCh;
REG8 cIntr;
BRESULT r;
BOOL r;
UINT i;
REG8 cBit;

2
nds/patch/subcpu.c
View File

@ -36,7 +36,7 @@ void neitem_scpu(UINT uId)
}
}
BRESULT ieitem_scpu(UINT uId)
BOOL ieitem_scpu(UINT uId)
{
UINT uKey;
REG8 cKeyData;

2
nds/xmil9.cpp
View File

@ -160,7 +160,7 @@ static void processwait(XMILMAIN &xmm, UINT uCount)
static void exec1frame(XMILMAIN &xmm)
{
joymng_setflags();
pccore_exec((BRESULT)(xmm.uFrameCount == 0));
pccore_exec(xmm.uFrameCount == 0);
xmm.uFrameCount++;
nds9psg_sync(&nds9psg);
softkbd9_sync();

2
nevent.c
View File

@ -166,7 +166,7 @@ void nevent_setbyms(UINT id, SINT32 ms, NEVENTCB proc, BRESULT absolute) {
nevent_set(id, clock, proc, absolute);
}
BRESULT nevent_iswork(UINT id) {
BOOL nevent_iswork(UINT id) {
NEVENTITEM item;

2
nevent.h
View File

@ -64,7 +64,7 @@ void nevent_setbyms(UINT id, SINT32 ms, NEVENTCB proc, BRESULT absolute);
void nevent_reset(UINT id);
/* イベントの動作状態取得 */
BRESULT nevent_iswork(UINT id);
BOOL nevent_iswork(UINT id);
/* 実行したクロック数の取得 */
SINT32 nevent_getwork(UINT id);

2
pccore.c
View File

@ -255,7 +255,7 @@ static UINT iocounter = 0;
#endif
void pccore_exec(BRESULT draw) {
void pccore_exec(BOOL draw) {
SINT32 frameclock;
#if defined(MAINFRAMES_OLD)

2
pccore.h
View File

@ -74,7 +74,7 @@ void neitem_vsync(UINT id);
void pccore_initialize(void);
void pccore_reset(void);
void pccore_deinitialize(void);
void pccore_exec(BRESULT draw);
void pccore_exec(BOOL draw);
#ifdef __cplusplus
}

4
statsave.c
View File

@ -587,7 +587,7 @@ int statsave_check(const OEMCHAR *filename, OEMCHAR *buf, UINT size) {
SFFILEH sffh;
int ret;
BRESULT done;
BOOL done;
const SFENTRY *tbl;
const SFENTRY *tblterm;
@ -643,7 +643,7 @@ int statsave_load(const OEMCHAR *filename) {
SFFILEH sffh;
int ret;
BRESULT done;
BOOL done;
const SFENTRY *tbl;
const SFENTRY *tblterm;

8
vram/make15.c
View File

@ -12,7 +12,7 @@ void width80x25_200l(void) { // 80x25 200line
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;
@ -78,7 +78,7 @@ void width80x12_200l(void) { // 80x12 200line
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;
@ -149,7 +149,7 @@ void width80x20l(void) {
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;
@ -208,7 +208,7 @@ void width80x10l(void) {
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;

12
vram/make24.c
View File

@ -12,7 +12,7 @@ void width80x25_200h(void) { // 80x25 200line
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;
@ -83,7 +83,7 @@ void width80x25_400h(void) { // 80x25 400line
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;
@ -156,7 +156,7 @@ void width80x12_200h(void) { // 80x12 200line
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;
@ -228,7 +228,7 @@ void width80x12_400h(void) { // 80x12 400line
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;
@ -309,7 +309,7 @@ void width80x20h(void) {
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;
@ -370,7 +370,7 @@ void width80x10h(void) {
UINT fontcy;
UINT pos;
BRESULT newline;
BOOL newline;
UINT8 *dst;
UINT y;
UINT8 *lp;

4
vram/makescrn.c
View File

@ -30,7 +30,7 @@ static void flashupdatetmp(void) {
UINT x;
UINT r;
UINT posr;
BRESULT y2;
BOOL y2;
REG16 atr;
REG16 udtbase;
REG16 udt;
@ -89,7 +89,7 @@ static void flashupdatetmp(void) {
} while(--y);
}
static BRESULT updateblink(void) {
static BOOL updateblink(void) {
UINT pos;
REG8 update;