fixed some portability issues

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@336 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-01-27 23:04:29 +00:00
parent d4ca252d92
commit dca310c413
8 changed files with 24 additions and 13 deletions

View file

@ -9,9 +9,6 @@
#include "../PicoInt.h"
#define cdprintf(x...)
#define CDC_DMA_SPEED 256

View file

@ -18,10 +18,15 @@ typedef unsigned int u32;
#define UTYPES_DEFINED
#endif
#ifdef _MSC_VER
#define rdprintf
#define wrdprintf
#else
//#define rdprintf dprintf
#define rdprintf(...)
//#define wrdprintf dprintf
#define wrdprintf(...)
#endif
#ifdef EMU_CORE_DEBUG
extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16];
@ -1158,11 +1163,12 @@ static u32 PicoReadS68k32(u32 a)
// word RAM (1M area)
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
int bank;
u16 *pm;
wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);
// if (!(Pico_mcd->s68k_regs[3]&4))
// dprintf("s68k_wram1M FIXME: wrong mode");
bank = (Pico_mcd->s68k_regs[3]&1)^1;
u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];
pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];
wrdprintf("ret = %08x", d);
goto end;
}

View file

@ -10,7 +10,6 @@
#include "../PicoInt.h"
#include "cd_file.h"
#define cdprintf(x...)
//#define cdprintf(f,...) printf(f "\n",##__VA_ARGS__) // tmp
#define DEBUG_CD

View file

@ -13,7 +13,6 @@
#include "cd_sys.h"
#include "cd_file.h"
#define cdprintf(x...)
#define DEBUG_CD
#define TRAY_OPEN 0x0500 // TRAY OPEN CDD status