Skip to content

Commit

Permalink
USB: windows support!
Browse files Browse the repository at this point in the history
  • Loading branch information
@GovanifY @refractionpcsx2
GovanifY authored and refractionpcsx2 committed Nov 11, 2020
1 parent 92be179 commit 9eb78a0
Show file tree
Hide file tree
Showing 33 changed files with 83 additions and 119 deletions.
8 changes: 4 additions & 4 deletions pcsx2/CMakeLists.txt
View file
Expand Up @@ -354,8 +354,8 @@ set(pcsx2USBSources
USB/usb-eyetoy/jo_mpeg.cpp
USB/usb-eyetoy/usb-eyetoy-webcam.cpp
USB/usb-hid/usb-hid.cpp
USB/shared/shared.cpp
USB/shared/inifile.cpp
USB/shared/shared_usb.cpp
USB/shared/inifile_usb.cpp
USB/shared/ringbuffer.cpp
USB/icon_buzz_24.cpp
USB/usb-msd/usb-msd-gtk.cpp
Expand Down Expand Up @@ -417,8 +417,8 @@ set(pcsx2USBHeaders
USB/usb-hid/hidproxy.h
USB/usb-hid/usb-hid.h
USB/usb-hid/noop.h
USB/shared/shared.h
USB/shared/inifile.h
USB/shared/shared_usb.h
USB/shared/inifile_usb.h
USB/shared/ringbuffer.h
USB/linux/ini.h
USB/linux/actualfile.h
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/USB.cpp
View file
Expand Up @@ -25,7 +25,7 @@
#include "osdebugout.h"
#include "qemu-usb/USBinternal.h"
#include "qemu-usb/desc.h"
#include "shared/shared.h"
#include "shared/shared_usb.h"
#include "deviceproxy.h"

#define PSXCLK 36864000 /* 36.864 Mhz */
Expand Down
54 changes: 9 additions & 45 deletions pcsx2/USB/Win32/Config.cpp → pcsx2/USB/Win32/Config_usb.cpp
View file
Expand Up @@ -17,13 +17,14 @@
#include "AppCoreThread.h"
#include "../USB.h"
#include "resource.h"
#include "Config.h"
#include "Config_usb.h"
#include "../deviceproxy.h"
#include "../usb-pad/padproxy.h"
#include "../usb-mic/audiodeviceproxy.h"
#include "../configuration.h"
#include "../shared/inifile_usb.h"

HINSTANCE hInst;
HINSTANCE hInstUSB;
extern bool configChanged;

void SysMessageA(const char* fmt, ...)
Expand Down Expand Up @@ -79,7 +80,7 @@ void PopulateAPIs(HWND hW, int port)
std::string selApi = GetSelectedAPI(std::make_pair(port, devName));

std::string var;
if (LoadSetting(nullptr, port, rd.Name(devtype), N_DEVICE_API, var))
if (LoadSetting(nullptr, port, rd.Name(devtype), N_DEVICE_API, str_to_wstr(var)))
OSDebugOut(L"Current API: %S\n", var.c_str());
else
{
Expand All @@ -104,7 +105,7 @@ void PopulateAPIs(HWND hW, int port)
SendDlgItemMessage(hW, port ? IDC_COMBO_API1 : IDC_COMBO_API2, CB_SETCURSEL, sel, 0);
}

BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
BOOL CALLBACK ConfigureDlgProcUSB(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
{

int port;
Expand Down Expand Up @@ -196,7 +197,7 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (it == list.end())
break;
std::string api = *it;
Win32Handles handles(hInst, hW);
Win32Handles handles(hInstUSB, hW);
if (device->Configure(port, api, &handles) == RESULT_FAILED)
SysMessage(TEXT("Some settings may not have been saved!\n"));
}
Expand Down Expand Up @@ -233,50 +234,13 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
return FALSE;
}


EXPORT_C_(BOOL)
AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
case WM_INITDIALOG:
return TRUE;

case WM_COMMAND:
switch (LOWORD(wParam))
{
case IDOK:
EndDialog(hW, FALSE);
return TRUE;
}
}
return FALSE;
}

void USBconfigure()
{
ScopedCoreThreadPause paused_core;
RegisterDevice::Register();
DialogBox(hInst,
DialogBox(hInstUSB,
MAKEINTRESOURCE(IDD_CONFIG),
GetActiveWindow(),
(DLGPROC)ConfigureDlgProc);
(DLGPROC)ConfigureDlgProcUSB);
paused_core.AllowResume();
}

