This commit is contained in:
twinaphex 2015-07-23 20:03:21 +02:00
parent c8d581c2ec
commit 0f1b8f979b
15 changed files with 12 additions and 87 deletions

View File

@ -49,8 +49,6 @@ MDFNGI *MDFNGameInfo = &EmulatedPCE_Fast;
extern "C" unsigned long crc32(unsigned long crc, const unsigned char *buf, unsigned int len);
namespace PCE_Fast
{
static PCEFast_PSG *psg = NULL;
extern ArcadeCard *arcade_card; // Bah, lousy globals.
@ -911,8 +909,6 @@ void HuC_Power(void)
arcade_card->Power();
}
};
MDFNGI EmulatedPCE_Fast =
{
"pce_fast",
@ -1520,7 +1516,7 @@ static void check_variables(void)
if (do_cdsettings)
{
PCE_Fast::PCECD_Settings settings = {0};
PCECD_Settings settings = {0};
settings.CDDA_Volume = (double)setting_pce_fast_cddavolume / 100;
settings.CD_Speed = setting_pce_fast_cdspeed;
settings.ADPCM_Volume = (double)setting_pce_fast_adpcmvolume / 100;

View File

@ -1,6 +1,3 @@
namespace PCE_Fast
{
int HuCLoad(const uint8 *data, uint32 len, uint32 crc32) MDFN_COLD;
int HuCLoadCD(const char *bios_path) MDFN_COLD;
void HuC_Close(void) MDFN_COLD;
@ -12,5 +9,3 @@ DECLFR(PCE_ACRead);
DECLFW(PCE_ACWrite);
extern bool PCE_IsCD;
};

View File

@ -18,9 +18,6 @@
#include "pce.h"
#include "vdc.h"
namespace PCE_Fast
{
HuC6280 HuCPU;
uint8 *HuCPUFastMap[0x100];
@ -778,6 +775,3 @@ int HuC6280_StateAction(StateMem *sm, int load, int data_only)
return(ret);
}
};

View File

@ -5,10 +5,6 @@
#define HUC6280_LAZY_FLAGS
namespace PCE_Fast
{
typedef struct __HuC6280
{
#ifdef HUC6280_CRAZY_VERSION
@ -149,8 +145,5 @@ static INLINE void HuC6280_IRQStatusWrite(unsigned int A, uint8 V)
}
}
};
#define _HuC6280H
#endif

View File

@ -20,9 +20,6 @@
#include "huc.h"
#include "../mednafen-endian.h"
namespace PCE_Fast
{
static int InputTypes[5];
static uint8 *data_ptr[5];
@ -333,5 +330,3 @@ static void SyncSettings(void)
MDFNGameInfo->mouse_sensitivity = MDFN_GetSettingF("pce_fast.mouse_sensitivity");
InputDeviceInfo[1].IDII = MDFN_GetSettingB("pce_fast.disable_softreset") ? GamepadIDII_DSR : GamepadIDII;
}
};

View File

@ -1,9 +1,6 @@
#ifndef __PCE_INPUT_H
#define __PCE_INPUT_H
namespace PCE_Fast
{
void PCEINPUT_Init(void);
void PCEINPUT_SettingChanged(const char *name);
void PCEINPUT_SetInput(int port, const char *type, void *ptr);
@ -14,6 +11,4 @@ int INPUT_StateAction(StateMem *sm, int load, int data_only);
extern InputInfoStruct PCEInputInfo;
void INPUT_FixTS(void);
};
#endif

View File

