piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replaced type "BYTE" by "u8", except where "BYTE" is used to access the Windows API.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@408 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne
2008-08-31 14:32:35 +00:00
parent 965fd33f16
commit 0bebbcb5f4
17 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/Src/DolLoader.h
View File

@ -20,6 +20,8 @@
#pragma once #pragma once
#include "Common.h"
///////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////
// C L A S S///////////////////////////////////////////////////////////////////////////////////////// // C L A S S/////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////
@ -48,7 +50,7 @@ public:
{ {
if(m_dolheader.textOffset[i] != 0) if(m_dolheader.textOffset[i] != 0)
{ {
BYTE* pTemp = new BYTE[m_dolheader.textSize[i]]; u8* pTemp = new u8[m_dolheader.textSize[i]];
fseek(pStream, m_dolheader.textOffset[i], SEEK_SET); fseek(pStream, m_dolheader.textOffset[i], SEEK_SET);
fread(pTemp, 1, m_dolheader.textSize[i], pStream); fread(pTemp, 1, m_dolheader.textSize[i], pStream);
@ -65,7 +67,7 @@ public:
{ {
if(m_dolheader.dataOffset[i] != 0) if(m_dolheader.dataOffset[i] != 0)
{ {
BYTE* pTemp = new BYTE[m_dolheader.dataSize[i]]; u8* pTemp = new u8[m_dolheader.dataSize[i]];
fseek(pStream, m_dolheader.dataOffset[i], SEEK_SET); fseek(pStream, m_dolheader.dataOffset[i], SEEK_SET);
fread(pTemp, 1, m_dolheader.dataSize[i], pStream); fread(pTemp, 1, m_dolheader.dataSize[i], pStream);

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

@ -33,8 +33,8 @@ typedef void (__cdecl* TDllAbout)(HWND);
typedef void (__cdecl* TDllConfig)(HWND); typedef void (__cdecl* TDllConfig)(HWND);
typedef void (__cdecl* TPAD_Initialize)(SPADInitialize); typedef void (__cdecl* TPAD_Initialize)(SPADInitialize);
typedef void (__cdecl* TPAD_Shutdown)(); typedef void (__cdecl* TPAD_Shutdown)();
typedef void (__cdecl* TPAD_GetStatus)(BYTE, SPADStatus*); typedef void (__cdecl* TPAD_GetStatus)(u8, SPADStatus*);
typedef void (__cdecl* TPAD_Rumble)(BYTE, unsigned int, unsigned int); typedef void (__cdecl* TPAD_Rumble)(u8, unsigned int, unsigned int);
typedef unsigned int (__cdecl* TPAD_GetAttachedPads)(); typedef unsigned int (__cdecl* TPAD_GetAttachedPads)();
// Function Pointers // Function Pointers

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

@ -37,8 +37,8 @@ typedef void (__cdecl* TDllConfig)(HWND);
typedef void (__cdecl* TVideo_Initialize)(SVideoInitialize*); typedef void (__cdecl* TVideo_Initialize)(SVideoInitialize*);
typedef void (__cdecl* TVideo_Prepare)(); typedef void (__cdecl* TVideo_Prepare)();
typedef void (__cdecl* TVideo_Shutdown)(); typedef void (__cdecl* TVideo_Shutdown)();
typedef void (__cdecl* TVideo_SendFifoData)(BYTE*); typedef void (__cdecl* TVideo_SendFifoData)(u8*);
typedef void (__cdecl* TVideo_UpdateXFB)(BYTE*, DWORD, DWORD); typedef void (__cdecl* TVideo_UpdateXFB)(u8*, DWORD, DWORD);
typedef BOOL (__cdecl* TVideo_Screenshot)(TCHAR*); typedef BOOL (__cdecl* TVideo_Screenshot)(TCHAR*);
typedef void (__cdecl* TVideo_EnterLoop)(); typedef void (__cdecl* TVideo_EnterLoop)();
typedef void (__cdecl* TVideo_AddMessage)(const char* pstr, unsigned int milliseconds); typedef void (__cdecl* TVideo_AddMessage)(const char* pstr, unsigned int milliseconds);

2
Source/Core/VideoCommon/Src/Fifo.cpp
View File

@ -102,7 +102,7 @@ void FAKE_SkipFifo(u32 skip)
readptr += skip; readptr += skip;
} }
void Video_SendFifoData(BYTE *_uData) void Video_SendFifoData(u8* _uData)
{ {
memcpy(videoBuffer + size, _uData, 32); memcpy(videoBuffer + size, _uData, 32);
size += 32; size += 32;

1
Source/PluginSpecs/CommonTypes.h
View File

@ -41,7 +41,6 @@ typedef signed __int64 s64;
#else #else
typedef unsigned char u8; typedef unsigned char u8;
typedef unsigned char BYTE;
typedef unsigned short u16; typedef unsigned short u16;
typedef unsigned int u32; typedef unsigned int u32;
typedef unsigned int BOOL; typedef unsigned int BOOL;

6
Source/PluginSpecs/PluginSpecs.h
View File

@ -5,6 +5,8 @@
#ifndef _PLUGINS_H_INCLUDED__ #ifndef _PLUGINS_H_INCLUDED__
#define _PLUGINS_H_INCLUDED__ #define _PLUGINS_H_INCLUDED__
#include "CommonTypes.h"
#ifdef _WIN32 #ifdef _WIN32
#define EXPORT __declspec(dllexport) #define EXPORT __declspec(dllexport)
#define CALL __cdecl #define CALL __cdecl
@ -29,14 +31,12 @@
// simulate something that looks like win32 // simulate something that looks like win32
// long term, kill these // long term, kill these
// glxew defines BOOL and BYTE. evil. // glxew defines BOOL. evil.
#ifdef BOOL #ifdef BOOL
#undef BOOL #undef BOOL
#undef BYTE
#endif #endif
#define BOOL unsigned int #define BOOL unsigned int
#define BYTE unsigned char
#define WORD unsigned short #define WORD unsigned short
#define DWORD unsigned int #define DWORD unsigned int
#define HWND void* #define HWND void*

4
Source/PluginSpecs/pluginspecs_pad.h
View File

@ -105,7 +105,7 @@ EXPORT void CALL PAD_Shutdown();
// input: // input:
// output: // output:
// //
EXPORT void CALL PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus); EXPORT void CALL PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus);
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// Function: PAD_Rumble // Function: PAD_Rumble
@ -113,7 +113,7 @@ EXPORT void CALL PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus);
// input: PAD number, Command type (Stop=0, Rumble=1, Stop Hard=2) and strength of Rumble // input: PAD number, Command type (Stop=0, Rumble=1, Stop Hard=2) and strength of Rumble
// output: none // output: none
// //
EXPORT void CALL PAD_Rumble(BYTE _numPAD, unsigned int _uType, unsigned int _uStrength); EXPORT void CALL PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength);
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// Function: PAD_GetAttachedPads // Function: PAD_GetAttachedPads

4
Source/PluginSpecs/pluginspecs_video.h
View File

@ -132,7 +132,7 @@ EXPORT void CALL Video_Shutdown(void);
// input: a data-byte (i know we have to optimize this ;-)) // input: a data-byte (i know we have to optimize this ;-))
// output: none // output: none
// //
EXPORT void CALL Video_SendFifoData(BYTE *_uData); EXPORT void CALL Video_SendFifoData(u8* _uData);
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// Function: Video_UpdateXFB // Function: Video_UpdateXFB
@ -142,7 +142,7 @@ EXPORT void CALL Video_SendFifoData(BYTE *_uData);
// input: pointer to the XFB, width and height of the XFB // input: pointer to the XFB, width and height of the XFB
// output: none // output: none
// //
EXPORT void CALL Video_UpdateXFB(BYTE* _pXFB, DWORD _dwWidth, DWORD _dwHeight); EXPORT void CALL Video_UpdateXFB(u8* _pXFB, DWORD _dwWidth, DWORD _dwHeight);
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// Function: Video_Screenshot // Function: Video_Screenshot

4
Source/Plugins/Plugin_PadDX9/Src/main.cpp
View File

@ -124,7 +124,7 @@ void PAD_Shutdown(void)
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// PADGetStatus // PADGetStatus
// //
void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus) void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
{ {
// check if all is okay // check if all is okay
if ((_numPAD != 0) || // we support just pad 0 if ((_numPAD != 0) || // we support just pad 0
@ -187,6 +187,6 @@ void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus)
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// PAD_Rumble // PAD_Rumble
// //
void PAD_Rumble(BYTE _numPAD, unsigned int _uType, unsigned int _uStrength) void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
{ {
} }

4
Source/Plugins/Plugin_PadSimple/Src/main.cpp
View File

@ -521,7 +521,7 @@ unsigned int PAD_GetAttachedPads()
connected |= 1; connected |= 1;
return connected; return connected;
} }
void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus) void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
{ {
// check if all is okay // check if all is okay
if ((_pPADStatus == NULL)) if ((_pPADStatus == NULL))
@ -568,7 +568,7 @@ void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus)
// Rough approximation of GC behaviour - needs improvement. // Rough approximation of GC behaviour - needs improvement.
void PAD_Rumble(BYTE _numPAD, unsigned int _uType, unsigned int _uStrength) void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
{ {
#ifdef _WIN32 #ifdef _WIN32
static int a = 0; static int a = 0;

2
Source/Plugins/Plugin_VideoDX9/Src/VertexLoader_Normal.cpp
View File

@ -8,7 +8,7 @@
#include "VertexLoader.h" #include "VertexLoader.h"
#include "VertexLoader_Normal.h" #include "VertexLoader_Normal.h"
BYTE VertexLoader_Normal::m_sizeTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS]; u8 VertexLoader_Normal::m_sizeTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS];
TPipelineFunction VertexLoader_Normal::m_funcTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS]; TPipelineFunction VertexLoader_Normal::m_funcTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS];
bool VertexLoader_Normal::index3; bool VertexLoader_Normal::index3;

4
Source/Plugins/Plugin_VideoDX9/Src/VertexLoader_Normal.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include "CommonTypes.h"
class VertexLoader_Normal class VertexLoader_Normal
{ {
public: public:
@ -46,7 +48,7 @@ private:
}; };
// tables // tables
static BYTE m_sizeTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS]; static u8 m_sizeTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS];
static TPipelineFunction m_funcTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS]; static TPipelineFunction m_funcTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS];
// direct // direct

