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

Four files had been misplaced in the Core project. I moved them back to their folder. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1177 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2008-11-14 19:12:11 +00:00
parent 355e570193
commit dc123aeebf
4 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Core/Core/Core.vcproj
View File

@ -1107,10 +1107,18 @@
RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h" RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h"
> >
</File> </File>
<File
RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp"
>
</File>
<File <File
RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.h" RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.h"
> >
</File> </File>
<File
RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp"
>
</File>
<File <File
RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.h" RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.h"
> >
@ -1143,6 +1151,14 @@
RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_WiiMote.h" RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_WiiMote.h"
> >
</File> </File>
<File
RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.cpp"
>
</File>
<File
RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Boot" Name="Boot"
@ -1348,22 +1364,6 @@
RelativePath=".\Src\VolumeHandler.h" RelativePath=".\Src\VolumeHandler.h"
> >
</File> </File>
<File
RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp"
>
</File>
<File
RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp"
>
</File>
<File
RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.cpp"
>
</File>
<File
RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.h"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

3
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
View File

@ -68,6 +68,8 @@ CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress)
bool bool
CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
{ {
LOG(WII_IPC_FILEIO, "FileIO::Open=======================================================");
u32 ReturnValue = 0; u32 ReturnValue = 0;
const char Modes[][128] = const char Modes[][128] =
@ -108,6 +110,7 @@ CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
} }
Memory::Write_U32(ReturnValue, _CommandAddress+4); Memory::Write_U32(ReturnValue, _CommandAddress+4);
LOG(WII_IPC_FILEIO, "===================================================================");
return true; return true;
} }

5
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View File

@ -354,6 +354,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B
case CREATE_FILE: case CREATE_FILE:
{ {
LOGV(WII_IPC_FILEIO, 0, "==============================================================");
_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0); _dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
u32 Addr = _BufferIn; u32 Addr = _BufferIn;
@ -367,7 +368,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B
u8 OtherPerm = Memory::Read_U8(Addr); Addr++; u8 OtherPerm = Memory::Read_U8(Addr); Addr++;
u8 Attributes = Memory::Read_U8(Addr); Addr++; u8 Attributes = Memory::Read_U8(Addr); Addr++;
LOG(WII_IPC_FILEIO, "FS: CreateFile %s", Filename.c_str()); LOGV(WII_IPC_FILEIO, 0, "FS: CreateFile %s", Filename.c_str());
LOG(WII_IPC_FILEIO, " OwnerID: 0x08%x", OwnerID); LOG(WII_IPC_FILEIO, " OwnerID: 0x08%x", OwnerID);
LOG(WII_IPC_FILEIO, " GroupID: 0x04%x", GroupID); LOG(WII_IPC_FILEIO, " GroupID: 0x04%x", GroupID);
LOG(WII_IPC_FILEIO, " OwnerPerm: 0x02%x", OwnerPerm); LOG(WII_IPC_FILEIO, " OwnerPerm: 0x02%x", OwnerPerm);
@ -400,7 +401,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B
PanicAlert("CWII_IPC_HLE_Device_fs::IOCtl: ni 0x%x", _Parameter); PanicAlert("CWII_IPC_HLE_Device_fs::IOCtl: ni 0x%x", _Parameter);
break; break;
} }
LOGV(WII_IPC_FILEIO, 0, "==============================================================");
return FS_RESULT_FATAL; return FS_RESULT_FATAL;
} }

4
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
View File

@ -293,6 +293,10 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer,
} }
// ================================================
// Voice hacks
// --------------
template<class ParamBlockType> template<class ParamBlockType>
inline void DoVoiceHacks(ParamBlockType &pb) inline void DoVoiceHacks(ParamBlockType &pb)
{ {