From cdaf9074671d80b0d71472974d4bc539ab1d4db5 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Sun, 17 May 2020 16:39:41 +1000 Subject: [PATCH] (WiiU/hid) hid.h only used in drivers_hid/wiiu, don't include everywhere --- input/include/wiiu/hid.h | 7 ------- input/include/wiiu/input.h | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/input/include/wiiu/hid.h b/input/include/wiiu/hid.h index 66999d41be..38f6ff4d04 100644 --- a/input/include/wiiu/hid.h +++ b/input/include/wiiu/hid.h @@ -94,13 +94,6 @@ struct _wiiu_adapter_list { wiiu_adapter_t *list; }; -extern wiiu_pad_functions_t pad_functions; -extern input_device_driver_t wiiu_joypad; -extern input_device_driver_t wpad_driver; -extern input_device_driver_t kpad_driver; -extern input_device_driver_t hidpad_driver; -extern hid_driver_t wiiu_hid; - static void *alloc_zeroed(size_t alignment, size_t size); static OSThread *new_thread(void); static wiiu_hid_t *new_hid(void); diff --git a/input/include/wiiu/input.h b/input/include/wiiu/input.h index dbe2995e9f..401dbaa426 100644 --- a/input/include/wiiu/input.h +++ b/input/include/wiiu/input.h @@ -29,7 +29,6 @@ #include #include #include -#include "hid.h" #include "../../common/hid/hid_device_driver.h" #include "../../connect/joypad_connection.h" @@ -65,4 +64,11 @@ struct _wiiu_pad_functions { void (*connect)(unsigned pad, input_device_driver_t *driver); }; +extern wiiu_pad_functions_t pad_functions; +extern input_device_driver_t wiiu_joypad; +extern input_device_driver_t wpad_driver; +extern input_device_driver_t kpad_driver; +extern input_device_driver_t hidpad_driver; +extern hid_driver_t wiiu_hid; + #endif /* __WIIU_INPUT__H */