2
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -202,7 +202,7 @@ void Video_Shutdown(void)
DeInit(); DeInit();
} }
void Video_UpdateXFB(BYTE* /*_pXFB*/, DWORD /*_dwWidth*/, DWORD /*_dwHeight*/) void Video_UpdateXFB(u8* /*_pXFB*/, DWORD /*_dwWidth*/, DWORD /*_dwHeight*/)
{ {
/* /*
ConvertXFB(tempBuffer, _pXFB, _dwWidth, _dwHeight); ConvertXFB(tempBuffer, _pXFB, _dwWidth, _dwHeight);

2
Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.cpp
View File

@ -26,7 +26,7 @@
#define LOG_NORM16() PRIM_LOG("norm: %f %f %f, ", ((s16*)VertexManager::s_pCurBufferPointer)[-3]/32767.0f, ((s16*)VertexManager::s_pCurBufferPointer)[-2]/32767.0f, ((s16*)VertexManager::s_pCurBufferPointer)[-1]/32767.0f); #define LOG_NORM16() PRIM_LOG("norm: %f %f %f, ", ((s16*)VertexManager::s_pCurBufferPointer)[-3]/32767.0f, ((s16*)VertexManager::s_pCurBufferPointer)[-2]/32767.0f, ((s16*)VertexManager::s_pCurBufferPointer)[-1]/32767.0f);
#define LOG_NORMF() PRIM_LOG("norm: %f %f %f, ", ((float*)VertexManager::s_pCurBufferPointer)[-3], ((float*)VertexManager::s_pCurBufferPointer)[-2], ((float*)VertexManager::s_pCurBufferPointer)[-1]); #define LOG_NORMF() PRIM_LOG("norm: %f %f %f, ", ((float*)VertexManager::s_pCurBufferPointer)[-3], ((float*)VertexManager::s_pCurBufferPointer)[-2], ((float*)VertexManager::s_pCurBufferPointer)[-1]);
BYTE VertexLoader_Normal::m_sizeTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS]; u8 VertexLoader_Normal::m_sizeTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS];
TPipelineFunction VertexLoader_Normal::m_funcTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS]; TPipelineFunction VertexLoader_Normal::m_funcTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS];
bool VertexLoader_Normal::index3; bool VertexLoader_Normal::index3;

4
Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.h
View File

@ -18,6 +18,8 @@
#ifndef _VERTEXLOADER_NORMAL_H #ifndef _VERTEXLOADER_NORMAL_H
#define _VERTEXLOADER_NORMAL_H #define _VERTEXLOADER_NORMAL_H
#include "CommonTypes.h"
class VertexLoader_Normal class VertexLoader_Normal
{ {
public: public:
@ -60,7 +62,7 @@ private:
}; };
// tables // tables
static BYTE m_sizeTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS]; static u8 m_sizeTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS];
static TPipelineFunction m_funcTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS]; static TPipelineFunction m_funcTable[NUM_NRM_TYPE][NUM_NRM_FORMAT][NUM_NRM_ELEMENTS];
// direct // direct

2
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -274,7 +274,7 @@ BOOL Video_Screenshot(TCHAR* _szFilename)
} }
void Video_UpdateXFB(BYTE* _pXFB, DWORD _dwWidth, DWORD _dwHeight) void Video_UpdateXFB(u8* _pXFB, DWORD _dwWidth, DWORD _dwHeight)
{ {
} }

4
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -304,7 +304,7 @@ void PAD_Shutdown()
// Set PAD status // Set PAD status
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus) void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
{ {
if(!joysticks[_numPAD].enabled) if(!joysticks[_numPAD].enabled)
return; return;
@ -474,7 +474,7 @@ void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus)
// Set PAD rumble // Set PAD rumble
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// (Stop=0, Rumble=1) // (Stop=0, Rumble=1)
void PAD_Rumble(BYTE _numPAD, unsigned int _uType, unsigned int _uStrength) void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
{ {
//if(_numPAD > 0) //if(_numPAD > 0)
// return; // return;