mirror/sys-con
1
0
Fork 0
mirror of https://github.com/cathery/sys-con.git synced 2024-07-03 02:18:43 +00:00
Code Issues Projects Releases Wiki Activity

Xbox360W: add wrapper function to endpoint write

Browse Source
This commit is contained in:
cathery 2019-11-10 00:02:30 +03:00
parent 72b4e1d041
commit 01d20c0c46
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ControllerUSB/include/Controllers/Xbox360WirelessController.h
View File

@ -54,7 +54,9 @@ public:
static void LoadConfig(const ControllerConfig *config); static void LoadConfig(const ControllerConfig *config);
virtual ControllerConfig *GetConfig(); virtual ControllerConfig *GetConfig();
Status OutputBuffer(); Status WriteToEndpoint(const uint8_t *buffer, size_t size);
virtual Status OutputBuffer();
bool IsControllerActive() override { return m_presence; } bool IsControllerActive() override { return m_presence; }
}; };

18
ControllerUSB/source/Controllers/Xbox360WirelessController.cpp
View File

@ -26,13 +26,12 @@ Status Xbox360WirelessController::Initialize()
rc = OpenInterfaces(); rc = OpenInterfaces();
if (S_FAILED(rc)) if (S_FAILED(rc))
return rc; return rc;
/*
rc = m_outPipe->Write(reconnectPacket, sizeof(reconnectPacket)); rc = WriteToEndpoint(reconnectPacket, sizeof(reconnectPacket));
if (S_FAILED(rc)) if (S_FAILED(rc))
return rc; return rc;
SetLED(XBOX360LED_TOPLEFT); SetLED(XBOX360LED_TOPLEFT);
*/
return rc; return rc;
} }
void Xbox360WirelessController::Exit() void Xbox360WirelessController::Exit()
@ -104,7 +103,7 @@ Status Xbox360WirelessController::OpenInterfaces()
void Xbox360WirelessController::CloseInterfaces() void Xbox360WirelessController::CloseInterfaces()
{ {
if (m_presence) if (m_presence)
m_outPipe->Write(poweroffPacket, sizeof(poweroffPacket)); WriteToEndpoint(poweroffPacket, sizeof(poweroffPacket));
//m_device->Reset(); //m_device->Reset();
m_device->Close(); m_device->Close();
@ -234,13 +233,13 @@ NormalizedButtonData Xbox360WirelessController::GetNormalizedButtonData()
Status Xbox360WirelessController::SetRumble(uint8_t strong_magnitude, uint8_t weak_magnitude) Status Xbox360WirelessController::SetRumble(uint8_t strong_magnitude, uint8_t weak_magnitude)
{ {
uint8_t rumbleData[]{0x00, 0x01, 0x0F, 0xC0, 0x00, strong_magnitude, weak_magnitude, 0x00, 0x00, 0x00, 0x00, 0x00}; uint8_t rumbleData[]{0x00, 0x01, 0x0F, 0xC0, 0x00, strong_magnitude, weak_magnitude, 0x00, 0x00, 0x00, 0x00, 0x00};
return m_outPipe->Write(rumbleData, sizeof(rumbleData)); return WriteToEndpoint(rumbleData, sizeof(rumbleData));
} }
Status Xbox360WirelessController::SetLED(Xbox360LEDValue value) Status Xbox360WirelessController::SetLED(Xbox360LEDValue value)
{ {
uint8_t customLEDPacket[]{0x00, 0x00, 0x08, static_cast<uint8_t>(value | 0x40), 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; uint8_t customLEDPacket[]{0x00, 0x00, 0x08, static_cast<uint8_t>(value | 0x40), 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
return m_outPipe->Write(customLEDPacket, sizeof(customLEDPacket)); return WriteToEndpoint(customLEDPacket, sizeof(customLEDPacket));
} }
void Xbox360WirelessController::LoadConfig(const ControllerConfig *config) void Xbox360WirelessController::LoadConfig(const ControllerConfig *config)
@ -267,6 +266,11 @@ Status Xbox360WirelessController::OnControllerDisconnect()
return 0; return 0;
} }
Status Xbox360WirelessController::WriteToEndpoint(const uint8_t *buffer, size_t size)
{
return m_outPipe->Write(buffer, size);
}
Status Xbox360WirelessController::OutputBuffer() Status Xbox360WirelessController::OutputBuffer()
{ {
if (m_outputBuffer.empty()) if (m_outputBuffer.empty())
@ -274,7 +278,7 @@ Status Xbox360WirelessController::OutputBuffer()
Status rc; Status rc;
auto it = m_outputBuffer.begin(); auto it = m_outputBuffer.begin();
rc = m_outPipe->Write(it->packet, it->length); rc = WriteToEndpoint(it->packet, it->length);
m_outputBuffer.erase(it); m_outputBuffer.erase(it);
return rc; return rc;