claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vastly overhauled the UI, there's now a completely new Settings dialog as well as a status bar with disk activity icons and removable drive menus;

Browse Source 
Thoroughly clean up the code to vastly reduce the number of compiler warnings and found and fixed several bugs in the process;
Applied all mainline PCem commits;
Added SCSI hard disk emulation;
Commented out all unfinished machines and graphics cards;
Added the AOpen AP53 and ASUS P/I-P55T2 machines as well as another Tyan 440FX machine, all three with AMI WinBIOS (patch from TheCollector1995);
Added the Diamond Stealth 3D 3000 (S3 ViRGE/VX) graphics card (patch from TheCollector1995);
Added the PS/2 XT IDE (AccuLogic) HDD Controller (patch from TheCollector1995);
Added Microsoft/Logitech Bus Mouse emulation (patch from waltje);
Overhauled the makefiles (patch from waltje);
Added the Adaptec AHA-1542CF SCSI controller (patch from waltje);
Added preliminary (but still unfinished) Adaptec AHA-154x SCSI controller BIOS support (patch from waltje);
Added an ISABugger debugging device (patch from waltje);
Added sanity checks to the Direct3D code.
This commit is contained in:
OBattler
2017-05-05 01:49:42 +02:00
parent d07d53962c
commit f6ef1f833c
346 changed files with 24292 additions and 18058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/joystick_ch_flightstick_pro.c
View File

@@ -8,6 +8,7 @@
static void *ch_flightstick_pro_init()
{
return NULL;
}
static void ch_flightstick_pro_close(void *p)
@@ -63,6 +64,8 @@ static int ch_flightstick_pro_read_axis(void *p, int axis)
return 0;
case 3:
return joystick_state[0].axis[2];
default:
return 0;
}
}
@@ -72,18 +75,18 @@ static void ch_flightstick_pro_a0_over(void *p)
joystick_if_t joystick_ch_flightstick_pro =
{
.name = "CH Flightstick Pro",
.init = ch_flightstick_pro_init,
.close = ch_flightstick_pro_close,
.read = ch_flightstick_pro_read,
.write = ch_flightstick_pro_write,
.read_axis = ch_flightstick_pro_read_axis,
.a0_over = ch_flightstick_pro_a0_over,
.max_joysticks = 1,
.axis_count = 3,
.button_count = 4,
.pov_count = 1,
.axis_names = {"X axis", "Y axis", "Throttle"},
.button_names = {"Button 1", "Button 2", "Button 3", "Button 4"},
.pov_names = {"POV"}
"CH Flightstick Pro",
ch_flightstick_pro_init,
ch_flightstick_pro_close,
ch_flightstick_pro_read,
ch_flightstick_pro_write,
ch_flightstick_pro_read_axis,
ch_flightstick_pro_a0_over,
1,
3,
4,
1,
{"X axis", "Y axis", "Throttle"},
{"Button 1", "Button 2", "Button 3", "Button 4"},
{"POV"}
};