Merge joystick_*.h into gameport.h

Just like it was done to all headers with only device declarations years ago
2024-02-18 17:28:29 +05:00
parent c74ad5b4da
commit 643979c0b7
10 changed files with 13 additions and 186 deletions
--- a/src/game/gameport.c
+++ b/src/game/gameport.c
@@ -31,10 +31,6 @@
 #include <86box/timer.h>
 #include <86box/isapnp.h>
 #include <86box/gameport.h>
-#include <86box/joystick_ch_flightstick_pro.h>
-#include <86box/joystick_standard.h>
-#include <86box/joystick_sw_pad.h>
-#include <86box/joystick_tm_fcs.h>
 #include <86box/plat_unused.h>

 typedef struct g_axis_t {
--- a/src/game/joystick_ch_flightstick_pro.c
+++ b/src/game/joystick_ch_flightstick_pro.c
@@ -43,7 +43,6 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/gameport.h>
-#include <86box/joystick_standard.h>
 #include <86box/plat_unused.h>

 static void *
--- a/src/game/joystick_standard.c
+++ b/src/game/joystick_standard.c
@@ -43,7 +43,6 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/gameport.h>
-#include <86box/joystick_standard.h>
 #include <86box/plat_unused.h>

 static void *
--- a/src/game/joystick_sw_pad.c
+++ b/src/game/joystick_sw_pad.c
@@ -64,7 +64,6 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/gameport.h>
-#include <86box/joystick_sw_pad.h>
 #include <86box/plat_unused.h>

 typedef struct sw_data {
--- a/src/game/joystick_tm_fcs.c
+++ b/src/game/joystick_tm_fcs.c
@@ -43,7 +43,6 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/gameport.h>
-#include <86box/joystick_standard.h>
 #include <86box/plat_unused.h>

 static void *