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

Added extension option to Wiimote settings. It doesn't work currently. Renamed a file. Added log manager option to only show logs unique to that verbosity level.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1197 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2008-11-17 19:38:50 +00:00
parent d463c3b6f4
commit 816b979128
16 changed files with 123 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Plugins/Plugin_Wiimote_Test/Plugin_Wiimote_Test.vcproj
View File

@ -536,14 +536,6 @@
<Filter
Name="Emulated Wiimote"
>
<File
RelativePath=".\Src\EmuDeclarations.cpp"
>
</File>
<File
RelativePath=".\Src\EmuDeclarations.h"
>
</File>
<File
RelativePath=".\Src\EmuDefinitions.cpp"
>
@ -560,6 +552,14 @@
RelativePath=".\Src\EmuMain.h"
>
</File>
<File
RelativePath=".\Src\EmuSubroutines.cpp"
>
</File>
<File
RelativePath=".\Src\EmuSubroutines.h"
>
</File>
<File
RelativePath=".\Src\FillReport.cpp"
>

4
Source/Plugins/Plugin_Wiimote_Test/Src/Config.cpp
View File

@ -37,6 +37,8 @@ void Config::Load()
iniFile.Get("Settings", "SidewaysDPad", &bSidewaysDPad, 0); // Hardware
iniFile.Get("Settings", "WideScreen", &bWideScreen, 0);
iniFile.Get("Settings", "ExtensionConnected", &bExtensionConnected, 0);
}
void Config::Save()
@ -45,6 +47,8 @@ void Config::Save()
iniFile.Load(FULL_CONFIG_DIR "Wiimote.ini");
iniFile.Set("Settings", "SidewaysDPad", bSidewaysDPad);
iniFile.Set("Settings", "WideScreen", bWideScreen);
iniFile.Set("Settings", "ExtensionConnected", bExtensionConnected);
iniFile.Save(FULL_CONFIG_DIR "Wiimote.ini");
}

1
Source/Plugins/Plugin_Wiimote_Test/Src/Config.h
View File

@ -33,6 +33,7 @@ struct Config
// General
bool bSidewaysDPad;
bool bWideScreen;
bool bExtensionConnected;
};
extern Config g_Config;

7
Source/Plugins/Plugin_Wiimote_Test/Src/ConfigDlg.cpp
View File

