Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-01-23 06:16:12 +00:00
Code Issues Projects Releases Wiki Activity

Replace DWORD -> uint32_t. (PR #1350)

Browse Source 
Some have been left where tightly coupled with the Win32 API.
This commit is contained in:
Andrea
2024-12-21 12:32:00 +00:00
committed by GitHub
parent 44babe9814
commit 35f176e4d8
69 changed files with 319 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/Memory.cpp
View File

@@ -225,7 +225,7 @@ static LPBYTE pCxRomPeripheral = NULL;
static LPBYTE g_pMemMainLanguageCard = NULL;
static DWORD g_memmode = LanguageCardUnit::kMemModeInitialState;
static uint32_t g_memmode = LanguageCardUnit::kMemModeInitialState;
static BOOL modechanging = 0; // An Optimisation: means delay calling UpdatePaging() for 1 instruction
static UINT memrompages = 1;
@@ -1085,16 +1085,16 @@ static bool IsCardInSlot(UINT slot)
//===========================================================================
DWORD GetMemMode(void)
uint32_t GetMemMode(void)
{
return g_memmode;
}
void SetMemMode(DWORD uNewMemMode)
void SetMemMode(uint32_t uNewMemMode)
{
#if defined(_DEBUG) && 0
static DWORD dwOldDiff = 0;
DWORD dwDiff = g_memmode ^ uNewMemMode;
static uint32_t dwOldDiff = 0;
uint32_t dwDiff = g_memmode ^ uNewMemMode;
dwDiff &= ~(MF_SLOTC3ROM | MF_INTCXROM);
if (dwOldDiff != dwDiff)
{
@@ -1947,7 +1947,7 @@ void MemInitializeFromSnapshot(void)
}
}
inline DWORD getRandomTime()
inline uint32_t getRandomTime()
{
return rand() ^ timeGetTime(); // We can't use g_nCumulativeCycles as it will be zero on a fresh execution.
}
@@ -1988,7 +1988,7 @@ void MemReset()
// F2. Ctrl-F2. CALL-151, C050 C053 C057
// OR
// F2, Ctrl-F2, F7, HGR
DWORD randTime = getRandomTime();
uint32_t randTime = getRandomTime();
MemoryInitPattern_e eMemoryInitPattern = static_cast<MemoryInitPattern_e>(g_nMemoryClearType);
if (g_nMemoryClearType < 0) // random
@@ -2168,7 +2168,7 @@ static void DebugFlip(WORD address, ULONG nExecutedCycles)
BYTE __stdcall MemSetPaging(WORD programcounter, WORD address, BYTE write, BYTE value, ULONG nExecutedCycles)
{
address &= 0xFF;
DWORD lastmemmode = g_memmode;
uint32_t lastmemmode = g_memmode;
#if defined(_DEBUG) && defined(DEBUG_FLIP_TIMINGS)
DebugFlip(address, nExecutedCycles);
#endif