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

Added some ground work for a Swap Disc feature (disabled) and commented out a case for Cover Register in DVD write32 - seems pointless to have. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1626 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox 2008-12-23 04:35:21 +00:00
parent af3341e3d6
commit 099bd0f4da
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/Src/HW/DVDInterface.cpp
View File

@ -333,19 +333,19 @@ void Write32(const u32 _iValue, const u32 _iAddress)
} }
break; break;
case DI_COVER_REGISTER: //case DI_COVER_REGISTER:
{ // {
UDICVR tmpCoverReg(_iValue); // UDICVR tmpCoverReg(_iValue);
dvdMem.CoverReg.CVR = 0; // dvdMem.CoverReg.CVR = 0;
dvdMem.CoverReg.CVRINTMASK = tmpCoverReg.CVRINTMASK; // dvdMem.CoverReg.CVRINTMASK = tmpCoverReg.CVRINTMASK;
if (tmpCoverReg.CVRINT) dvdMem.CoverReg.CVRINT = 0; // if (tmpCoverReg.CVRINT) dvdMem.CoverReg.CVRINT = 0;
//
// UpdateInterrupts();
UpdateInterrupts(); // _dbg_assert_(DVDINTERFACE, (tmpCoverReg.CVR == 0));
// }
_dbg_assert_(DVDINTERFACE, (tmpCoverReg.CVR == 0)); // break;
}
break;
case DI_COMMAND_0: dvdMem.Command[0] = _iValue; break; case DI_COMMAND_0: dvdMem.Command[0] = _iValue; break;
case DI_COMMAND_1: dvdMem.Command[1] = _iValue; break; case DI_COMMAND_1: dvdMem.Command[1] = _iValue; break;

11
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -25,6 +25,7 @@
#include "Common.h" #include "Common.h"
#include "Config.h" #include "Config.h"
#include "Core.h" #include "Core.h"
#include "HW\DVDInterface.h"
#include "State.h" #include "State.h"
#include "ConfigMain.h" #include "ConfigMain.h"
#include "PluginManager.h" #include "PluginManager.h"
@ -54,6 +55,8 @@ extern "C" {
#include "../resources/toolbar_stop.c" #include "../resources/toolbar_stop.c"
}; };
using namespace DVDInterface;
#define wxGetBitmapFromMemory(name) _wxGetBitmapFromMemory(name, sizeof(name)) #define wxGetBitmapFromMemory(name) _wxGetBitmapFromMemory(name, sizeof(name))
inline wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length) inline wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length)
{ {
@ -95,6 +98,7 @@ EVT_MENU(IDM_CONFIG_WIIMOTE_PLUGIN, CFrame::OnPluginWiimote)
EVT_MENU(IDM_BROWSE, CFrame::OnBrowse) EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard) EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
EVT_MENU(IDM_CHEATS, CFrame::OnShow_CheatsWindow) EVT_MENU(IDM_CHEATS, CFrame::OnShow_CheatsWindow)
EVT_MENU(IDM_SWAPDISC, CFrame::OnSwapDisc)
EVT_MENU(IDM_TOGGLE_FULLSCREEN, CFrame::OnToggleFullscreen) EVT_MENU(IDM_TOGGLE_FULLSCREEN, CFrame::OnToggleFullscreen)
EVT_MENU(IDM_TOGGLE_DUALCORE, CFrame::OnToggleDualCore) EVT_MENU(IDM_TOGGLE_DUALCORE, CFrame::OnToggleDualCore)
EVT_MENU(IDM_TOGGLE_SKIPIDLE, CFrame::OnToggleSkipIdle) EVT_MENU(IDM_TOGGLE_SKIPIDLE, CFrame::OnToggleSkipIdle)
@ -246,6 +250,7 @@ void CFrame::CreateMenu()
miscMenu->AppendSeparator(); miscMenu->AppendSeparator();
miscMenu->Append(IDM_MEMCARD, _T("&Memcard manager")); miscMenu->Append(IDM_MEMCARD, _T("&Memcard manager"));
miscMenu->Append(IDM_CHEATS, _T("Action &Replay Manager")); miscMenu->Append(IDM_CHEATS, _T("Action &Replay Manager"));
// miscMenu->Append(IDM_SWAPDISC, _T("S&wap Disc"));
m_pMenuBar->Append(miscMenu, _T("&Misc")); m_pMenuBar->Append(miscMenu, _T("&Misc"));
// help menu // help menu
@ -675,3 +680,9 @@ void CFrame::UpdateGUI()
} }
} }
} }
void CFrame::OnSwapDisc(wxCommandEvent& WXUNUSED (event))
{
PanicAlert("Omega: I opened the lid");
SetLidOpen(true);
}

1
Source/Core/DolphinWX/Src/Frame.h
View File

@ -116,6 +116,7 @@ class CFrame : public wxFrame
void OnLoadState(wxCommandEvent& event); void OnLoadState(wxCommandEvent& event);
void OnSaveState(wxCommandEvent& event); void OnSaveState(wxCommandEvent& event);
void OnClose(wxCloseEvent &event); void OnClose(wxCloseEvent &event);
void OnSwapDisc(wxCommandEvent& event);
wxMenuBar* m_pMenuBar; wxMenuBar* m_pMenuBar;

1
Source/Core/DolphinWX/Src/Globals.h
View File

@ -48,6 +48,7 @@ enum
IDM_BROWSE, IDM_BROWSE,
IDM_MEMCARD, IDM_MEMCARD,
IDM_CHEATS, IDM_CHEATS,
IDM_SWAPDISC,
IDM_PROPERTIES, IDM_PROPERTIES,
IDM_OPENCONTAININGFOLDER, IDM_OPENCONTAININGFOLDER,
IDM_SETDEFAULTGCM, IDM_SETDEFAULTGCM,