EXPORT_C_(void)
USBabout()
{
DialogBox(hInst,
MAKEINTRESOURCE(IDD_ABOUT),
GetActiveWindow(),
(DLGPROC)AboutDlgProc);
}

BOOL APIENTRY DllMain(HANDLE hModule,
DWORD dwReason,
LPVOID lpReserved)
{
hInst = (HINSTANCE)hModule;
return TRUE;
}
}
0 pcsx2/USB/Win32/Config.h → pcsx2/USB/Win32/Config_usb.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pcsx2/USB/configuration.cpp
View file
Expand Up @@ -17,7 +17,7 @@
#include "osdebugout.h"
#include "deviceproxy.h"
#include "configuration.h"
#include "shared/inifile.h"
#include "shared/inifile_usb.h"
#include "platcompat.h"
#include <map>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/shared/inifile.cpp → pcsx2/USB/shared/inifile_usb.cpp
View file
Expand Up @@ -14,7 +14,7 @@
*/

#include "PrecompiledHeader.h"
#include "inifile.h"
#include "inifile_usb.h"
#include <algorithm>
#include <iostream>
#include <fstream>
Expand Down
0 pcsx2/USB/shared/inifile.h → pcsx2/USB/shared/inifile_usb.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pcsx2/USB/shared/rawinput.cpp → pcsx2/USB/shared/rawinput_usb.cpp
View file
Expand Up @@ -14,7 +14,7 @@
*/

#include "PrecompiledHeader.h"
#include "rawinput.h"
#include "rawinput_usb.h"
#include <cstdio>
#include <vector>
#include <algorithm>
Expand Down
0 pcsx2/USB/shared/rawinput.h → pcsx2/USB/shared/rawinput_usb.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pcsx2/USB/shared/shared.cpp → pcsx2/USB/shared/shared_usb.cpp
View file
Expand Up @@ -14,11 +14,11 @@
*/

#include "PrecompiledHeader.h"
#include "shared.h"
#include "shared_usb.h"
#include <stdexcept>

#if defined(BUILD_RAW)
#include "rawinput.h"
#include "rawinput_usb.h"
#endif

namespace shared
Expand Down
0 pcsx2/USB/shared/shared.h → pcsx2/USB/shared/shared_usb.h
View file
File renamed without changes.
0 pcsx2/USB/usb-eyetoy/api_init_win32.cpp → .../USB/usb-eyetoy/api_init_win32_eyetoy.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-eyetoy/cam-windows.cpp
View file
Expand Up @@ -19,7 +19,7 @@
#include "usb-eyetoy-webcam.h"
#include "jo_mpeg.h"

#include "../Win32/Config.h"
#include "../Win32/Config_usb.h"
#include "../Win32/resource.h"

namespace usb_eyetoy
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp
View file
Expand Up @@ -19,7 +19,7 @@
#include "usb-eyetoy-webcam.h"
#include "ov519.h"
#include "../qemu-usb/desc.h"
#include "../shared/inifile.h"
#include "../shared/inifile_usb.h"

