claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

19
src/mouse_ps2.c
View File

@@ -1,3 +1,4 @@
#include <stdlib.h>
#include "ibm.h"
#include "keyboard_at.h"
#include "mouse.h"
@@ -148,16 +149,16 @@ void mouse_ps2_write(uint8_t val, void *p)
}
}
void mouse_ps2_poll(int x, int y, int z, int b, void *p)
uint8_t mouse_ps2_poll(int x, int y, int z, int b, void *p)
{
mouse_ps2_t *mouse = (mouse_ps2_t *)p;
uint8_t packet[3] = {0x08, 0, 0};
if (!x && !y && !z && b == mouse->b)
return;
return(0xff);
if (!mouse_scan)
return;
return(0xff);
mouse->x += x;
mouse->y -= y;
@@ -200,6 +201,8 @@ void mouse_ps2_poll(int x, int y, int z, int b, void *p)
mouse->x = mouse->y = mouse->z = 0;
}
return(0);
}
void *mouse_ps2_init()
@@ -237,16 +240,18 @@ void mouse_ps2_close(void *p)
mouse_t mouse_ps2_2_button =
{
"2-button mouse (PS/2)",
"ps2",
MOUSE_TYPE_PS2,
mouse_ps2_init,
mouse_ps2_close,
mouse_ps2_poll,
MOUSE_TYPE_PS2
mouse_ps2_poll
};
mouse_t mouse_intellimouse =
{
"Microsoft Intellimouse (PS/2)",
"intellimouse",
MOUSE_TYPE_PS2 | MOUSE_TYPE_3BUTTON,
mouse_intellimouse_init,
mouse_ps2_close,
mouse_ps2_poll,
MOUSE_TYPE_PS2 | MOUSE_TYPE_3BUTTON
mouse_ps2_poll
};