Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-03 21:31:47 +00:00
Code Issues Projects Releases Wiki Activity

Refactor : ULONG -> unsigned long

Browse Source
This commit is contained in:
Aaron Culliney 2015-06-07 11:49:32 -07:00
parent 109dfa855b
commit 5312ddee00
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/AY8910.h
View File

@ -31,7 +31,7 @@ void AY8910UpdateSetCycles();
//------------------------------------- //-------------------------------------
// FUSE stuff // FUSE stuff
typedef ULONG libspectrum_dword; typedef unsigned long libspectrum_dword;
typedef uint8_t libspectrum_byte; typedef uint8_t libspectrum_byte;
typedef int16_t libspectrum_signed_word; typedef int16_t libspectrum_signed_word;

10
src/audio/mockingboard.c
View File

@ -156,7 +156,7 @@ typedef struct
static SY6522_AY8910 g_MB[NUM_AY8910]; static SY6522_AY8910 g_MB[NUM_AY8910];
// Timer vars // Timer vars
static ULONG g_n6522TimerPeriod = 0; static unsigned long g_n6522TimerPeriod = 0;
#ifdef APPLE2IX #ifdef APPLE2IX
#define TIMERDEVICE_INVALID -1 #define TIMERDEVICE_INVALID -1
#else #else
@ -1697,7 +1697,7 @@ void MB_Reset()
#define nAddr ea #define nAddr ea
GLUE_C_READ(MB_Read) GLUE_C_READ(MB_Read)
#else #else
static uint8_t MB_Read(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft) static uint8_t MB_Read(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, unsigned long nCyclesLeft)
#endif #endif
{ {
MB_UpdateCycles(); MB_UpdateCycles();
@ -1775,7 +1775,7 @@ static uint8_t MB_Read(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nVal
#define nValue b #define nValue b
GLUE_C_WRITE(MB_Write) GLUE_C_WRITE(MB_Write)
#else #else
static uint8_t MB_Write(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft) static uint8_t MB_Write(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, unsigned long nCyclesLeft)
#endif #endif
{ {
MB_UpdateCycles(); MB_UpdateCycles();
@ -1858,7 +1858,7 @@ static uint8_t MB_Write(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nVa
#ifdef APPLE2IX #ifdef APPLE2IX
GLUE_C_READ(PhasorIO) GLUE_C_READ(PhasorIO)
#else #else
static uint8_t PhasorIO(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft) static uint8_t PhasorIO(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, unsigned long nCyclesLeft)
#endif #endif
{ {
if(!g_bPhasorEnable) if(!g_bPhasorEnable)
@ -1891,7 +1891,7 @@ void mb_io_initialize(unsigned int slot4, unsigned int slot5)
MB_InitializeIO(NULL, slot4, slot5); MB_InitializeIO(NULL, slot4, slot5);
} }
//typedef uint8_t (*iofunction)(uint16_t nPC, uint16_t nAddr, uint8_t nWriteFlag, uint8_t nWriteValue, ULONG nCyclesLeft); //typedef uint8_t (*iofunction)(uint16_t nPC, uint16_t nAddr, uint8_t nWriteFlag, uint8_t nWriteValue, unsigned long nCyclesLeft);
typedef void (*iofunction)(); typedef void (*iofunction)();
static void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWriteC0, iofunction IOReadCx, iofunction IOWriteCx, LPVOID unused_lpSlotParameter, uint8_t* unused_pExpansionRom) static void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWriteC0, iofunction IOReadCx, iofunction IOWriteCx, LPVOID unused_lpSlotParameter, uint8_t* unused_pExpansionRom)
{ {

4
src/audio/win-shim.h
View File

@ -25,10 +25,6 @@
// 2013/09/19 - http://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx // 2013/09/19 - http://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx
#ifdef __APPLE__
typedef UInt32 ULONG;
#endif
typedef unsigned long ULONG;
typedef long LONG; typedef long LONG;
typedef unsigned int UINT; typedef unsigned int UINT;
typedef char TCHAR; typedef char TCHAR;