mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 03:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced "unsigned __int32" by "u32".

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@432 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-09-02 23:44:54 +00:00
parent 36b464cbc8
commit 6e2416b389
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/AudioInterface.cpp
View File

@ -257,7 +257,7 @@ void GenerateAudioInterrupt()
// Callback for the disc streaming // Callback for the disc streaming
// WARNING - called from audio thread // WARNING - called from audio thread
unsigned __int32 Callback_GetStreaming(short* _pDestBuffer, unsigned __int32 _numSamples) u32 Callback_GetStreaming(short* _pDestBuffer, u32 _numSamples)
{ {
if (g_AudioRegister.m_Control.PSTAT && !CCPU::IsStepping()) if (g_AudioRegister.m_Control.PSTAT && !CCPU::IsStepping())
{ {

5
Source/Core/Core/Src/HW/AudioInterface.h
View File

@ -20,6 +20,8 @@
#ifndef _AUDIOINTERFACE_H #ifndef _AUDIOINTERFACE_H
#define _AUDIOINTERFACE_H #define _AUDIOINTERFACE_H
#include "CommonTypes.h"
class PointerWrap; class PointerWrap;
namespace AudioInterface namespace AudioInterface
@ -32,7 +34,7 @@ void DoState(PointerWrap &p);
void Update(); void Update();
// Calls by DSP plugin // Calls by DSP plugin
unsigned __int32 Callback_GetStreaming(short* _pDestBuffer, unsigned __int32 _numSamples); u32 Callback_GetStreaming(short* _pDestBuffer, u32 _numSamples);
void HWCALL Read32(u32& _uReturnValue, const u32 _iAddress); void HWCALL Read32(u32& _uReturnValue, const u32 _iAddress);
void HWCALL Write32(const u32 _iValue, const u32 _iAddress); void HWCALL Write32(const u32 _iValue, const u32 _iAddress);
@ -44,4 +46,3 @@ u32 GetDSPSampleRate();
} // namespace } // namespace
#endif #endif

4
Source/Core/Core/Src/Plugins/Plugin_DVD.cpp
View File

@ -32,7 +32,7 @@ typedef void (__cdecl* TDVD_SetISOFile) (const char*);
typedef BOOL (__cdecl* TDVD_GetISOName) (TCHAR*, int); typedef BOOL (__cdecl* TDVD_GetISOName) (TCHAR*, int);
typedef BOOL (__cdecl* TDVD_ReadToPtr) (LPBYTE, unsigned __int64, unsigned __int64); typedef BOOL (__cdecl* TDVD_ReadToPtr) (LPBYTE, unsigned __int64, unsigned __int64);
typedef BOOL (__cdecl* TDVD_IsValid) (); typedef BOOL (__cdecl* TDVD_IsValid) ();
typedef unsigned __int32 (__cdecl* TDVD_Read32) (unsigned __int64); typedef u32 (__cdecl* TDVD_Read32) (unsigned __int64);
//! Function Pointer //! Function Pointer
TGetDllInfo g_GetDllInfo = NULL; TGetDllInfo g_GetDllInfo = NULL;
@ -155,7 +155,7 @@ bool DVD_IsValid()
return (g_DVD_IsValid() == TRUE) ? true : false; return (g_DVD_IsValid() == TRUE) ? true : false;
} }
unsigned __int32 DVD_Read32(unsigned __int64 _dwOffset) u32 DVD_Read32(unsigned __int64 _dwOffset)
{ {
return g_DVD_Read32(_dwOffset); return g_DVD_Read32(_dwOffset);
} }

4
Source/Core/Core/Src/Plugins/Plugin_DVD.h
View File

@ -64,10 +64,10 @@ bool DVD_ReadToPtr(LPBYTE ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwL
bool DVD_IsValid(); bool DVD_IsValid();
//! DVDRead32 //! DVDRead32
unsigned __int32 DVD_Read32(unsigned __int64 _dwOffset); u32 DVD_Read32(unsigned __int64 _dwOffset);
//! SaveLoadState //! SaveLoadState
unsigned __int32 SaveLoadState(char *ptr, BOOL save); u32 SaveLoadState(char *ptr, BOOL save);
} // end of namespace PluginDVD } // end of namespace PluginDVD

1
Source/PluginSpecs/CommonTypes.h
View File

@ -49,7 +49,6 @@ typedef unsigned long long u64;
typedef char s8; typedef char s8;
typedef short s16; typedef short s16;
typedef int s32; typedef int s32;
#define __int32 int
typedef long long s64; typedef long long s64;
#define __int64 long long #define __int64 long long