@ -26,6 +26,7 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
EVT_BUTTON(ID_ABOUTOGL, ConfigDialog::AboutClick)
EVT_CHECKBOX(ID_SIDEWAYSDPAD, ConfigDialog::GeneralSettingsChanged)
EVT_CHECKBOX(ID_WIDESCREEN, ConfigDialog::GeneralSettingsChanged)
EVT_CHECKBOX(ID_EXTENSIONCONNECTED, ConfigDialog::GeneralSettingsChanged)
END_EVENT_TABLE()
ConfigDialog::ConfigDialog(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)
@ -71,6 +72,8 @@ void ConfigDialog::CreateGUIControls()
m_SidewaysDPad->SetValue(g_Config.bSidewaysDPad);
m_WideScreen = new wxCheckBox(m_PageEmu, ID_WIDESCREEN, wxT("WideScreen Mode (for correct aiming)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_WideScreen->SetValue(g_Config.bWideScreen);
m_ExtensionConnected = new wxCheckBox(m_PageEmu, ID_EXTENSIONCONNECTED, wxT("Extension connected"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_ExtensionConnected->SetValue(g_Config.bExtensionConnected);
// ----------------------------------------------------------------------
@ -81,6 +84,7 @@ void ConfigDialog::CreateGUIControls()
sBasic = new wxGridBagSizer(0, 0);
sBasic->Add(m_SidewaysDPad, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5);
sBasic->Add(m_WideScreen, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5);
sBasic->Add(m_ExtensionConnected, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5);
sbBasic->Add(sBasic);
sGeneral->Add(sbBasic, 0, wxEXPAND|wxALL, 5);
@ -122,5 +126,8 @@ void ConfigDialog::GeneralSettingsChanged(wxCommandEvent& event)
case ID_WIDESCREEN:
g_Config.bWideScreen = m_WideScreen->IsChecked();
break;
case ID_EXTENSIONCONNECTED:
g_Config.bExtensionConnected = m_ExtensionConnected->IsChecked();
break;
}
}

4
Source/Plugins/Plugin_Wiimote_Test/Src/ConfigDlg.h
View File

@ -59,6 +59,7 @@ class ConfigDialog : public wxDialog
wxCheckBox *m_SidewaysDPad; // general settings
wxCheckBox *m_WideScreen;
wxCheckBox *m_ExtensionConnected;
enum
{
@ -70,7 +71,8 @@ class ConfigDialog : public wxDialog
ID_PAGEREAL,
ID_SIDEWAYSDPAD,
ID_WIDESCREEN
ID_WIDESCREEN,
ID_EXTENSIONCONNECTED
};
void OnClose(wxCloseEvent& event);

75
Source/Plugins/Plugin_Wiimote_Test/Src/EmuMain.cpp
View File

@ -22,9 +22,10 @@
#include <string>
#include "Common.h"
#include "wiimote_hid.h"
#include "EmuDeclarations.h"
#include "EmuSubroutines.h"
#include "EmuDefinitions.h"
#include "Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
#include "Config.h" // for g_Config
extern SWiimoteInitialize g_WiimoteInitialize;
//extern void __Log(int log, const char *format, ...);
@ -41,7 +42,7 @@ namespace WiiMoteEmu
void HidOutputReport(u16 _channelID, wm_report* sr) {
LOGV(WII_IPC_WIIMOTE, 0, ">>>========================================================");
LOGV(WII_IPC_WIIMOTE, 0, "===========================================================");
LOGV(WII_IPC_WIIMOTE, 0, "HidOutputReport(0x%02x)", sr->channel);
@ -86,11 +87,14 @@ void HidOutputReport(u16 _channelID, wm_report* sr) {
}
void WmLeds(u16 _channelID, wm_leds* leds) {
LOGV(WII_IPC_WIIMOTE, 0, "===========================================================");
LOG(WII_IPC_WIIMOTE, " Set LEDs");
LOG(WII_IPC_WIIMOTE, " Leds: %x", leds->leds);
LOG(WII_IPC_WIIMOTE, " Rumble: %x", leds->rumble);
g_Leds = leds->leds;
LOGV(WII_IPC_WIIMOTE, 0, "===========================================================");
}
void WmSendAck(u16 _channelID, u8 _reportID)
{
@ -121,6 +125,7 @@ void WmSendAck(u16 _channelID, u8 _reportID)
void WmDataReporting(u16 _channelID, wm_data_reporting* dr)
{
LOGV(WII_IPC_WIIMOTE, 0, "===========================================================");
LOG(WII_IPC_WIIMOTE, " Set Data reporting mode");
LOG(WII_IPC_WIIMOTE, " Rumble: %x", dr->rumble);
LOG(WII_IPC_WIIMOTE, " Continuous: %x", dr->continuous);
@ -141,6 +146,8 @@ void WmDataReporting(u16 _channelID, wm_data_reporting* dr)
}
// WmSendAck(_channelID, WM_DATA_REPORTING);
LOGV(WII_IPC_WIIMOTE, 0, "===========================================================");
}
@ -214,9 +221,10 @@ void SendReportCoreAccel(u16 _channelID)
g_WiimoteInitialize.pWiimoteInput(_channelID, DataFrame, Offset);
}
void WmReadData(u16 _channelID, wm_read_data* rd)
{
LOGV(WII_IPC_WIIMOTE, 0, ">>>========================================================");
LOGV(WII_IPC_WIIMOTE, 0, "===========================================================");
u32 address = convert24bit(rd->address);
u16 size = convert16bit(rd->size);
LOG(WII_IPC_WIIMOTE, " Read data");
@ -272,11 +280,13 @@ void WmReadData(u16 _channelID, wm_read_data* rd)
{
PanicAlert("WmReadData: unimplemented parameters (size: %i, addr: 0x%x!", size, rd->space);
}
LOGV(WII_IPC_WIIMOTE, 0, ">>>========================================================");
LOGV(WII_IPC_WIIMOTE, 0, "===========================================================");
}
void WmWriteData(u16 _channelID, wm_write_data* wd)
{
LOGV(WII_IPC_WIIMOTE, 0, "========================================================");
u32 address = convert24bit(wd->address);
LOG(WII_IPC_WIIMOTE, " Write data");
LOG(WII_IPC_WIIMOTE, " Address space: %x", wd->space);
@ -284,6 +294,7 @@ void WmWriteData(u16 _channelID, wm_write_data* wd)
LOG(WII_IPC_WIIMOTE, " Size: 0x%02x", wd->size);
LOG(WII_IPC_WIIMOTE, " Rumble: %x", wd->rumble);
// Write to EEPROM
if(wd->size <= 16 && wd->space == WM_SPACE_EEPROM)
{
if(address + wd->size > WIIMOTE_EEPROM_SIZE) {
@ -294,32 +305,37 @@ void WmWriteData(u16 _channelID, wm_write_data* wd)
// WmSendAck(_channelID, WM_WRITE_DATA);
}
// Write to registers
else if(wd->size <= 16 && (wd->space == WM_SPACE_REGS1 || wd->space == WM_SPACE_REGS2))
{
u8* block;
u32 blockSize;
switch((address >> 16) & 0xFE) {
case 0xA2:
block = g_RegSpeaker;
blockSize = WIIMOTE_REG_SPEAKER_SIZE;
break;
case 0xA4:
block = g_RegExt;
blockSize = WIIMOTE_REG_EXT_SIZE;
break;
case 0xB0:
block = g_RegIr;
blockSize = WIIMOTE_REG_IR_SIZE;
break;
default:
PanicAlert("WmWriteData: bad register block!");
return;
switch((address >> 16) & 0xFE)
{
case 0xA2:
block = g_RegSpeaker;
blockSize = WIIMOTE_REG_SPEAKER_SIZE;
break;
case 0xA4:
block = g_RegExt; // Extension Controller register
blockSize = WIIMOTE_REG_EXT_SIZE;
LOGV(WII_IPC_WIIMOTE, 0, " Case 0xA4: Write g_RegExt *********************************");
PanicAlert(" Case 0xA4: Write g_RegExt");
break;
case 0xB0:
block = g_RegIr;
blockSize = WIIMOTE_REG_IR_SIZE;
break;
default:
PanicAlert("WmWriteData: bad register block!");
return;
}
address &= 0xFFFF;
if(address + wd->size > blockSize) {
PanicAlert("WmWriteData: address + size out of bounds!");
return;
}
// finally write the registers to memory
memcpy(wd->data, block + address, wd->size);
} else {
@ -328,6 +344,7 @@ void WmWriteData(u16 _channelID, wm_write_data* wd)
// just added for home brew.... hmmmm
WmSendAck(_channelID, WM_WRITE_DATA);
LOGV(WII_IPC_WIIMOTE, 0, "==========================================================");
}
int WriteWmReport(u8* dst, u8 channel) {
@ -346,9 +363,9 @@ int WriteWmReport(u8* dst, u8 channel) {
void WmRequestStatus(u16 _channelID, wm_request_status* rs)
{
//PanicAlert("WmRequestStatus");
LOGV(WII_IPC_WIIMOTE, 0, ">>>======================================");
LOGV(WII_IPC_WIIMOTE, 0, "================================================");
LOGV(WII_IPC_WIIMOTE, 0, " Request Status");
LOG(WII_IPC_WIIMOTE, " Rumble: %x", rs->rumble);
LOGV(WII_IPC_WIIMOTE, 0, " Rumble: %x", rs->rumble);
//SendStatusReport();
u8 DataFrame[1024];
@ -362,19 +379,23 @@ void WmRequestStatus(u16 _channelID, wm_request_status* rs)
pStatus->battery = 0x4F; //arbitrary number
// this gets us passed the first error, but later brings up the disconnected error
pStatus->extension = 0;
if(g_Config.bExtensionConnected)
pStatus->extension = 1;
else
pStatus->extension = 0;
LOGV(WII_IPC_WIIMOTE, 0," SendStatusReport()");
LOGV(WII_IPC_WIIMOTE, 0, " Flags: 0x%02x", pStatus->padding1[2]);
LOGV(WII_IPC_WIIMOTE, 0, " Extension: %x", pStatus->extension);
LOGV(WII_IPC_WIIMOTE, 0, " SendStatusReport()");
LOGV(WII_IPC_WIIMOTE, 0, " Flags: 0x%02x", pStatus->padding1[2]);
LOGV(WII_IPC_WIIMOTE, 0, " Battery: %d", pStatus->battery);
g_WiimoteInitialize.pWiimoteInput(_channelID, DataFrame, Offset);
LOGV(WII_IPC_WIIMOTE, 0, "==========================================");
LOGV(WII_IPC_WIIMOTE, 0, "=================================================");
}
void SendReadDataReply(u16 _channelID, void* _Base, u16 _Address, u8 _Size)
{
LOGV(WII_IPC_WIIMOTE, 0, ">>>======================================");
LOGV(WII_IPC_WIIMOTE, 0, "=========================================");
int dataOffset = 0;
while (_Size > 0)
{

16
Source/Plugins/Plugin_Wiimote_Test/Src/EmuDeclarations.cpp → Source/Plugins/Plugin_Wiimote_Test/Src/EmuSubroutines.cpp
View File

@ -22,7 +22,7 @@
#include <string>
#include "Common.h"
#include "wiimote_hid.h"
#include "EmuDeclarations.h"
#include "EmuSubroutines.h"
#include "EmuDefinitions.h"
#include "Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
@ -77,12 +77,13 @@ void CryptBuffer(u8* _buffer, u8 _size)
}
}
void WriteCryped16(u8* _baseBlock, u16 _address, u16 _value)
void WriteCrypted16(u8* _baseBlock, u16 _address, u16 _value)
{
u16 cryptedValue = _value;
CryptBuffer((u8*)&cryptedValue, sizeof(u16));
*(u16*)(_baseBlock + _address) = cryptedValue;
//PanicAlert("Converted %04x to %04x", _value, cryptedValue);
}
void Initialize()
@ -94,12 +95,14 @@ void Initialize()
g_ReportingMode = 0;
WriteCryped16(g_RegExt, 0xfe, 0x0000);
// Write 0x0000 in encrypted form (0xfefe) to 0xfe in the extension register
WriteCrypted16(g_RegExt, 0xfe, 0x0000); // Fully inserted Nunchuk
// g_RegExt[0xfd] = 0x1e;
// g_RegExt[0xfc] = 0x9a;
}
void DoState(void* ptr, int mode)
@ -113,7 +116,7 @@ void Shutdown(void)
void InterruptChannel(u16 _channelID, const void* _pData, u32 _Size)
{
LOGV(WII_IPC_WIIMOTE, 0, "=============================================================");
const u8* data = (const u8*)_pData;
// dump raw data
@ -155,6 +158,7 @@ void InterruptChannel(u16 _channelID, const void* _pData, u32 _Size)
PanicAlert("HidInput: Unknown type 0x%02x and param 0x%02x", hidp->type, hidp->param);
break;
}
LOGV(WII_IPC_WIIMOTE, 0, "=============================================================");
}
void ControlChannel(u16 _channelID, const void* _pData, u32 _Size)
@ -228,4 +232,4 @@ void Update()
// g_ReportingMode = 0;
}
}
}

0
Source/Plugins/Plugin_Wiimote_Test/Src/EmuDeclarations.h → Source/Plugins/Plugin_Wiimote_Test/Src/EmuSubroutines.h
View File

2
Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp
View File

@ -24,7 +24,7 @@
#include <string>
#include "Common.h"
#include "wiimote_hid.h"
#include "EmuDeclarations.h"
#include "EmuSubroutines.h"
#include "EmuDefinitions.h"
#include "Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
#include "Config.h" // for g_Config

3
Source/Plugins/Plugin_Wiimote_Test/Src/main.cpp
View File

@ -157,6 +157,7 @@ extern "C" void Wiimote_Shutdown(void)
extern "C" void Wiimote_InterruptChannel(u16 _channelID, const void* _pData, u32 _Size)
{
LOGV(WII_IPC_WIIMOTE, 0, "=============================================================");
const u8* data = (const u8*)_pData;
// dump raw data
@ -176,7 +177,7 @@ extern "C" void Wiimote_InterruptChannel(u16 _channelID, const void* _pData, u32
WiiMoteReal::InterruptChannel(_channelID, _pData, _Size);
else
WiiMoteEmu::InterruptChannel(_channelID, _pData, _Size);
LOGV(WII_IPC_WIIMOTE, 0, "=============================================================");
}
extern "C" void Wiimote_ControlChannel(u16 _channelID, const void* _pData, u32 _Size)