mirror/sys-con
1
0
Fork 0
mirror of https://github.com/cathery/sys-con.git synced 2025-01-30 03:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Roll back some safety checks

Browse Source
This commit is contained in:
cathery 2020-03-13 13:38:32 +03:00
parent 50b0a158ce
commit 4cd616570f
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/ControllerSwitch/SwitchVirtualGamepadHandler.cpp
View File

@ -34,7 +34,7 @@ void SwitchVirtualGamepadHandler::OutputThreadLoop(void *handler)
Result SwitchVirtualGamepadHandler::InitInputThread()
{
R_TRY(m_inputThread.Initialize(&SwitchVirtualGamepadHandler::InputThreadLoop, this, 0x30).GetValue());
R_TRY(m_inputThread.Initialize(&SwitchVirtualGamepadHandler::InputThreadLoop, this, 0x3E).GetValue());
m_inputThreadIsRunning = true;
return m_inputThread.Start().GetValue();
}
@ -42,12 +42,13 @@ Result SwitchVirtualGamepadHandler::InitInputThread()
void SwitchVirtualGamepadHandler::ExitInputThread()
{
m_inputThreadIsRunning = false;
m_inputThread.CancelSynchronization();
m_inputThread.Join();
}
Result SwitchVirtualGamepadHandler::InitOutputThread()
{
R_TRY(m_outputThread.Initialize(&SwitchVirtualGamepadHandler::OutputThreadLoop, this, 0x30).GetValue());
R_TRY(m_outputThread.Initialize(&SwitchVirtualGamepadHandler::OutputThreadLoop, this, 0x3E).GetValue());
m_outputThreadIsRunning = true;
return m_outputThread.Start().GetValue();
}
@ -55,5 +56,6 @@ Result SwitchVirtualGamepadHandler::InitOutputThread()
void SwitchVirtualGamepadHandler::ExitOutputThread()
{
m_outputThreadIsRunning = false;
m_inputThread.CancelSynchronization();
m_outputThread.Join();
}

23
source/Sysmodule/source/usb_module.cpp
View File

@ -42,10 +42,10 @@ namespace syscon::usb
UsbHsInterface interfaces[MaxUsbHsInterfacesSize];
s32 QueryInterfaces(u8 iclass, u8 isubclass, u8 iprotocol);
s32 QueryVendorProduct(uint16_t vendor_id, uint16_t product_id);
void UsbEventThreadFunc(void *arg)
{
WriteToLog("Starting USB Catch-all Event Thread!");
do {
if (R_SUCCEEDED(eventWait(&g_usbCatchAllEvent, U64_MAX)))
{
@ -74,7 +74,6 @@ namespace syscon::usb
void UsbDs3EventThreadFunc(void *arg)
{
WriteToLog("Starting USB DS3 Event Thread!");
do {
if (R_SUCCEEDED(eventWait(&g_usbDualshock3Event, U64_MAX)))
{
@ -84,7 +83,8 @@ namespace syscon::usb
if (!controllers::IsAtControllerLimit())
{
s32 total_entries;
if ((total_entries = QueryInterfaces(USB_CLASS_HID, 0, 0)) != 0)
if ((QueryVendorProduct(VENDOR_SONY, PRODUCT_DUALSHOCK3) != 0)
&& (total_entries = QueryInterfaces(USB_CLASS_HID, 0, 0)) != 0)
WriteToLog("Initializing Dualshock 3 controller: 0x%x", controllers::Insert(std::make_unique<Dualshock3Controller>(std::make_unique<SwitchUSBDevice>(interfaces, total_entries))));
}
}
@ -93,7 +93,6 @@ namespace syscon::usb
void UsbDs4EventThreadFunc(void *arg)
{
WriteToLog("Starting USB DS4 Event Thread!");
do {
if (R_SUCCEEDED(eventWait(&g_usbDualshock4Event, U64_MAX)))
{
@ -103,7 +102,8 @@ namespace syscon::usb
if (!controllers::IsAtControllerLimit())
{
s32 total_entries;
if ((total_entries = QueryInterfaces(USB_CLASS_HID, 0, 0)) != 0)
if ((QueryVendorProduct(VENDOR_SONY, config::globalConfig.dualshock4_productID) != 0)
&& (total_entries = QueryInterfaces(USB_CLASS_HID, 0, 0)) != 0)
WriteToLog("Initializing Dualshock 4 controller: 0x%x", controllers::Insert(std::make_unique<Dualshock4Controller>(std::make_unique<SwitchUSBDevice>(interfaces, total_entries))));
}
}
@ -112,7 +112,6 @@ namespace syscon::usb
void UsbInterfaceChangeThreadFunc(void *arg)
{
WriteToLog("Starting USB Interface Change Thread!");
do {
if (R_SUCCEEDED(eventWait(usbHsGetInterfaceStateChangeEvent(), UINT64_MAX)))
{
@ -168,6 +167,18 @@ namespace syscon::usb
return out_entries;
}
s32 QueryVendorProduct(uint16_t vendor_id, uint16_t product_id)
{
UsbHsInterfaceFilter filter {
.Flags = UsbHsInterfaceFilterFlags_idVendor | UsbHsInterfaceFilterFlags_idProduct,
.idVendor = vendor_id,
.idProduct = product_id,
};
s32 out_entries = 0;
usbHsQueryAvailableInterfaces(&filter, interfaces, sizeof(interfaces), &out_entries);
return out_entries;
}
inline Result CreateCatchAllAvailableEvent()
{
constexpr UsbHsInterfaceFilter filter {