Fix compilation issues with __fastcall changes

This commit is contained in:
Barry Harris 2012-01-02 13:47:13 +00:00
parent 2e0475630a
commit ec30af942c
11 changed files with 45 additions and 45 deletions

View File

@ -1006,7 +1006,7 @@ static void palette_write(INT32 offset, INT32 offset2)
DrvPalette[offset3] = BurnHighCol((r << 3) | (r >> 2), (g << 3) | (g >> 2), (b << 3) | (b >> 2), 0); DrvPalette[offset3] = BurnHighCol((r << 3) | (r >> 2), (g << 3) | (g >> 2), (b << 3) | (b >> 2), 0);
} }
UINT8 __fastcall m72_main_read(UINT32 address) UINT8 m72_main_read(UINT32 address)
{ {
if ((address & 0xff000) == 0xb0000) { if ((address & 0xff000) == 0xb0000) {
return protection_read(address); return protection_read(address);
@ -1015,7 +1015,7 @@ UINT8 __fastcall m72_main_read(UINT32 address)
return 0; return 0;
} }
void __fastcall m72_main_write(UINT32 address, UINT8 data) void m72_main_write(UINT32 address, UINT8 data)
{ {
if ((address & 0xff000) == 0xb0000) { if ((address & 0xff000) == 0xb0000) {
protection_write(address, data); protection_write(address, data);
@ -1037,7 +1037,7 @@ void __fastcall m72_main_write(UINT32 address, UINT8 data)
} }
} }
void __fastcall rtype2_main_write(UINT32 address, UINT8 data) void rtype2_main_write(UINT32 address, UINT8 data)
{ {
if ((address & 0xff000) == 0xc8000 || (address & 0xff000) == 0xa0000 || (address & 0xff000) == 0xcc000) { if ((address & 0xff000) == 0xc8000 || (address & 0xff000) == 0xa0000 || (address & 0xff000) == 0xcc000) {
if (address & 1) data = 0xff; if (address & 1) data = 0xff;
@ -1074,7 +1074,7 @@ void __fastcall rtype2_main_write(UINT32 address, UINT8 data)
} }
} }
void __fastcall m72_main_write_port(UINT32 port, UINT8 data) void m72_main_write_port(UINT32 port, UINT8 data)
{ {
// bprintf (0, _T("%2.2x, %2.2x wp\n"), port, data); // bprintf (0, _T("%2.2x, %2.2x wp\n"), port, data);
@ -1193,7 +1193,7 @@ static UINT16 poundfor_trackball_r(INT32 offset)
return 0; return 0;
} }
UINT8 __fastcall m72_main_read_port(UINT32 port) UINT8 m72_main_read_port(UINT32 port)
{ {
switch (port) switch (port)
{ {

View File

@ -822,7 +822,7 @@ static inline void update_palette_entry(INT32 entry)
DrvPalette[entry / 2] = BurnHighCol(r, g, b, 0); DrvPalette[entry / 2] = BurnHighCol(r, g, b, 0);
} }
void __fastcall m90_main_write(UINT32 address, UINT8 data) void m90_main_write(UINT32 address, UINT8 data)
{ {
if ((address & 0xffc00) == 0xe0000) { if ((address & 0xffc00) == 0xe0000) {
DrvPalRAM[address & 0x3ff] = data; DrvPalRAM[address & 0x3ff] = data;
@ -831,12 +831,12 @@ void __fastcall m90_main_write(UINT32 address, UINT8 data)
} }
} }
UINT8 __fastcall m90_main_read(UINT32 /*address*/) UINT8 m90_main_read(UINT32 /*address*/)
{ {
return 0; return 0;
} }
void __fastcall m90_main_write_port(UINT32 port, UINT8 data) void m90_main_write_port(UINT32 port, UINT8 data)
{ {
if ((port & ~0x0f) == 0x80) { if ((port & ~0x0f) == 0x80) {
m90_video_control[port & 0x0f] = data; m90_video_control[port & 0x0f] = data;
@ -875,7 +875,7 @@ void __fastcall m90_main_write_port(UINT32 port, UINT8 data)
} }
} }
UINT8 __fastcall m90_main_read_port(UINT32 port) UINT8 m90_main_read_port(UINT32 port)
{ {
switch (port) switch (port)
{ {

View File

@ -1239,7 +1239,7 @@ static void m92YM2151IRQHandler(INT32 nStatus)
VezRun(100); VezRun(100);
} }
UINT8 __fastcall m92ReadByte(UINT32 address) UINT8 m92ReadByte(UINT32 address)
{ {
if ((address & 0xff800) == 0xf8800 ) if ((address & 0xff800) == 0xf8800 )
return DrvPalRAM[ address - 0xf8800 + PalBank ]; return DrvPalRAM[ address - 0xf8800 + PalBank ];
@ -1255,7 +1255,7 @@ UINT8 __fastcall m92ReadByte(UINT32 address)
return 0; return 0;
} }
void __fastcall m92WriteByte(UINT32 address, UINT8 data) void m92WriteByte(UINT32 address, UINT8 data)
{ {
if ((address & 0xff800) == 0xf8800 ) { if ((address & 0xff800) == 0xf8800 ) {
DrvPalRAM[ address - 0xf8800 + PalBank ] = data; DrvPalRAM[ address - 0xf8800 + PalBank ] = data;
@ -1300,7 +1300,7 @@ void __fastcall m92WriteByte(UINT32 address, UINT8 data)
} }
} }
UINT8 __fastcall m92ReadPort(UINT32 port) UINT8 m92ReadPort(UINT32 port)
{ {
switch (port) switch (port)
{ {
@ -1348,7 +1348,7 @@ static void set_pf_scroll(INT32 layer)
ptr->scrolly = (pf_control[layer][0] << 0) | (pf_control[layer][1] << 8); ptr->scrolly = (pf_control[layer][0] << 0) | (pf_control[layer][1] << 8);
} }
void __fastcall m92WritePort(UINT32 port, UINT8 data) void m92WritePort(UINT32 port, UINT8 data)
{ {
switch (port) switch (port)
{ {
@ -1444,7 +1444,7 @@ void __fastcall m92WritePort(UINT32 port, UINT8 data)
} }
} }
UINT8 __fastcall m92SndReadByte(UINT32 address) UINT8 m92SndReadByte(UINT32 address)
{ {
if ((address & 0xfffc0) == 0xa8000) { if ((address & 0xfffc0) == 0xa8000) {
return iremga20_read( 0, (address & 0x0003f) / 2 ); return iremga20_read( 0, (address & 0x0003f) / 2 );
@ -1468,7 +1468,7 @@ UINT8 __fastcall m92SndReadByte(UINT32 address)
return 0; return 0;
} }
void __fastcall m92SndWriteByte(UINT32 address, UINT8 data) void m92SndWriteByte(UINT32 address, UINT8 data)
{ {
if ((address & 0xfffc0) == 0xa8000) { if ((address & 0xfffc0) == 0xa8000) {
iremga20_write( 0, (address & 0x0003f) / 2, data ); iremga20_write( 0, (address & 0x0003f) / 2, data );

View File

@ -320,7 +320,7 @@ INT32 raidenSynchroniseStream(INT32 nSoundRate)
return (INT64)ZetTotalCycles() * nSoundRate / 3579545; return (INT64)ZetTotalCycles() * nSoundRate / 3579545;
} }
UINT8 __fastcall raidenReadByte(UINT32 vezAddress) UINT8 raidenReadByte(UINT32 vezAddress)
{ {
switch (vezAddress) { switch (vezAddress) {
case 0x0b000: return ~DrvInput[1]; case 0x0b000: return ~DrvInput[1];
@ -349,7 +349,7 @@ UINT8 __fastcall raidenReadByte(UINT32 vezAddress)
return 0; return 0;
} }
void __fastcall raidenWriteByte(UINT32 vezAddress, UINT8 byteValue) void raidenWriteByte(UINT32 vezAddress, UINT8 byteValue)
{ {
switch (vezAddress) { switch (vezAddress) {
@ -398,7 +398,7 @@ void __fastcall raidenWriteByte(UINT32 vezAddress, UINT8 byteValue)
} }
} }
UINT8 __fastcall raidenAltReadByte(UINT32 vezAddress) UINT8 raidenAltReadByte(UINT32 vezAddress)
{ {
switch (vezAddress) { switch (vezAddress) {
case 0x0a000: case 0x0a000:
@ -427,7 +427,7 @@ UINT8 __fastcall raidenAltReadByte(UINT32 vezAddress)
return 0; return 0;
} }
void __fastcall raidenAltWriteByte(UINT32 vezAddress, UINT8 byteValue) void raidenAltWriteByte(UINT32 vezAddress, UINT8 byteValue)
{ {
switch (vezAddress) { switch (vezAddress) {
@ -474,7 +474,7 @@ void __fastcall raidenAltWriteByte(UINT32 vezAddress, UINT8 byteValue)
} }
} }
UINT8 __fastcall raidenSubReadByte(UINT32 vezAddress) UINT8 raidenSubReadByte(UINT32 vezAddress)
{ {
switch (vezAddress) { switch (vezAddress) {
case 0x04008: { case 0x04008: {
@ -493,7 +493,7 @@ UINT8 __fastcall raidenSubReadByte(UINT32 vezAddress)
return 0; return 0;
} }
void __fastcall raidenSubWriteByte(UINT32 vezAddress, UINT8 byteValue) void raidenSubWriteByte(UINT32 vezAddress, UINT8 byteValue)
{ {
if ((vezAddress & 0xFF000) == 0x03000 ) { if ((vezAddress & 0xFF000) == 0x03000 ) {
vezAddress -= 0x03000; vezAddress -= 0x03000;

View File

@ -151,7 +151,7 @@ static void sync_sound_cpu()
} }
} }
void __fastcall master_write(UINT32 address, UINT8 data) void master_write(UINT32 address, UINT8 data)
{ {
switch (address) switch (address)
{ {
@ -180,7 +180,7 @@ void __fastcall master_write(UINT32 address, UINT8 data)
} }
} }
UINT8 __fastcall master_read(UINT32 address) UINT8 master_read(UINT32 address)
{ {
switch (address) switch (address)
{ {
@ -220,7 +220,7 @@ static inline void palette_update_entry(INT32 entry)
DrvPalette[entry] = BurnHighCol((r<<4)|r, (g<<4)|g, (b<<4)|b, 0); DrvPalette[entry] = BurnHighCol((r<<4)|r, (g<<4)|g, (b<<4)|b, 0);
} }
void __fastcall slave_write(UINT32 address, UINT8 data) void slave_write(UINT32 address, UINT8 data)
{ {
if ((address & 0xff000) == 0x07000) { if ((address & 0xff000) == 0x07000) {
DrvPalRAM[(address & 0xfff)] = data; DrvPalRAM[(address & 0xfff)] = data;

View File

@ -73,7 +73,7 @@ static struct BurnDIPInfo DrvDIPList[]=
STDDIPINFO(Drv) STDDIPINFO(Drv)
void mrflea_write(UINT16 a, UINT8 d) void __fastcall mrflea_write(UINT16 a, UINT8 d)
{ {
if (a >= 0xe000 && a <= 0xe7ff) // video ram if (a >= 0xe000 && a <= 0xe7ff) // video ram
{ {
@ -107,7 +107,7 @@ void mrflea_write(UINT16 a, UINT8 d)
} }
void mrflea_out_port(UINT16 a, UINT8 data) void __fastcall mrflea_out_port(UINT16 a, UINT8 data)
{ {
switch (a & 0xff) switch (a & 0xff)
{ {
@ -134,7 +134,7 @@ void mrflea_out_port(UINT16 a, UINT8 data)
} }
} }
UINT8 mrflea_in_port(UINT16 a) UINT8 __fastcall mrflea_in_port(UINT16 a)
{ {
switch (a & 0xff) switch (a & 0xff)
{ {
@ -152,7 +152,7 @@ UINT8 mrflea_in_port(UINT16 a)
return 0; return 0;
} }
void mrflea_cpu1_out_port(UINT16 a, UINT8 data) void __fastcall mrflea_cpu1_out_port(UINT16 a, UINT8 data)
{ {
switch (a & 0xff) switch (a & 0xff)
{ {
@ -194,7 +194,7 @@ void mrflea_cpu1_out_port(UINT16 a, UINT8 data)
} }
} }
UINT8 mrflea_cpu1_in_port(UINT16 a) UINT8 __fastcall mrflea_cpu1_in_port(UINT16 a)
{ {
UINT8 ret = 0; UINT8 ret = 0;

View File

@ -400,7 +400,7 @@ void __fastcall batsugunWriteWord(UINT32 sekAddress, UINT16 wordValue)
} }
} }
void __fastcall batsugun_v25_write(UINT32 address, UINT8 data) void batsugun_v25_write(UINT32 address, UINT8 data)
{ {
switch (address) switch (address)
{ {
@ -418,7 +418,7 @@ void __fastcall batsugun_v25_write(UINT32 address, UINT8 data)
} }
} }
UINT8 __fastcall batsugun_v25_read(UINT32 address) UINT8 batsugun_v25_read(UINT32 address)
{ {
switch (address) switch (address)
{ {
@ -432,7 +432,7 @@ UINT8 __fastcall batsugun_v25_read(UINT32 address)
return 0; return 0;
} }
UINT8 __fastcall batsugun_v25_read_port(UINT32 port) UINT8 batsugun_v25_read_port(UINT32 port)
{ {
switch (port) switch (port)
{ {

View File

@ -460,7 +460,7 @@ void __fastcall dogyuunWriteWord(UINT32 sekAddress, UINT16 wordValue)
} }
} }
void __fastcall dogyuun_v25_write(UINT32 address, UINT8 data) void dogyuun_v25_write(UINT32 address, UINT8 data)
{ {
switch (address) switch (address)
{ {
@ -478,7 +478,7 @@ void __fastcall dogyuun_v25_write(UINT32 address, UINT8 data)
} }
} }
UINT8 __fastcall dogyuun_v25_read(UINT32 address) UINT8 dogyuun_v25_read(UINT32 address)
{ {
switch (address) switch (address)
{ {
@ -492,7 +492,7 @@ UINT8 __fastcall dogyuun_v25_read(UINT32 address)
return 0; return 0;
} }
UINT8 __fastcall dogyuun_v25_read_port(UINT32 port) UINT8 dogyuun_v25_read_port(UINT32 port)
{ {
switch (port) switch (port)
{ {

View File

@ -208,7 +208,7 @@ void __fastcall fixeightWriteWord(UINT32 sekAddress, UINT16 wordValue)
} }
} }
void __fastcall fixeight_v25_write(UINT32 address, UINT8 data) void fixeight_v25_write(UINT32 address, UINT8 data)
{ {
switch (address) switch (address)
{ {
@ -226,7 +226,7 @@ void __fastcall fixeight_v25_write(UINT32 address, UINT8 data)
} }
} }
UINT8 __fastcall fixeight_v25_read(UINT32 address) UINT8 fixeight_v25_read(UINT32 address)
{ {
switch (address) switch (address)
{ {
@ -243,7 +243,7 @@ UINT8 __fastcall fixeight_v25_read(UINT32 address)
return 0; return 0;
} }
UINT8 __fastcall fixeight_v25_read_port(UINT32 port) UINT8 fixeight_v25_read_port(UINT32 port)
{ {
switch (port) switch (port)
{ {
@ -254,7 +254,7 @@ UINT8 __fastcall fixeight_v25_read_port(UINT32 port)
return 0; return 0;
} }
void __fastcall fixeight_v25_write_port(UINT32 port, UINT8 data) void fixeight_v25_write_port(UINT32 port, UINT8 data)
{ {
switch (port) switch (port)
{ {

View File

@ -313,7 +313,7 @@ void __fastcall kbashWriteWord(UINT32 sekAddress, UINT16 wordValue)
} }
} }
void __fastcall kbash_v25_write(UINT32 address, UINT8 data) void kbash_v25_write(UINT32 address, UINT8 data)
{ {
switch (address) switch (address)
{ {
@ -331,7 +331,7 @@ void __fastcall kbash_v25_write(UINT32 address, UINT8 data)
} }
} }
UINT8 __fastcall kbash_v25_read(UINT32 address) UINT8 kbash_v25_read(UINT32 address)
{ {
switch (address) switch (address)
{ {
@ -345,7 +345,7 @@ UINT8 __fastcall kbash_v25_read(UINT32 address)
return 0; return 0;
} }
UINT8 __fastcall kbash_v25_read_port(UINT32 port) UINT8 kbash_v25_read_port(UINT32 port)
{ {
switch (port) switch (port)
{ {

View File

@ -366,7 +366,7 @@ void __fastcall vfiveWriteWord(UINT32 sekAddress, UINT16 wordValue)
} }
} }
void __fastcall vfive_v25_write(UINT32 address, UINT8 data) void vfive_v25_write(UINT32 address, UINT8 data)
{ {
switch (address) switch (address)
{ {
@ -380,7 +380,7 @@ void __fastcall vfive_v25_write(UINT32 address, UINT8 data)
} }
} }
UINT8 __fastcall vfive_v25_read(UINT32 address) UINT8 vfive_v25_read(UINT32 address)
{ {
switch (address) switch (address)
{ {
@ -391,7 +391,7 @@ UINT8 __fastcall vfive_v25_read(UINT32 address)
return 0; return 0;
} }
UINT8 __fastcall vfive_v25_read_port(UINT32 port) UINT8 vfive_v25_read_port(UINT32 port)
{ {
switch (port) switch (port)
{ {