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

Merge branch 'master' into wii-usb

This commit is contained in:
Matthew Parlane 2012-12-31 01:09:27 +13:00
parent 510e08370e 71bb297f2c
commit 200cabc4a5
8 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,7 +290,7 @@ bool CEXIETHERNET::IsWriteCommand(u32 const data)
return IsMXCommand(data) ? !!(data & (1 << 30)) : !!(data & (1 << 14)); return IsMXCommand(data) ? !!(data & (1 << 30)) : !!(data & (1 << 14));
} }
char const * const CEXIETHERNET::GetRegisterName() const const char* CEXIETHERNET::GetRegisterName() const
{ {
#define STR_RETURN(x) case x: return #x; #define STR_RETURN(x) case x: return #x;

2
Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
View File

@ -297,7 +297,7 @@ public:
bool IsMXCommand(u32 const data); bool IsMXCommand(u32 const data);
bool IsWriteCommand(u32 const data); bool IsWriteCommand(u32 const data);
char const * const GetRegisterName() const; const char* GetRegisterName() const;
void MXHardReset(); void MXHardReset();
void MXCommandHandler(u32 data, u32 size); void MXCommandHandler(u32 data, u32 size);
void DirectFIFOWrite(u8 *data, u32 size); void DirectFIFOWrite(u8 *data, u32 size);

2
Source/Core/Core/Src/HW/EXI_DeviceIPL.h
View File

@ -78,7 +78,7 @@ private:
virtual void TransferByte(u8 &_uByte); virtual void TransferByte(u8 &_uByte);
bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); } bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); }
u32 const CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } const u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; }
void LoadFileToIPL(std::string filename, u32 offset); void LoadFileToIPL(std::string filename, u32 offset);
}; };

6
Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
View File

@ -132,14 +132,12 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
if(Movie::IsPlayingInput()) if(Movie::IsPlayingInput())
{ {
Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber); Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber);
if(!Movie::IsUsingWiimote(0)) Movie::InputUpdate();
Movie::InputUpdate();
} }
else if(Movie::IsRecordingInput()) else if(Movie::IsRecordingInput())
{ {
Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber); Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber);
if(!Movie::IsUsingWiimote(0)) Movie::InputUpdate();
Movie::InputUpdate();
} }
else else
Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber); Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber);

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

@ -196,7 +196,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
switch (Mode){ switch (Mode){
case 0: case 0:
{ {
if (SeekPosition >=0 && SeekPosition <= fileSize) if (SeekPosition <= fileSize)
{ {
m_SeekPos = SeekPosition; m_SeekPos = SeekPosition;
ReturnValue = m_SeekPos; ReturnValue = m_SeekPos;
@ -206,7 +206,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
case 1: case 1:
{ {
u32 wantedPos = SeekPosition+m_SeekPos; u32 wantedPos = SeekPosition+m_SeekPos;
if (wantedPos >=0 && wantedPos <= fileSize) if (wantedPos <= fileSize)
{ {
m_SeekPos = wantedPos; m_SeekPos = wantedPos;
ReturnValue = m_SeekPos; ReturnValue = m_SeekPos;
@ -216,7 +216,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
case 2: case 2:
{ {
u64 wantedPos = fileSize+m_SeekPos; u64 wantedPos = fileSize+m_SeekPos;
if (wantedPos >=0 && wantedPos <= fileSize) if (wantedPos <= fileSize)
{ {
m_SeekPos = wantedPos; m_SeekPos = wantedPos;
ReturnValue = m_SeekPos; ReturnValue = m_SeekPos;

1
Source/Core/DolphinWX/Src/GLInterface/WX.cpp
View File

@ -50,6 +50,7 @@ bool cInterfaceWX::Create(void *&window_handle)
GLWin.glCanvas->Show(true); GLWin.glCanvas->Show(true);
if (GLWin.glCtxt == NULL) // XXX dirty hack if (GLWin.glCtxt == NULL) // XXX dirty hack
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
return true;
} }
bool cInterfaceWX::MakeCurrent() bool cInterfaceWX::MakeCurrent()

17
Source/Core/VideoCommon/Src/VideoCommon.h
View File

@ -44,17 +44,14 @@ enum
EFB_HEIGHT = 528, EFB_HEIGHT = 528,
}; };
enum // XFB width is decided by EFB copy operation. The VI can do horizontal
{ // scaling (TODO: emulate).
// XFB width is decided by EFB copy operation. The VI can do horizontal const u32 MAX_XFB_WIDTH = EFB_WIDTH;
// scaling (TODO: emulate).
MAX_XFB_WIDTH = EFB_WIDTH,
// Although EFB height is 528, 574-line XFB's can be created either with // Although EFB height is 528, 574-line XFB's can be created either with
// vertical scaling by the EFB copy operation or copying to multiple XFB's // vertical scaling by the EFB copy operation or copying to multiple XFB's
// that are next to each other in memory (TODO: handle that situation). // that are next to each other in memory (TODO: handle that situation).
MAX_XFB_HEIGHT = 574 const u32 MAX_XFB_HEIGHT = 574;
};
// Logging // Logging
// ---------- // ----------

2
Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
View File

@ -355,7 +355,7 @@ namespace EfbInterface
dstClr = (~srcClr) & dstClr; dstClr = (~srcClr) & dstClr;
break; break;
case 5: // noop case 5: // noop
dstClr = dstClr; // Do nothing
break; break;
case 6: // xor case 6: // xor
dstClr = srcClr ^ dstClr; dstClr = srcClr ^ dstClr;