jyapayne/switch-pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Verify automatic XInput mode switching

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2026-09-02 08:20:14 -06:00
commit 7e3be8675f
5 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

51
adapter_host_probe.cpp
View file

@ -18,13 +18,24 @@ namespace {
constexpr uint32_t kXInputBootMagic = 0x58494e50; // "XINP"
constexpr uint8_t kModeScratchRegister = 0;
constexpr uint8_t kStatusRequest = 0x21;
constexpr uint16_t kStatusIndex = 0x0005;
uint8_t g_status_response[4]{};
AdapterUsbMode g_mode = AdapterUsbMode::kSwitchProbe;
AdapterHostProbeState g_probe;
alarm_id_t g_reboot_alarm = 0;
uint32_t now_ms() {
return static_cast<uint32_t>(to_ms_since_boot(get_absolute_time()));
}
int64_t reboot_to_xinput(alarm_id_t alarm_id, void *user_data) {
(void)alarm_id;
(void)user_data;
watchdog_hw->scratch[kModeScratchRegister] = kXInputBootMagic;
watchdog_reboot(0, 0, 0);
return 0;
}
} // namespace
@ -54,8 +65,24 @@ bool adapter_host_probe_vendor_control(uint8_t rhport, uint8_t stage,
if (stage != CONTROL_STAGE_SETUP || request == nullptr ||
request->bmRequestType_bit.direction != TUSB_DIR_IN ||
request->bmRequestType_bit.type != TUSB_REQ_TYPE_VENDOR ||
request->bmRequestType_bit.recipient != TUSB_REQ_RCPT_DEVICE ||
request->bRequest != XInputFeasibility::kMsVendorRequest ||
request->bmRequestType_bit.recipient != TUSB_REQ_RCPT_DEVICE) {
return false;
}
if (request->bRequest == kStatusRequest &&
request->wIndex == kStatusIndex) {
const uint32_t current_time = now_ms();
g_status_response[0] =
g_mode == AdapterUsbMode::kXInput ? 1 : 0;
g_status_response[1] = g_probe.saw_ms_os_string() ? 1 : 0;
g_status_response[2] = g_probe.windows_confirmed() ? 1 : 0;
g_status_response[3] =
g_probe.should_reboot(current_time) ? 1 : 0;
return tud_control_xfer(rhport, request, g_status_response,
sizeof(g_status_response));
}
if (request->bRequest != XInputFeasibility::kMsVendorRequest ||
request->wIndex != XInputFeasibility::kMsCompatIdIndex) {
return false;
}
@ -63,11 +90,19 @@ bool adapter_host_probe_vendor_control(uint8_t rhport, uint8_t stage,
if (g_mode == AdapterUsbMode::kSwitchProbe) {
g_probe.note_ms_compat_id_request(now_ms());
PROBE_LOG("[HOST PROBE] Microsoft compatible-ID request confirmed\n");
return tud_control_xfer(
const bool queued = tud_control_xfer(
rhport, request,
const_cast<uint8_t *>(
XInputFeasibility::kProbeMsCompatIdDescriptor),
sizeof(XInputFeasibility::kProbeMsCompatIdDescriptor));
if (queued && g_reboot_alarm == 0) {
g_reboot_alarm = add_alarm_in_ms(
AdapterHostProbeState::kRebootDelayMs,
reboot_to_xinput, nullptr, true);
PROBE_LOG("[HOST PROBE] XInput reboot alarm=%d\n",
static_cast<int>(g_reboot_alarm));
}
return queued;
}
return tud_control_xfer(
@ -75,13 +110,3 @@ bool adapter_host_probe_vendor_control(uint8_t rhport, uint8_t stage,
const_cast<uint8_t *>(XInputFeasibility::kMsCompatIdDescriptor),
sizeof(XInputFeasibility::kMsCompatIdDescriptor));
}
void adapter_host_probe_task() {
if (g_mode != AdapterUsbMode::kSwitchProbe ||
!g_probe.should_reboot(now_ms())) {
return;
}
watchdog_hw->scratch[kModeScratchRegister] = kXInputBootMagic;
PROBE_LOG("[HOST PROBE] rebooting once into XInput\n");
watchdog_reboot(0, 0, 10);
}