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

Added SYSCONF files. Fixed the return value of FileIO::Read(). 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@281 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
masken 2008-08-23 14:53:33 +00:00
parent d697eb6a85
commit 0849a96d81
8 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Binary/win32/WII/shared2/sys/SYSCONF Normal file
View File

Binary file not shown.

1
Binary/win32/WII/shared2/sys/readme.txt Normal file
View File

@ -0,0 +1 @@
This SYSCONF file describes a single registered Wiimote, with the Bluetooth address used by Dolphin.

BIN
Binary/win32/WII/title/00000001/00000002/data/setting.txt Normal file
View File

Binary file not shown.

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -209,7 +209,7 @@ void ExecuteCommand(u32 _Address)
// HLE - Create a new HLE device
std::string DeviceName;
Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC));
u32 Mode = (DeviceName, Memory::Read_U32(_Address+0x10));
u32 Mode = Memory::Read_U32(_Address+0x10);
u32 DeviceID = GetDeviceIDByName(DeviceName);
if (DeviceID == 0)

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

@ -62,7 +62,7 @@ CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress)
}
else
{
PanicAlert("CWII_IPC_HLE_Device_FileIO: cant open %s", Filename.c_str());
//PanicAlert("CWII_IPC_HLE_Device_FileIO: cant open %s", Filename.c_str());
}
Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
@ -97,7 +97,7 @@ CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
if (m_pFileHandle != NULL)
{
fread(Memory::GetPointer(Address), Size, 1, m_pFileHandle);
ReturnValue = 1;
ReturnValue = Size;
LOG(WII_IPC_HLE, "FileIO reads from %s (Addr=0x%08x Size=0x%x)", GetDeviceName().c_str(), Address, Size);
}
else
@ -118,7 +118,7 @@ CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress)
LOG(WII_IPC_HLE, "FileIO: Write (Device=%s)", GetDeviceName().c_str());
DumpCommands(_CommandAddress);
PanicAlert("CWII_IPC_HLE_Device_FileIO: Write (Device=%s)", GetDeviceName().c_str());
//PanicAlert("CWII_IPC_HLE_Device_FileIO: Write (Device=%s)", GetDeviceName().c_str());
u32 ReturnValue = 1;
Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);

9
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h
View File

@ -35,6 +35,15 @@ public:
Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
return true;
}
#if 0
virtual bool Close(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s is not able to run Close()", m_Name.c_str()); return true; }
virtual bool Seek(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s is not able to run Seek()", m_Name.c_str()); return true; }
virtual bool Read(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s is not able to run Read()", m_Name.c_str()); return true; }
virtual bool Write(u32 _CommandAddress) { _dbg_assert_msg_(WII_IPC_HLE, 0, "%s is not able to run Write()", m_Name.c_str()); return true; }
#endif
virtual bool IOCtl(u32 _CommandAddress) { return true; }
virtual bool IOCtlV(u32 _CommandAddress) { return true; }
};
#endif

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

@ -48,6 +48,11 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::Open(u32 _CommandAddress)
return true;
}
bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtl(u32 _CommandAddress)
{
return IOCtlV(_CommandAddress); //hack
}
bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress)
{
// wpadsampled.elf - patch so the USB_LOG will print somehting

1
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
View File

@ -52,6 +52,7 @@ public:
virtual bool Open(u32 _CommandAddress);
virtual bool IOCtlV(u32 _CommandAddress);
virtual bool IOCtl(u32 _CommandAddress);
virtual u32 Update();