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

109
src/joystick_standard.c
View File

@@ -8,6 +8,7 @@
static void *joystick_standard_init()
{
return NULL;
}
static void joystick_standard_close(void *p)
@@ -79,6 +80,8 @@ static int joystick_standard_read_axis(void *p, int axis)
if (!JOYSTICK_PRESENT(1))
return AXIS_NOT_PRESENT;
return joystick_state[1].axis[1];
default:
return 0;
}
}
@@ -97,6 +100,8 @@ static int joystick_standard_read_axis_4button(void *p, int axis)
return 0;
case 3:
return 0;
default:
return 0;
}
}
static int joystick_standard_read_axis_6button(void *p, int axis)
@@ -114,6 +119,8 @@ static int joystick_standard_read_axis_6button(void *p, int axis)
return joystick_state[0].button[4] ? -32767 : 32768;
case 3:
return joystick_state[0].button[5] ? -32767 : 32768;
default:
return 0;
}
}
static int joystick_standard_read_axis_8button(void *p, int axis)
@@ -139,6 +146,8 @@ static int joystick_standard_read_axis_8button(void *p, int axis)
if (joystick_state[0].button[7])
return 32768;
return 0;
default:
return 0;
}
}
@@ -148,61 +157,65 @@ static void joystick_standard_a0_over(void *p)
joystick_if_t joystick_standard =
{
.name = "Standard 2-button joystick(s)",
.init = joystick_standard_init,
.close = joystick_standard_close,
.read = joystick_standard_read,
.write = joystick_standard_write,
.read_axis = joystick_standard_read_axis,
.a0_over = joystick_standard_a0_over,
.max_joysticks = 2,
.axis_count = 2,
.button_count = 2,
.axis_names = {"X axis", "Y axis"},
.button_names = {"Button 1", "Button 2"}
"Standard 2-button joystick(s)",
joystick_standard_init,
joystick_standard_close,
joystick_standard_read,
joystick_standard_write,
joystick_standard_read_axis,
joystick_standard_a0_over,
2,
2,
2,
0,
{"X axis", "Y axis"},
{"Button 1", "Button 2"}
};
joystick_if_t joystick_standard_4button =
{
.name = "Standard 4-button joystick",
.init = joystick_standard_init,
.close = joystick_standard_close,
.read = joystick_standard_read_4button,
.write = joystick_standard_write,
.read_axis = joystick_standard_read_axis_4button,
.a0_over = joystick_standard_a0_over,
.max_joysticks = 1,
.axis_count = 2,
.button_count = 4,
.axis_names = {"X axis", "Y axis"},
.button_names = {"Button 1", "Button 2", "Button 3", "Button 4"}
"Standard 4-button joystick",
joystick_standard_init,
joystick_standard_close,
joystick_standard_read_4button,
joystick_standard_write,
joystick_standard_read_axis_4button,
joystick_standard_a0_over,
1,
2,
4,
0,
{"X axis", "Y axis"},
{"Button 1", "Button 2", "Button 3", "Button 4"}
};
joystick_if_t joystick_standard_6button =
{
.name = "Standard 6-button joystick",
.init = joystick_standard_init,
.close = joystick_standard_close,
.read = joystick_standard_read_4button,
.write = joystick_standard_write,
.read_axis = joystick_standard_read_axis_6button,
.a0_over = joystick_standard_a0_over,
.max_joysticks = 1,
.axis_count = 2,
.button_count = 6,
.axis_names = {"X axis", "Y axis"},
.button_names = {"Button 1", "Button 2", "Button 3", "Button 4", "Button 5", "Button 6"}
"Standard 6-button joystick",
joystick_standard_init,
joystick_standard_close,
joystick_standard_read_4button,
joystick_standard_write,
joystick_standard_read_axis_6button,
joystick_standard_a0_over,
1,
2,
6,
0,
{"X axis", "Y axis"},
{"Button 1", "Button 2", "Button 3", "Button 4", "Button 5", "Button 6"}
};
joystick_if_t joystick_standard_8button =
{
.name = "Standard 8-button joystick",
.init = joystick_standard_init,
.close = joystick_standard_close,
.read = joystick_standard_read_4button,
.write = joystick_standard_write,
.read_axis = joystick_standard_read_axis_8button,
.a0_over = joystick_standard_a0_over,
.max_joysticks = 1,
.axis_count = 2,
.button_count = 8,
.axis_names = {"X axis", "Y axis"},
.button_names = {"Button 1", "Button 2", "Button 3", "Button 4", "Button 5", "Button 6", "Button 7", "Button 8"}
"Standard 8-button joystick",
joystick_standard_init,
joystick_standard_close,
joystick_standard_read_4button,
joystick_standard_write,
joystick_standard_read_axis_8button,
joystick_standard_a0_over,
1,
2,
8,
0,
{"X axis", "Y axis"},
{"Button 1", "Button 2", "Button 3", "Button 4", "Button 5", "Button 6", "Button 7", "Button 8"}
};