@ -12,29 +12,24 @@
#define DECLFR(x) uint8 MDFN_FASTCALL x (uint32 A)
#define DECLFW(x) void MDFN_FASTCALL x (uint32 A, uint8 V)
namespace PCE_Fast
{
extern uint8 ROMSpace[0x88 * 8192 + 8192];
extern uint8 ROMSpace[0x88 * 8192 + 8192];
typedef void (MDFN_FASTCALL *writefunc)(uint32 A, uint8 V);
typedef uint8 (MDFN_FASTCALL *readfunc)(uint32 A);
typedef void (MDFN_FASTCALL *writefunc)(uint32 A, uint8 V);
typedef uint8 (MDFN_FASTCALL *readfunc)(uint32 A);
extern uint8 PCEIODataBuffer;
extern uint8 PCEIODataBuffer;
bool PCE_InitCD(void) MDFN_COLD;
bool PCE_InitCD(void) MDFN_COLD;
extern bool PCE_ACEnabled; // Arcade Card emulation enabled?
void PCE_Power(void) MDFN_COLD;
extern bool PCE_ACEnabled; // Arcade Card emulation enabled?
void PCE_Power(void) MDFN_COLD;
extern readfunc PCERead[0x100];
extern writefunc PCEWrite[0x100];
extern int pce_overclocked;
extern readfunc PCERead[0x100];
extern writefunc PCEWrite[0x100];
extern int pce_overclocked;
extern uint8 BaseRAM[32768 + 8192];
};
extern uint8 BaseRAM[32768 + 8192];
#include "huc6280.h"
using namespace PCE_Fast;
#endif

View File

@ -31,9 +31,6 @@
#include "pcecd.h"
#include "../cdrom/SimpleFIFO.h"
namespace PCE_Fast
{
//#define PCECD_DEBUG
static unsigned int OC_Multiplier;
@ -983,5 +980,3 @@ int PCECD_StateAction(StateMem *sm, int load, int data_only)
}
return(ret);
}
}

View File

@ -3,9 +3,6 @@
#include "../include/blip/Blip_Buffer.h"
namespace PCE_Fast
{
typedef struct
{
float CDDA_Volume; // Max 2.000...
@ -32,6 +29,5 @@ bool PCECD_IsBRAMEnabled(void);
int PCECD_StateAction(StateMem *sm, int load, int data_only);
}
#endif

View File

@ -22,8 +22,6 @@
#include "../cdrom/SimpleFIFO.h"
#include "../msvc_compat.h"
namespace PCE_Fast
{
static inline void SCSIDBG(const char *format, ...)
{
//printf("SCSI: " format "\n", ## __VA_ARGS__);
@ -1365,5 +1363,3 @@ int PCECD_Drive_StateAction(StateMem * sm, int load, int data_only, const char *
return (ret);
}
}

View File

@ -3,9 +3,6 @@
#include "../include/blip/Blip_Buffer.h"
namespace PCE_Fast
{
typedef int32 pcecd_drive_timestamp_t;
struct pcecd_drive_bus_t
@ -84,6 +81,4 @@ int PCECD_Drive_StateAction(StateMem *sm, int load, int data_only, const char *s
void PCECD_Drive_SetDisc(bool tray_open, CDIF *cdif, bool no_emu_side_effects = false) MDFN_COLD;
}
#endif

View File

@ -21,9 +21,6 @@
#include <math.h>
#include <string.h>
namespace PCE_Fast
{
void PCEFast_PSG::SetVolume(double new_volume)
{
OutputVolume = new_volume;
@ -672,5 +669,3 @@ int PCEFast_PSG::StateAction(StateMem *sm, int load, int data_only)
}
return(ret);
}
}

View File

@ -3,9 +3,6 @@
#include "../include/blip/Blip_Buffer.h"
namespace PCE_Fast
{
class PCEFast_PSG;
struct psg_channel
@ -94,6 +91,4 @@ class PCEFast_PSG
int32 dbtable[32][32];
};
}
#endif

View File

@ -33,9 +33,6 @@ The spectrum peaked at 15734 Hz. 21477272.727272... / 3 / 15734 = 455.00(CPU cy
#include "../FileStream.h"
#include <math.h>
namespace PCE_Fast
{
static uint32 userle; // User layer enable.
static uint32 disabled_layer_color;
@ -1221,5 +1218,3 @@ int VDC_StateAction(StateMem *sm, int load, int data_only)
return(ret);
}
};

View File

@ -1,9 +1,6 @@
#ifndef _PCE_VDC_H
#define _PCE_VDC_H
namespace PCE_Fast
{
#define REGSETP(_reg, _data, _msb) { _reg &= 0xFF << ((_msb) ? 0 : 8); _reg |= (_data) << ((_msb) ? 8 : 0); }
#define REGGETP(_reg, _msb) ((_reg >> ((_msb) ? 8 : 0)) & 0xFF)
@ -177,6 +174,4 @@ void VDC_Power(void) MDFN_COLD;
int VDC_StateAction(StateMem *sm, int load, int data_only);
};
#endif