mirror of
https://github.com/CTCaer/RetroArch.git
synced 2025-02-27 07:05:30 +00:00
header include cleanups
This commit is contained in:
parent
535d460c63
commit
4571dc33fc
@ -28,6 +28,7 @@
|
|||||||
#include "audio_thread_wrapper.h"
|
#include "audio_thread_wrapper.h"
|
||||||
|
|
||||||
#include "../command.h"
|
#include "../command.h"
|
||||||
|
#include "../driver.h"
|
||||||
#include "../configuration.h"
|
#include "../configuration.h"
|
||||||
#include "../retroarch.h"
|
#include "../retroarch.h"
|
||||||
#include "../runloop.h"
|
#include "../runloop.h"
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "camera_driver.h"
|
#include "camera_driver.h"
|
||||||
|
|
||||||
#include "../configuration.h"
|
#include "../configuration.h"
|
||||||
|
#include "../driver.h"
|
||||||
#include "../retroarch.h"
|
#include "../retroarch.h"
|
||||||
#include "../runloop.h"
|
#include "../runloop.h"
|
||||||
#include "../list_special.h"
|
#include "../list_special.h"
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include <retro_common_api.h>
|
#include <retro_common_api.h>
|
||||||
|
|
||||||
#include "gfx/video_driver.h"
|
#include "gfx/video_driver.h"
|
||||||
#include "driver.h"
|
#include "input/input_defines.h"
|
||||||
|
|
||||||
enum override_type
|
enum override_type
|
||||||
{
|
{
|
||||||
@ -32,10 +32,6 @@ enum override_type
|
|||||||
OVERRIDE_GAME
|
OVERRIDE_GAME
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef MAX_USERS
|
|
||||||
#define MAX_USERS 16
|
|
||||||
#endif
|
|
||||||
|
|
||||||
RETRO_BEGIN_DECLS
|
RETRO_BEGIN_DECLS
|
||||||
|
|
||||||
typedef struct settings
|
typedef struct settings
|
||||||
|
60
driver.h
60
driver.h
@ -42,66 +42,6 @@ RETRO_BEGIN_DECLS
|
|||||||
| DRIVER_MENU \
|
| DRIVER_MENU \
|
||||||
| DRIVERS_VIDEO_INPUT )
|
| DRIVERS_VIDEO_INPUT )
|
||||||
|
|
||||||
/* RetroArch specific bind IDs. */
|
|
||||||
enum
|
|
||||||
{
|
|
||||||
/* Custom binds that extend the scope of RETRO_DEVICE_JOYPAD for
|
|
||||||
* RetroArch specifically.
|
|
||||||
* Analogs (RETRO_DEVICE_ANALOG) */
|
|
||||||
RARCH_ANALOG_LEFT_X_PLUS = RARCH_FIRST_CUSTOM_BIND,
|
|
||||||
RARCH_ANALOG_LEFT_X_MINUS,
|
|
||||||
RARCH_ANALOG_LEFT_Y_PLUS,
|
|
||||||
RARCH_ANALOG_LEFT_Y_MINUS,
|
|
||||||
RARCH_ANALOG_RIGHT_X_PLUS,
|
|
||||||
RARCH_ANALOG_RIGHT_X_MINUS,
|
|
||||||
RARCH_ANALOG_RIGHT_Y_PLUS,
|
|
||||||
RARCH_ANALOG_RIGHT_Y_MINUS,
|
|
||||||
|
|
||||||
/* Turbo */
|
|
||||||
RARCH_TURBO_ENABLE,
|
|
||||||
|
|
||||||
RARCH_CUSTOM_BIND_LIST_END,
|
|
||||||
|
|
||||||
/* Command binds. Not related to game input,
|
|
||||||
* only usable for port 0. */
|
|
||||||
RARCH_FAST_FORWARD_KEY = RARCH_FIRST_META_KEY,
|
|
||||||
RARCH_FAST_FORWARD_HOLD_KEY,
|
|
||||||
RARCH_LOAD_STATE_KEY,
|
|
||||||
RARCH_SAVE_STATE_KEY,
|
|
||||||
RARCH_FULLSCREEN_TOGGLE_KEY,
|
|
||||||
RARCH_QUIT_KEY,
|
|
||||||
RARCH_STATE_SLOT_PLUS,
|
|
||||||
RARCH_STATE_SLOT_MINUS,
|
|
||||||
RARCH_REWIND,
|
|
||||||
RARCH_MOVIE_RECORD_TOGGLE,
|
|
||||||
RARCH_PAUSE_TOGGLE,
|
|
||||||
RARCH_FRAMEADVANCE,
|
|
||||||
RARCH_RESET,
|
|
||||||
RARCH_SHADER_NEXT,
|
|
||||||
RARCH_SHADER_PREV,
|
|
||||||
RARCH_CHEAT_INDEX_PLUS,
|
|
||||||
RARCH_CHEAT_INDEX_MINUS,
|
|
||||||
RARCH_CHEAT_TOGGLE,
|
|
||||||
RARCH_SCREENSHOT,
|
|
||||||
RARCH_MUTE,
|
|
||||||
RARCH_OSK,
|
|
||||||
RARCH_NETPLAY_FLIP,
|
|
||||||
RARCH_SLOWMOTION,
|
|
||||||
RARCH_ENABLE_HOTKEY,
|
|
||||||
RARCH_VOLUME_UP,
|
|
||||||
RARCH_VOLUME_DOWN,
|
|
||||||
RARCH_OVERLAY_NEXT,
|
|
||||||
RARCH_DISK_EJECT_TOGGLE,
|
|
||||||
RARCH_DISK_NEXT,
|
|
||||||
RARCH_DISK_PREV,
|
|
||||||
RARCH_GRAB_MOUSE_TOGGLE,
|
|
||||||
|
|
||||||
RARCH_MENU_TOGGLE,
|
|
||||||
|
|
||||||
RARCH_BIND_LIST_END,
|
|
||||||
RARCH_BIND_LIST_END_NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
DRIVER_AUDIO = 1 << 0,
|
DRIVER_AUDIO = 1 << 0,
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <stdlib.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -14,6 +14,8 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <string/stdstring.h>
|
#include <string/stdstring.h>
|
||||||
|
|
||||||
#include <IOKit/hid/IOHIDManager.h>
|
#include <IOKit/hid/IOHIDManager.h>
|
||||||
|
@ -14,6 +14,8 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "../../runloop.h"
|
#include "../../runloop.h"
|
||||||
#include "../input_hid_driver.h"
|
#include "../input_hid_driver.h"
|
||||||
|
|
||||||
|
@ -13,6 +13,8 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <gccore.h>
|
#include <gccore.h>
|
||||||
#include <rthreads/rthreads.h>
|
#include <rthreads/rthreads.h>
|
||||||
|
|
||||||
|
@ -23,6 +23,71 @@
|
|||||||
|
|
||||||
RETRO_BEGIN_DECLS
|
RETRO_BEGIN_DECLS
|
||||||
|
|
||||||
|
#define MAX_USERS 16
|
||||||
|
|
||||||
|
#define RARCH_FIRST_CUSTOM_BIND 16
|
||||||
|
#define RARCH_FIRST_META_KEY RARCH_CUSTOM_BIND_LIST_END
|
||||||
|
|
||||||
|
/* RetroArch specific bind IDs. */
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
/* Custom binds that extend the scope of RETRO_DEVICE_JOYPAD for
|
||||||
|
* RetroArch specifically.
|
||||||
|
* Analogs (RETRO_DEVICE_ANALOG) */
|
||||||
|
RARCH_ANALOG_LEFT_X_PLUS = RARCH_FIRST_CUSTOM_BIND,
|
||||||
|
RARCH_ANALOG_LEFT_X_MINUS,
|
||||||
|
RARCH_ANALOG_LEFT_Y_PLUS,
|
||||||
|
RARCH_ANALOG_LEFT_Y_MINUS,
|
||||||
|
RARCH_ANALOG_RIGHT_X_PLUS,
|
||||||
|
RARCH_ANALOG_RIGHT_X_MINUS,
|
||||||
|
RARCH_ANALOG_RIGHT_Y_PLUS,
|
||||||
|
RARCH_ANALOG_RIGHT_Y_MINUS,
|
||||||
|
|
||||||
|
/* Turbo */
|
||||||
|
RARCH_TURBO_ENABLE,
|
||||||
|
|
||||||
|
RARCH_CUSTOM_BIND_LIST_END,
|
||||||
|
|
||||||
|
/* Command binds. Not related to game input,
|
||||||
|
* only usable for port 0. */
|
||||||
|
RARCH_FAST_FORWARD_KEY = RARCH_FIRST_META_KEY,
|
||||||
|
RARCH_FAST_FORWARD_HOLD_KEY,
|
||||||
|
RARCH_LOAD_STATE_KEY,
|
||||||
|
RARCH_SAVE_STATE_KEY,
|
||||||
|
RARCH_FULLSCREEN_TOGGLE_KEY,
|
||||||
|
RARCH_QUIT_KEY,
|
||||||
|
RARCH_STATE_SLOT_PLUS,
|
||||||
|
RARCH_STATE_SLOT_MINUS,
|
||||||
|
RARCH_REWIND,
|
||||||
|
RARCH_MOVIE_RECORD_TOGGLE,
|
||||||
|
RARCH_PAUSE_TOGGLE,
|
||||||
|
RARCH_FRAMEADVANCE,
|
||||||
|
RARCH_RESET,
|
||||||
|
RARCH_SHADER_NEXT,
|
||||||
|
RARCH_SHADER_PREV,
|
||||||
|
RARCH_CHEAT_INDEX_PLUS,
|
||||||
|
RARCH_CHEAT_INDEX_MINUS,
|
||||||
|
RARCH_CHEAT_TOGGLE,
|
||||||
|
RARCH_SCREENSHOT,
|
||||||
|
RARCH_MUTE,
|
||||||
|
RARCH_OSK,
|
||||||
|
RARCH_NETPLAY_FLIP,
|
||||||
|
RARCH_SLOWMOTION,
|
||||||
|
RARCH_ENABLE_HOTKEY,
|
||||||
|
RARCH_VOLUME_UP,
|
||||||
|
RARCH_VOLUME_DOWN,
|
||||||
|
RARCH_OVERLAY_NEXT,
|
||||||
|
RARCH_DISK_EJECT_TOGGLE,
|
||||||
|
RARCH_DISK_NEXT,
|
||||||
|
RARCH_DISK_PREV,
|
||||||
|
RARCH_GRAB_MOUSE_TOGGLE,
|
||||||
|
|
||||||
|
RARCH_MENU_TOGGLE,
|
||||||
|
|
||||||
|
RARCH_BIND_LIST_END,
|
||||||
|
RARCH_BIND_LIST_END_NULL
|
||||||
|
};
|
||||||
|
|
||||||
enum analog_dpad_mode
|
enum analog_dpad_mode
|
||||||
{
|
{
|
||||||
ANALOG_DPAD_NONE = 0,
|
ANALOG_DPAD_NONE = 0,
|
||||||
@ -48,8 +113,6 @@ enum analog_dpad_mode
|
|||||||
* Analog binds use RETRO_DEVICE_ANALOG, but we follow the same scheme
|
* Analog binds use RETRO_DEVICE_ANALOG, but we follow the same scheme
|
||||||
* internally in RetroArch for simplicity, so they are mapped into [16, 23].
|
* internally in RetroArch for simplicity, so they are mapped into [16, 23].
|
||||||
*/
|
*/
|
||||||
#define RARCH_FIRST_CUSTOM_BIND 16
|
|
||||||
#define RARCH_FIRST_META_KEY RARCH_CUSTOM_BIND_LIST_END
|
|
||||||
|
|
||||||
#define AXIS_NEG(x) (((uint32_t)(x) << 16) | UINT16_C(0xFFFF))
|
#define AXIS_NEG(x) (((uint32_t)(x) << 16) | UINT16_C(0xFFFF))
|
||||||
#define AXIS_POS(x) ((uint32_t)(x) | UINT32_C(0xFFFF0000))
|
#define AXIS_POS(x) ((uint32_t)(x) | UINT32_C(0xFFFF0000))
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "input_keyboard.h"
|
#include "input_keyboard.h"
|
||||||
#include "input_remapping.h"
|
#include "input_remapping.h"
|
||||||
|
|
||||||
|
#include "../driver.h"
|
||||||
#include "../retroarch.h"
|
#include "../retroarch.h"
|
||||||
#include "../runloop.h"
|
#include "../runloop.h"
|
||||||
#include "../movie.h"
|
#include "../movie.h"
|
||||||
|
@ -25,15 +25,12 @@
|
|||||||
#include <retro_common_api.h>
|
#include <retro_common_api.h>
|
||||||
|
|
||||||
#include "input_joypad_driver.h"
|
#include "input_joypad_driver.h"
|
||||||
|
#include "input_defines.h"
|
||||||
|
|
||||||
#ifdef HAVE_OVERLAY
|
#ifdef HAVE_OVERLAY
|
||||||
#include "input_overlay.h"
|
#include "input_overlay.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MAX_USERS
|
|
||||||
#define MAX_USERS 16
|
|
||||||
#endif
|
|
||||||
|
|
||||||
RETRO_BEGIN_DECLS
|
RETRO_BEGIN_DECLS
|
||||||
|
|
||||||
typedef struct retro_input
|
typedef struct retro_input
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "location_driver.h"
|
#include "location_driver.h"
|
||||||
|
|
||||||
#include "../configuration.h"
|
#include "../configuration.h"
|
||||||
|
#include "../driver.h"
|
||||||
#include "../retroarch.h"
|
#include "../retroarch.h"
|
||||||
#include "../runloop.h"
|
#include "../runloop.h"
|
||||||
#include "../system.h"
|
#include "../system.h"
|
||||||
|
6
system.h
6
system.h
@ -20,11 +20,7 @@
|
|||||||
#include <retro_common_api.h>
|
#include <retro_common_api.h>
|
||||||
#include <libretro.h>
|
#include <libretro.h>
|
||||||
|
|
||||||
#include "driver.h"
|
#include "input/input_defines.h"
|
||||||
|
|
||||||
#ifndef MAX_USERS
|
|
||||||
#define MAX_USERS 16
|
|
||||||
#endif
|
|
||||||
|
|
||||||
RETRO_BEGIN_DECLS
|
RETRO_BEGIN_DECLS
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user