From 202fc247d05f2cea7f7c5b9f92e44d44da2294c9 Mon Sep 17 00:00:00 2001 From: chrg6 Date: Mon, 9 Nov 2026 23:53:29 -0500 Subject: [PATCH] Name the gamepad probe probe_gamepad, so it does not clash with ov_probe.c's own static probe_input. Co-Authored-By: Claude Opus 5.5 --- runtime/host.h | 2 +- runtime/input.c | 2 +- runtime/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/host.h b/runtime/host.h index 2ccedb96..f6c1efee 100644 --- a/runtime/host.h +++ b/runtime/host.h @@ -371,7 +371,7 @@ int probe_shader(void); // gfx_shader.c int probe_census_dir(char *dir, size_t n); // gfx_shader_probe.c: build//shaders for the probes int probe_vkmem(void), probe_vkexec(void), probe_astc(void); // tex_probe.c, vk_exec_probe.c, astc_probe.c int probe_zstd(void); // ov_zstd.c -int probe_input(void); // input.c +int probe_gamepad(void); // input.c int probe_movie(void); // movie_probe.c: host VP9 movie::Decoder on one RomFS movie int vk_pipeline_prepare_shaders(void); // vk_pipeline.c: --prepare-shaders (tools/prepare_shaders.py) int vk_pipeline_warm_shaders(void); // vk_pipeline.c: --warm-shaders (tools/build_game.py) diff --git a/runtime/input.c b/runtime/input.c index 26244cd6..1b429cda 100644 --- a/runtime/input.c +++ b/runtime/input.c @@ -1195,7 +1195,7 @@ void input_motion_start(void) { // --probe-input: the gamepad path on SDL's virtual test gamepad (NX2NAVI_TEST_PAD). The pad thread comes up, a poll // reads the gamepad, polls are quick, and while an update takes as long as a device search (up_test_ns) the polls go on // with their last state instead of waiting for it. Needs no game files and no controller. -int probe_input(void) { +int probe_gamepad(void) { int fails = 0; cfg_setenv("NX2NAVI_TEST_PAD", "20000,-12000,0,0"); uint64_t b = 0; diff --git a/runtime/main.c b/runtime/main.c index 2786b0a5..dc27fc34 100644 --- a/runtime/main.c +++ b/runtime/main.c @@ -631,7 +631,7 @@ int main(int argc, char **argv) { if (!strcmp(mode, "--probe-vkexec")) return probe_vkexec(); if (!strcmp(mode, "--probe-astc")) return probe_astc(); if (!strcmp(mode, "--probe-zstd")) return probe_zstd(); - if (!strcmp(mode, "--probe-input")) return probe_input(); + if (!strcmp(mode, "--probe-input")) return probe_gamepad(); if (!strcmp(mode, "--probe-vkdevice")) return probe_vkdevice(); if (!strcmp(mode, "--probe-movie")) return probe_movie(); if (!strcmp(mode, "--prepare-shaders")) return vk_pipeline_prepare_shaders();