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

Build fixing plus some cleanup i had been doing

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6969 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2011-01-29 15:58:50 +00:00
parent a22d807bf0
commit 1f8a1f8560
16 changed files with 203 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,6 @@
#include <iostream>
#include "DSPHLEGlobals.h" // Local
#include "ChunkFile.h"
#include "IniFile.h"
#include "HLEMixer.h"

1
Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
View File

@ -20,7 +20,6 @@
#include "AudioCommon.h"
#include "SoundStream.h"
#include "DSPHLEGlobals.h" // Local
#include "MailHandler.h"
#include "../../PluginDSP.h"

51
Source/Core/Core/Src/HW/DSPHLE/DSPHLEGlobals.h
View File

@ -1,51 +0,0 @@
// Copyright (C) 2003 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
// TODO: Get rid of this file.
#ifndef _GLOBALS_H
#define _GLOBALS_H
#include "Common.h"
#include "StringUtil.h"
#include "../Memmap.h"
inline u8 HLEMemory_Read_U8(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Memory::m_pRAM[_uAddress];
}
inline u16 HLEMemory_Read_U16(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Common::swap16(*(u16*)&Memory::m_pRAM[_uAddress]);
}
inline u32 HLEMemory_Read_U32(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Common::swap32(*(u32*)&Memory::m_pRAM[_uAddress]);
}
inline void* HLEMemory_Get_Pointer(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return &Memory::m_pRAM[_uAddress];
}
#endif

1
Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "DSPHLEGlobals.h"
#include "DSPHLE.h"
#include "HLEMixer.h"
#include "UCodes/UCodes.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
View File

@ -19,7 +19,6 @@
#include "StringUtil.h" // For StringFromFormat()
#include <sstream>
#include "../DSPHLEGlobals.h"
#include "Mixer.h"
#include "../MailHandler.h"
#include "../../DSP.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h
View File

@ -18,7 +18,6 @@
#ifndef _UCODE_AX_ADPCM_H
#define _UCODE_AX_ADPCM_H
#include "../DSPHLEGlobals.h"
#include "../../DSP.h"
inline s16 ADPCM_Step(PBADPCMInfo &adpcm, u32& samplePos, u32 newSamplePos, u16 frac)

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "../DSPHLE.h"
#include "UCodes.h"
#include "UCode_CARD.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "UCodes.h"
#include "UCode_GBA.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "UCodes.h"
#include "UCode_InitAudioSystem.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "UCodes.h"
#include "UCode_ROM.h"
#include "Hash.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
View File

@ -19,7 +19,6 @@
// Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess,
// Super Mario Galaxy
#include "../DSPHLEGlobals.h"
#include "UCodes.h"
#include "UCode_Zelda.h"
#include "../MailHandler.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
View File

@ -17,7 +17,6 @@
#include <math.h>
#include "../DSPHLEGlobals.h"
#include "UCodes.h"
#include "UCode_Zelda.h"
#include "AudioCommon.h"

2
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
View File

@ -17,11 +17,9 @@
#include <sstream>
#include "../DSPHLEGlobals.h"
#include "UCodes.h"
#include "UCode_Zelda.h"
// #include "../main.h"
#include "AudioCommon.h"
#include "Mixer.h"
#include "../../Memmap.h"

2
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "UCodes.h"
#include "UCode_AX.h"

25
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h
View File

@ -23,12 +23,37 @@
#include "Thread.h"
#include "../DSPHLE.h"
#include "../../Memmap.h"
#define UCODE_ROM 0x0000000
#define UCODE_INIT_AUDIO_SYSTEM 0x0000001
class CMailHandler;
inline u8 HLEMemory_Read_U8(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Memory::m_pRAM[_uAddress];
}
inline u16 HLEMemory_Read_U16(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Common::swap16(*(u16*)&Memory::m_pRAM[_uAddress]);
}
inline u32 HLEMemory_Read_U32(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Common::swap32(*(u32*)&Memory::m_pRAM[_uAddress]);
}
inline void* HLEMemory_Get_Pointer(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return &Memory::m_pRAM[_uAddress];
}
class IUCode
{
public: