ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced "unsigned __int16" by "u16". 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@431 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-09-02 23:32:05 +00:00
parent 179752449d
commit 36b464cbc8
4 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
// SetToken // SetToken
// THIS IS EXECUTED FROM VIDEO THREAD // THIS IS EXECUTED FROM VIDEO THREAD
void SetToken(const unsigned __int16 _token, const int _bSetTokenAcknowledge) void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
{ {
CoreTiming::ScheduleEvent_Threadsafe( CoreTiming::ScheduleEvent_Threadsafe(
0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16)); 0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16));

4
Source/Core/Core/Src/HW/PixelEngine.h
View File

@ -17,7 +17,7 @@
#ifndef _PIXELENGINE_H #ifndef _PIXELENGINE_H
#define _PIXELENGINE_H #define _PIXELENGINE_H
#include "Common.h" #include "CommonTypes.h"
class PointerWrap; class PointerWrap;
namespace PixelEngine namespace PixelEngine
@ -33,7 +33,7 @@ void HWCALL Write16(const u16 _iValue, const u32 _iAddress);
void HWCALL Write32(const u32 _iValue, const u32 _iAddress); void HWCALL Write32(const u32 _iValue, const u32 _iAddress);
// gfx plugin support // gfx plugin support
void SetToken(const unsigned __int16 _token, const int _bSetTokenAcknowledge); void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
void SetFinish(void); void SetFinish(void);
bool AllowIdleSkipping(); bool AllowIdleSkipping();

1
Source/PluginSpecs/CommonTypes.h
View File

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

42
Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
View File

@ -16,6 +16,7 @@
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "Globals.h" #include "Globals.h"
#include "CommonTypes.h"
#include "gdsp_interpreter.h" #include "gdsp_interpreter.h"
#include "gdsp_interface.h" #include "gdsp_interface.h"
@ -32,7 +33,6 @@ CDisAsmDlg g_Dialog;
#else #else
#define WINAPI #define WINAPI
#define LPVOID void* #define LPVOID void*
#define __int16 short;
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -220,30 +220,18 @@ void DSP_Shutdown(void)
} }
} }
#ifdef _WIN32 u16 DSP_WriteControlRegister(u16 _uFlag)
unsigned __int16 DSP_WriteControlRegister(unsigned __int16 _uFlag)
#else
short unsigned int DSP_WriteControlRegister(short _uFlag)
#endif
{ {
gdsp_write_cr(_uFlag); gdsp_write_cr(_uFlag);
return(gdsp_read_cr()); return(gdsp_read_cr());
} }
#ifdef _WIN32 u16 DSP_ReadControlRegister()
unsigned __int16 DSP_ReadControlRegister()
#else
short unsigned int DSP_ReadControlRegister()
#endif
{ {
return(gdsp_read_cr()); return(gdsp_read_cr());
} }
#ifdef _WIN32 u16 DSP_ReadMailboxHigh(bool _CPUMailbox)
unsigned __int16 DSP_ReadMailboxHigh(bool _CPUMailbox)
#else
short unsigned int DSP_ReadMailboxHigh(bool _CPUMailbox)
#endif
{ {
if (_CPUMailbox) if (_CPUMailbox)
{ {
@ -255,11 +243,7 @@ short unsigned int DSP_ReadMailboxHigh(bool _CPUMailbox)
} }
} }
#ifdef _WIN32 u16 DSP_ReadMailboxLow(bool _CPUMailbox)
unsigned __int16 DSP_ReadMailboxLow(bool _CPUMailbox)
#else
short unsigned int DSP_ReadMailboxLow(bool _CPUMailbox)
#endif
{ {
if (_CPUMailbox) if (_CPUMailbox)
{ {
@ -271,11 +255,7 @@ short unsigned int DSP_ReadMailboxLow(bool _CPUMailbox)
} }
} }
#ifdef _WIN32 void DSP_WriteMailboxHigh(bool _CPUMailbox, u16 _uHighMail)
void DSP_WriteMailboxHigh(bool _CPUMailbox, unsigned __int16 _uHighMail)
#else
void DSP_WriteMailboxHigh(bool _CPUMailbox, short unsigned int _uHighMail)
#endif
{ {
if (_CPUMailbox) if (_CPUMailbox)
{ {
@ -292,11 +272,7 @@ void DSP_WriteMailboxHigh(bool _CPUMailbox, short unsigned int _uHighMail)
} }
} }
#ifdef _WIN32 void DSP_WriteMailboxLow(bool _CPUMailbox, u16 _uLowMail)
void DSP_WriteMailboxLow(bool _CPUMailbox, unsigned __int16 _uLowMail)
#else
void DSP_WriteMailboxLow(bool _CPUMailbox, short unsigned int _uLowMail)
#endif
{ {
if (_CPUMailbox) if (_CPUMailbox)
{ {
@ -325,11 +301,7 @@ void DSP_Update(int cycles)
#endif #endif
} }
#ifdef _WIN32
void DSP_SendAIBuffer(unsigned int address, int sample_rate) void DSP_SendAIBuffer(unsigned int address, int sample_rate)
#else
void DSP_SendAIBuffer(unsigned int address, int sample_rate)
#endif
{ {
// uint32 Size = _Size * 16 * 2; // 16bit per sample, two channels // uint32 Size = _Size * 16 * 2; // 16bit per sample, two channels