namespace usb_eyetoy
{
Expand Down
0 pcsx2/USB/usb-hid/api_init_win32.cpp → pcsx2/USB/usb-hid/api_init_win32_hid.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-hid/raw/rawinput.cpp
View file
Expand Up @@ -15,7 +15,7 @@

#include "PrecompiledHeader.h"
#include "rawinput.h"
#include "../../Win32/Config.h"
#include "../../Win32/Config_usb.h"
#include "../../qemu-usb/input-keymap.h"
#include "../../qemu-usb/input-keymap-win32-to-qcode.h"

Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-hid/raw/rawinput.h
View file
Expand Up @@ -13,7 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/

#include "../../shared/rawinput.h"
#include "../../shared/rawinput_usb.h"
#include "../hidproxy.h"
#include "../usb-hid.h"

Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-hid/usb-hid.cpp
View file
Expand Up @@ -29,7 +29,7 @@
#include "../qemu-usb/desc.h"
#include "usb-hid.h"
#include "../osdebugout.h"
#include "../shared/inifile.h"
#include "../shared/inifile_usb.h"

#define CONTAINER_OF(p, type, field) ((type*)((char*)p - ((ptrdiff_t) & ((type*)0)->field)))

Expand Down
0 pcsx2/USB/usb-mic/api_init_win32.cpp → pcsx2/USB/usb-mic/api_init_win32_mic.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-mic/audiodev-wasapi.cpp
View file
Expand Up @@ -22,7 +22,7 @@
#include <functiondiscoverykeys_devpkey.h>
#include <process.h>
#include "audiodev-wasapi.h"
#include "../Win32/Config.h"
#include "../Win32/Config_usb.h"
#include "../Win32/resource.h"

#define SafeRelease(x) \
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-mic/usb-headset.cpp
View file
Expand Up @@ -27,7 +27,7 @@
#include "PrecompiledHeader.h"
#include "../qemu-usb/vl.h"
#include "../qemu-usb/desc.h"
#include "../shared/inifile.h"
#include "../shared/inifile_usb.h"
#include <assert.h>

#include "audio.h"
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-mic/usb-mic-logitech.cpp
View file
Expand Up @@ -17,7 +17,7 @@
#include "usb-mic-singstar.h"
#include "audio.h"
#include "../qemu-usb/desc.h"
#include "../shared/inifile.h"
#include "../shared/inifile_usb.h"

namespace usb_mic
{
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-mic/usb-mic-singstar.cpp
View file
Expand Up @@ -28,7 +28,7 @@
#include "../qemu-usb/vl.h"
#include "../qemu-usb/desc.h"
#include "usb-mic-singstar.h"
#include "../shared/inifile.h"
#include "../shared/inifile_usb.h"
#include <assert.h>

static FILE* file = NULL;
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-msd/usb-msd-win32.cpp
View file
Expand Up @@ -16,7 +16,7 @@
#include "PrecompiledHeader.h"
#include <commdlg.h>
#include "usb-msd.h"
#include "../Win32/Config.h"
#include "../Win32/Config_usb.h"
#include "../Win32/resource.h"

namespace usb_msd
Expand Down
0 pcsx2/USB/usb-pad/api_init_win32.cpp → pcsx2/USB/usb-pad/api_init_win32_pad.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-pad/dx/dinput-config.cpp
View file
Expand Up @@ -28,7 +28,7 @@
#include "versionproxy.h"

#include "usb-pad-dx.h"
#include "../../shared/inifile.h"
#include "../../shared/inifile_usb.h"

namespace usb_pad
{
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-pad/dx/usb-pad-dx.h
View file
Expand Up @@ -14,7 +14,7 @@
*/

#include "../padproxy.h"
#include "../../Win32/Config.h"
#include "../../Win32/Config_usb.h"

namespace usb_pad
{
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-pad/raw/usb-pad-raw.cpp
View file
Expand Up @@ -15,7 +15,7 @@

#include "PrecompiledHeader.h"
#include "../../USB.h"
#include "../../Win32/Config.h"
#include "../../Win32/Config_usb.h"
#include "usb-pad-raw.h"

namespace usb_pad
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-pad/raw/usb-pad-raw.h
View file
Expand Up @@ -20,7 +20,7 @@
#include <atomic>
#include "../padproxy.h"
#include "../usb-pad.h"
#include "../../shared/rawinput.h"
#include "../../shared/rawinput_usb.h"
#include "../../readerwriterqueue/readerwriterqueue.h"

namespace usb_pad
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-pad/usb-pad.cpp
View file
Expand Up @@ -17,7 +17,7 @@
#include "padproxy.h"
#include "usb-pad.h"
#include "../qemu-usb/desc.h"
#include "../shared/inifile.h"
#include "../shared/inifile_usb.h"

namespace usb_pad
{
Expand Down
2 changes: 1 addition & 1 deletion pcsx2/USB/usb-pad/usb-seamic.cpp
View file
Expand Up @@ -18,7 +18,7 @@
#include "usb-pad.h"
#include "../qemu-usb/desc.h"
#include "../usb-mic/usb-mic-singstar.h"
#include "../shared/inifile.h"
#include "../shared/inifile_usb.h"

namespace usb_pad
{
Expand Down
24 changes: 12 additions & 12 deletions pcsx2/windows/VCprojects/pcsx2.vcxproj
View file
Expand Up @@ -364,26 +364,26 @@
<ClCompile Include="..\..\USB\qemu-usb\usb-ohci.cpp" />
<ClCompile Include="..\..\USB\qemu-usb\vl.cpp" />
<ClCompile Include="..\..\USB\shared\hidapi.cpp" />
<ClCompile Include="..\..\USB\shared\inifile.cpp" />
<ClCompile Include="..\..\USB\shared\rawinput.cpp" />
<ClCompile Include="..\..\USB\shared\inifile_usb.cpp" />
<ClCompile Include="..\..\USB\shared\rawinput_usb.cpp" />
<ClCompile Include="..\..\USB\shared\ringbuffer.cpp" />
<ClCompile Include="..\..\USB\shared\shared.cpp" />
<ClCompile Include="..\..\USB\usb-eyetoy\api_init_win32.cpp" />
<ClCompile Include="..\..\USB\shared\shared_usb.cpp" />
<ClCompile Include="..\..\USB\usb-eyetoy\api_init_win32_eyetoy.cpp" />
<ClCompile Include="..\..\USB\usb-eyetoy\cam-windows.cpp" />
<ClCompile Include="..\..\USB\usb-eyetoy\jo_mpeg.cpp" />
<ClCompile Include="..\..\USB\usb-eyetoy\jpgd\jpgd.cpp" />
<ClCompile Include="..\..\USB\usb-eyetoy\usb-eyetoy-webcam.cpp" />
<ClCompile Include="..\..\USB\usb-hid\api_init_win32.cpp" />
<ClCompile Include="..\..\USB\usb-hid\api_init_win32_hid.cpp" />
<ClCompile Include="..\..\USB\usb-hid\raw\rawinput.cpp" />
<ClCompile Include="..\..\USB\usb-hid\usb-hid.cpp" />
<ClCompile Include="..\..\USB\usb-mic\api_init_win32.cpp" />
<ClCompile Include="..\..\USB\usb-mic\api_init_win32_mic.cpp" />
<ClCompile Include="..\..\USB\usb-mic\audiodev-wasapi.cpp" />
<ClCompile Include="..\..\USB\usb-mic\usb-headset.cpp" />
<ClCompile Include="..\..\USB\usb-mic\usb-mic-logitech.cpp" />
<ClCompile Include="..\..\USB\usb-mic\usb-mic-singstar.cpp" />
<ClCompile Include="..\..\USB\usb-msd\usb-msd-win32.cpp" />
<ClCompile Include="..\..\USB\usb-msd\usb-msd.cpp" />
<ClCompile Include="..\..\USB\usb-pad\api_init_win32.cpp" />
<ClCompile Include="..\..\USB\usb-pad\api_init_win32_pad.cpp" />
<ClCompile Include="..\..\USB\usb-pad\dx\dinput-config.cpp" />
<ClCompile Include="..\..\USB\usb-pad\dx\dinput.cpp" />
<ClCompile Include="..\..\USB\usb-pad\dx\usb-pad-dx.cpp" />
Expand All @@ -394,7 +394,7 @@
<ClCompile Include="..\..\USB\usb-pad\usb-pad.cpp" />
<ClCompile Include="..\..\USB\usb-pad\usb-seamic.cpp" />
<ClCompile Include="..\..\USB\USB.cpp" />
<ClCompile Include="..\..\USB\Win32\Config.cpp" />
<ClCompile Include="..\..\USB\Win32\Config_usb.cpp" />
<ClCompile Include="..\..\Utilities\FileUtils.cpp" />
<ClCompile Include="..\..\Dump.cpp" />
<ClCompile Include="..\..\x86\iMisc.cpp" />
Expand Down Expand Up @@ -681,10 +681,10 @@
<ClInclude Include="..\..\USB\readerwriterqueue\atomicops.h" />
<ClInclude Include="..\..\USB\readerwriterqueue\readerwriterqueue.h" />
<ClInclude Include="..\..\USB\shared\hidapi.h" />
<ClInclude Include="..\..\USB\shared\inifile.h" />
<ClInclude Include="..\..\USB\shared\rawinput.h" />
<ClInclude Include="..\..\USB\shared\inifile_usb.h" />
<ClInclude Include="..\..\USB\shared\rawinput_usb.h" />
<ClInclude Include="..\..\USB\shared\ringbuffer.h" />
<ClInclude Include="..\..\USB\shared\shared.h" />
<ClInclude Include="..\..\USB\shared\shared_usb.h" />
<ClInclude Include="..\..\USB\usb-eyetoy\cam-windows.h" />
<ClInclude Include="..\..\USB\usb-eyetoy\jo_mpeg.h" />
<ClInclude Include="..\..\USB\usb-eyetoy\jpgd\jpgd.h" />
Expand Down Expand Up @@ -713,7 +713,7 @@
<ClInclude Include="..\..\USB\usb-pad\raw\usb-pad-raw.h" />
<ClInclude Include="..\..\USB\usb-pad\usb-pad.h" />
<ClInclude Include="..\..\USB\USB.h" />
<ClInclude Include="..\..\USB\Win32\Config.h" />
<ClInclude Include="..\..\USB\Win32\Config_usb.h" />
<ClInclude Include="..\..\USB\Win32\resource.h" />
<ClInclude Include="..\..\Utilities\AsciiFile.h" />
<ClInclude Include="..\..\Elfheader.h" />
Expand Down

0 comments on commit 9eb78a0

Please sign in to comment.