Merge joystick_*.h into gameport.h
Just like it was done to all headers with only device declarations years ago
This commit is contained in:
Alexander Babikov
@@ -31,10 +31,6 @@
|
|||||||
#include <86box/timer.h>
|
#include <86box/timer.h>
|
||||||
#include <86box/isapnp.h>
|
#include <86box/isapnp.h>
|
||||||
#include <86box/gameport.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>
|
#include <86box/plat_unused.h>
|
||||||
|
|
||||||
typedef struct g_axis_t {
|
typedef struct g_axis_t {
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
#include <86box/device.h>
|
#include <86box/device.h>
|
||||||
#include <86box/timer.h>
|
#include <86box/timer.h>
|
||||||
#include <86box/gameport.h>
|
#include <86box/gameport.h>
|
||||||
#include <86box/joystick_standard.h>
|
|
||||||
#include <86box/plat_unused.h>
|
#include <86box/plat_unused.h>
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
#include <86box/device.h>
|
#include <86box/device.h>
|
||||||
#include <86box/timer.h>
|
#include <86box/timer.h>
|
||||||
#include <86box/gameport.h>
|
#include <86box/gameport.h>
|
||||||
#include <86box/joystick_standard.h>
|
|
||||||
#include <86box/plat_unused.h>
|
#include <86box/plat_unused.h>
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
|
|||||||
@@ -64,7 +64,6 @@
|
|||||||
#include <86box/device.h>
|
#include <86box/device.h>
|
||||||
#include <86box/timer.h>
|
#include <86box/timer.h>
|
||||||
#include <86box/gameport.h>
|
#include <86box/gameport.h>
|
||||||
#include <86box/joystick_sw_pad.h>
|
|
||||||
#include <86box/plat_unused.h>
|
#include <86box/plat_unused.h>
|
||||||
|
|
||||||
typedef struct sw_data {
|
typedef struct sw_data {
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
#include <86box/device.h>
|
#include <86box/device.h>
|
||||||
#include <86box/timer.h>
|
#include <86box/timer.h>
|
||||||
#include <86box/gameport.h>
|
#include <86box/gameport.h>
|
||||||
#include <86box/joystick_standard.h>
|
|
||||||
#include <86box/plat_unused.h>
|
#include <86box/plat_unused.h>
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
|
|||||||
@@ -154,6 +154,19 @@ extern void gameport_update_joystick_type(void);
|
|||||||
extern void gameport_remap(void *priv, uint16_t address);
|
extern void gameport_remap(void *priv, uint16_t address);
|
||||||
extern void *gameport_add(const device_t *gameport_type);
|
extern void *gameport_add(const device_t *gameport_type);
|
||||||
|
|
||||||
|
extern const joystick_if_t joystick_2axis_2button;
|
||||||
|
extern const joystick_if_t joystick_2axis_4button;
|
||||||
|
extern const joystick_if_t joystick_3axis_2button;
|
||||||
|
extern const joystick_if_t joystick_3axis_4button;
|
||||||
|
extern const joystick_if_t joystick_4axis_4button;
|
||||||
|
extern const joystick_if_t joystick_2axis_6button;
|
||||||
|
extern const joystick_if_t joystick_2axis_8button;
|
||||||
|
|
||||||
|
extern const joystick_if_t joystick_ch_flightstick_pro;
|
||||||
|
|
||||||
|
extern const joystick_if_t joystick_sw_pad;
|
||||||
|
|
||||||
|
extern const joystick_if_t joystick_tm_fcs;
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* 86Box A hypervisor and IBM PC system emulator that specializes in
|
|
||||||
* running old operating systems and software designed for IBM
|
|
||||||
* PC systems and compatibles from 1981 through fairly recent
|
|
||||||
* system designs based on the PCI bus.
|
|
||||||
*
|
|
||||||
* This file is part of the 86Box distribution.
|
|
||||||
*
|
|
||||||
* Definitions for the Flight Stick Pro driver.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* Authors: Miran Grca, <mgrca8@gmail.com>
|
|
||||||
* Sarah Walker, <https://pcem-emulator.co.uk/>
|
|
||||||
*
|
|
||||||
* Copyright 2016-2018 Miran Grca.
|
|
||||||
* Copyright 2008-2018 Sarah Walker.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the:
|
|
||||||
*
|
|
||||||
* Free Software Foundation, Inc.
|
|
||||||
* 59 Temple Place - Suite 330
|
|
||||||
* Boston, MA 02111-1307
|
|
||||||
* USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H
|
|
||||||
#define EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H
|
|
||||||
|
|
||||||
extern const joystick_if_t joystick_ch_flightstick_pro;
|
|
||||||
|
|
||||||
#endif /*EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H*/
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
/*
|
|
||||||
* 86Box A hypervisor and IBM PC system emulator that specializes in
|
|
||||||
* running old operating systems and software designed for IBM
|
|
||||||
* PC systems and compatibles from 1981 through fairly recent
|
|
||||||
* system designs based on the PCI bus.
|
|
||||||
*
|
|
||||||
* This file is part of the 86Box distribution.
|
|
||||||
*
|
|
||||||
* Definitions for the joystick driver.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* Authors: Miran Grca, <mgrca8@gmail.com>
|
|
||||||
* Sarah Walker, <https://pcem-emulator.co.uk/>
|
|
||||||
*
|
|
||||||
* Copyright 2016-2018 Miran Grca.
|
|
||||||
* Copyright 2008-2018 Sarah Walker.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the:
|
|
||||||
*
|
|
||||||
* Free Software Foundation, Inc.
|
|
||||||
* 59 Temple Place - Suite 330
|
|
||||||
* Boston, MA 02111-1307
|
|
||||||
* USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef EMU_JOYSTICK_STANDARD_H
|
|
||||||
#define EMU_JOYSTICK_STANDARD_H
|
|
||||||
|
|
||||||
extern const joystick_if_t joystick_2axis_2button;
|
|
||||||
extern const joystick_if_t joystick_2axis_4button;
|
|
||||||
extern const joystick_if_t joystick_3axis_2button;
|
|
||||||
extern const joystick_if_t joystick_3axis_4button;
|
|
||||||
extern const joystick_if_t joystick_4axis_4button;
|
|
||||||
extern const joystick_if_t joystick_2axis_6button;
|
|
||||||
extern const joystick_if_t joystick_2axis_8button;
|
|
||||||
|
|
||||||
#endif /*EMU_JOYSTICK_STANDARD_H*/
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* 86Box A hypervisor and IBM PC system emulator that specializes in
|
|
||||||
* running old operating systems and software designed for IBM
|
|
||||||
* PC systems and compatibles from 1981 through fairly recent
|
|
||||||
* system designs based on the PCI bus.
|
|
||||||
*
|
|
||||||
* This file is part of the 86Box distribution.
|
|
||||||
*
|
|
||||||
* Definitions for the Sidewinder Pro driver.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* Authors: Miran Grca, <mgrca8@gmail.com>
|
|
||||||
* Sarah Walker, <https://pcem-emulator.co.uk/>
|
|
||||||
*
|
|
||||||
* Copyright 2016-2018 Miran Grca.
|
|
||||||
* Copyright 2008-2018 Sarah Walker.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the:
|
|
||||||
*
|
|
||||||
* Free Software Foundation, Inc.
|
|
||||||
* 59 Temple Place - Suite 330
|
|
||||||
* Boston, MA 02111-1307
|
|
||||||
* USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef EMU_JOYSTICK_SW_PAD_H
|
|
||||||
#define EMU_JOYSTICK_SW_PAD_H
|
|
||||||
|
|
||||||
extern const joystick_if_t joystick_sw_pad;
|
|
||||||
|
|
||||||
#endif /*EMU_JOYSTICK_SW_PAD_H*/
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* 86Box A hypervisor and IBM PC system emulator that specializes in
|
|
||||||
* running old operating systems and software designed for IBM
|
|
||||||
* PC systems and compatibles from 1981 through fairly recent
|
|
||||||
* system designs based on the PCI bus.
|
|
||||||
*
|
|
||||||
* This file is part of the 86Box distribution.
|
|
||||||
*
|
|
||||||
* Definitions for the Flight Control System driver.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* Authors: Miran Grca, <mgrca8@gmail.com>
|
|
||||||
* Sarah Walker, <https://pcem-emulator.co.uk/>
|
|
||||||
*
|
|
||||||
* Copyright 2016-2018 Miran Grca.
|
|
||||||
* Copyright 2008-2018 Sarah Walker.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the:
|
|
||||||
*
|
|
||||||
* Free Software Foundation, Inc.
|
|
||||||
* 59 Temple Place - Suite 330
|
|
||||||
* Boston, MA 02111-1307
|
|
||||||
* USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef EMU_JOYSTICK_TM_FCS_H
|
|
||||||
#define EMU_JOYSTICK_TM_FCS_H
|
|
||||||
|
|
||||||
extern const joystick_if_t joystick_tm_fcs;
|
|
||||||
|
|
||||||
#endif /*EMU_JOYSTICK_TM_FCS_H*/
|
|
||||||
Reference in New Issue
Block a user