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

Re-worked mouse code to be devices (to allow for configuration.)

Browse Source 
Re-worked the system pathnames (pc.c), renamed cfg_path to usr_path.
Other small things here and there.
Logitech bus mouse re-worked, should be OK now.
This commit is contained in:
waltje
2017-12-04 11:59:26 -05:00
parent 5bf569759e
commit fc34a6eaf3
35 changed files with 1630 additions and 1308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

251
src/mouse_serial.c
View File

@@ -8,9 +8,9 @@
*
* Implementation of Serial Mouse devices.
*
* Based on the 86Box Serial Mouse driver as a framework.
* TODO: Add the Genius Serial Mouse.
*
* Version: @(#)mouse_serial.c 1.0.13 2017/11/13
* Version: @(#)mouse_serial.c 1.0.14 2017/12/03
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
@@ -19,31 +19,46 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "86box.h"
#include "config.h"
#include "device.h"
#include "timer.h"
#include "serial.h"
#include "mouse.h"
typedef struct mouse_serial_t {
char *name;
int8_t port,
type;
#define SERMOUSE_PORT 0 /* attach to Serial0 */
typedef struct {
const char *name; /* name of this device */
int8_t type, /* type of this device */
port;
uint8_t flags; /* device flags */
int pos;
int64_t delay;
int oldb;
SERIAL *serial;
} mouse_serial_t;
} mouse_t;
#define FLAG_INPORT 0x80 /* device is MS InPort */
#define FLAG_3BTN 0x20 /* enable 3-button mode */
#define FLAG_SCALED 0x10 /* enable delta scaling */
#define FLAG_INTR 0x04 /* dev can send interrupts */
#define FLAG_FROZEN 0x02 /* do not update counters */
#define FLAG_ENABLED 0x01 /* dev is enabled for use */
/* Callback from serial driver: RTS was toggled. */
static void
sermouse_callback(struct SERIAL *serial, void *priv)
{
mouse_serial_t *ms = (mouse_serial_t *)priv;
mouse_t *dev = (mouse_t *)priv;
/* Start a timer to wake us up in a little while. */
ms->pos = -1;
ms->delay = 5000LL * (1LL << TIMER_SHIFT);
dev->pos = -1;
dev->delay = 5000LL * (1LL << TIMER_SHIFT);
}
@@ -51,63 +66,69 @@ sermouse_callback(struct SERIAL *serial, void *priv)
static void
sermouse_timer(void *priv)
{
mouse_serial_t *ms = (mouse_serial_t *)priv;
mouse_t *dev = (mouse_t *)priv;
ms->delay = 0LL;
dev->delay = 0LL;
if (ms->pos != -1) return;
if (dev->pos != -1) return;
ms->pos = 0;
switch(ms->type & MOUSE_TYPE_MASK) {
dev->pos = 0;
switch(dev->type & MOUSE_TYPE_MASK) {
case MOUSE_TYPE_MSYSTEMS:
/* Identifies Mouse Systems serial mouse. */
serial_write_fifo(ms->serial, 'H');
serial_write_fifo(dev->serial, 'H');
break;
case MOUSE_TYPE_MICROSOFT:
default:
/* Identifies a two-button Microsoft Serial mouse. */
serial_write_fifo(ms->serial, 'M');
serial_write_fifo(dev->serial, 'M');
break;
case MOUSE_TYPE_LOGITECH:
/* Identifies a two-button Logitech Serial mouse. */
serial_write_fifo(ms->serial, 'M');
serial_write_fifo(ms->serial, '3');
serial_write_fifo(dev->serial, 'M');
serial_write_fifo(dev->serial, '3');
break;
case MOUSE_TYPE_MSWHEEL:
/* Identifies multi-button Microsoft Wheel Mouse. */
serial_write_fifo(ms->serial, 'M');
serial_write_fifo(ms->serial, 'Z');
serial_write_fifo(dev->serial, 'M');
serial_write_fifo(dev->serial, 'Z');
break;
default:
pclog("%s: unsupported mouse type %d?\n", dev->type);
}
}
static uint8_t
static int
sermouse_poll(int x, int y, int z, int b, void *priv)
{
mouse_serial_t *ms = (mouse_serial_t *)priv;
mouse_t *dev = (mouse_t *)priv;
uint8_t buff[16];
int len;
if (!x && !y && b == ms->oldb) return(1);
if (!x && !y && b == dev->oldb) return(1);
ms->oldb = b;
#if 0
pclog("%s: poll(%d,%d,%d,%02x)\n", dev->name, x, y, z, b);
#endif
if (x>127) x = 127;
if (y>127) y = 127;
if (x<-128) x = -128;
if (y<-128) y = -128;
dev->oldb = b;
if (x > 127) x = 127;
if (y > 127) y = 127;
if (x <- 128) x = -128;
if (y <- 128) y = -128;
len = 0;
switch(ms->type & MOUSE_TYPE_MASK) {
switch(dev->type & MOUSE_TYPE_MASK) {
case MOUSE_TYPE_MSYSTEMS:
buff[0] = 0x80;
buff[0] |= (b&0x01) ? 0x00 : 0x04; /* left button */
buff[0] |= (b&0x02) ? 0x00 : 0x01; /* middle button */
buff[0] |= (b&0x04) ? 0x00 : 0x02; /* right button */
buff[0] |= (b & 0x01) ? 0x00 : 0x04; /* left button */
buff[0] |= (b & 0x02) ? 0x00 : 0x01; /* middle button */
buff[0] |= (b & 0x04) ? 0x00 : 0x02; /* right button */
buff[1] = x;
buff[2] = -y;
buff[3] = x; /* same as byte 1 */
@@ -117,10 +138,10 @@ sermouse_poll(int x, int y, int z, int b, void *priv)
case MOUSE_TYPE_MICROSOFT:
buff[0] = 0x40;
buff[0] |= (((y>>6)&0x03)<<2);
buff[0] |= ((x>>6)&0x03);
if (b&0x01) buff[0] |= 0x20;
if (b&0x02) buff[0] |= 0x10;
buff[0] |= (((y >> 6) & 0x03) << 2);
buff[0] |= ((x >> 6) & 0x03);
if (b & 0x01) buff[0] |= 0x20;
if (b & 0x02) buff[0] |= 0x10;
buff[1] = x & 0x3F;
buff[2] = y & 0x3F;
len = 3;
@@ -128,14 +149,14 @@ sermouse_poll(int x, int y, int z, int b, void *priv)
case MOUSE_TYPE_LOGITECH:
buff[0] = 0x40;
buff[0] |= (((y>>6)&0x03)<<2);
buff[0] |= ((x>>6)&0x03);
if (b&0x01) buff[0] |= 0x20;
if (b&0x02) buff[0] |= 0x10;
buff[0] |= (((y >> 6) & 0x03) << 2);
buff[0] |= ((x >> 6) & 0x03);
if (b & 0x01) buff[0] |= 0x20;
if (b & 0x02) buff[0] |= 0x10;
buff[1] = x & 0x3F;
buff[2] = y & 0x3F;
len = 3;
if (b&0x04) {
if (b & 0x04) {
buff[3] = 0x20;
len++;
}
@@ -143,28 +164,28 @@ sermouse_poll(int x, int y, int z, int b, void *priv)
case MOUSE_TYPE_MSWHEEL:
buff[0] = 0x40;
buff[0] |= (((y>>6)&0x03)<<2);
buff[0] |= ((x>>6)&0x03);
if (b&0x01) buff[0] |= 0x20;
if (b&0x02) buff[0] |= 0x10;
buff[0] |= (((y >> 6) & 0x03) << 2);
buff[0] |= ((x >> 6) & 0x03);
if (b & 0x01) buff[0] |= 0x20;
if (b & 0x02) buff[0] |= 0x10;
buff[1] = x & 0x3F;
buff[2] = y & 0x3F;
buff[3] = z & 0x0F;
if (b&0x04)
if (b & 0x04)
buff[3] |= 0x10;
len = 4;
}
#if 0
pclog("Mouse_Serial(%d): [", ms->type);
pclog("%s: [", dev->name);
for (b=0; b<len; b++) pclog(" %02X", buff[b]);
pclog(" ] (%d)\n", len);
#endif
/* Send the packet to the bottom-half of the attached port. */
for (b=0; b<len; b++)
serial_write_fifo(ms->serial, buff[b]);
serial_write_fifo(dev->serial, buff[b]);
return(0);
}
@@ -173,70 +194,118 @@ sermouse_poll(int x, int y, int z, int b, void *priv)
static void
sermouse_close(void *priv)
{
mouse_serial_t *ms = (mouse_serial_t *)priv;
mouse_t *dev = (mouse_t *)priv;
/* Detach serial port from the mouse. */
serial1.rcr_callback = NULL;
dev->serial->rcr_callback = NULL;
dev->serial->rcr_callback_p = NULL;
free(ms);
free(dev);
}
/* Initialize the device for use by the user. */
static void *
sermouse_init(mouse_t *info)
sermouse_init(device_t *info)
{
mouse_serial_t *ms = (mouse_serial_t *)malloc(sizeof(mouse_serial_t));
memset(ms, 0x00, sizeof(mouse_serial_t));
ms->name = (char *)info->name;
ms->port = SERMOUSE_PORT;
ms->type = info->type;
mouse_t *dev;
dev = (mouse_t *)malloc(sizeof(mouse_t));
memset(dev, 0x00, sizeof(mouse_t));
dev->name = info->name;
dev->type = info->local;
#if NOTYET
dev->port = device_get_config_int("port");
#else
dev->port = config_get_int((char *)info->name, "port", SERMOUSE_PORT);
#endif
/* Attach a serial port to the mouse. */
ms->serial = &serial1;
ms->serial->rcr_callback = sermouse_callback;
ms->serial->rcr_callback_p = ms;
if (dev->port == 0)
dev->serial = &serial1;
else
dev->serial = &serial2;
dev->serial->rcr_callback = sermouse_callback;
dev->serial->rcr_callback_p = dev;
timer_add(sermouse_timer, &ms->delay, &ms->delay, ms);
pclog("%s: port=COM%d\n", dev->name, dev->port+1);
return(ms);
timer_add(sermouse_timer, &dev->delay, &dev->delay, dev);
/* Return our private data to the I/O layer. */
return(dev);
}
mouse_t mouse_serial_msystems = {
"Mouse Systems Mouse (serial)",
"mssystems",
static device_config_t sermouse_config[] = {
{
"buttons", "Buttons", CONFIG_SELECTION, "", 2, {
{
"Two", 2
},
{
"Three", 3
},
{
"Wheel", 4
},
{
""
}
}
},
{
"port", "Serial Port", CONFIG_SELECTION, "", 0, {
{
"COM1", 0
},
{
"COM2", 1
},
{
""
}
}
},
{
"", "", -1
}
};
device_t mouse_mssystems_device = {
"Mouse Systems Serial Mouse",
0,
MOUSE_TYPE_MSYSTEMS | MOUSE_TYPE_3BUTTON,
sermouse_init,
sermouse_close,
sermouse_poll
sermouse_init, sermouse_close, NULL,
sermouse_poll, NULL, NULL, NULL,
sermouse_config
};
mouse_t mouse_serial_microsoft = {
"Microsoft 2-button mouse (serial)",
"msserial",
device_t mouse_msserial_device = {
"Microsoft 2-button Serial Mouse",
0,
MOUSE_TYPE_MICROSOFT,
sermouse_init,
sermouse_close,
sermouse_poll
sermouse_init, sermouse_close, NULL,
sermouse_poll, NULL, NULL, NULL,
sermouse_config
};
mouse_t mouse_serial_logitech = {
"Logitech 3-button mouse (serial)",
"lserial",
device_t mouse_lserial_device = {
"Logitech 3-button Serial Mouse",
0,
MOUSE_TYPE_LOGITECH | MOUSE_TYPE_3BUTTON,
sermouse_init,
sermouse_close,
sermouse_poll
sermouse_init, sermouse_close, NULL,
sermouse_poll, NULL, NULL, NULL,
sermouse_config
};
mouse_t mouse_serial_mswheel = {
"Microsoft wheel mouse (serial)",
"mswheel",
device_t mouse_mswheel_device = {
"Microsoft Serial Wheel Mouse",
0,
MOUSE_TYPE_MSWHEEL | MOUSE_TYPE_3BUTTON,
sermouse_init,
sermouse_close,
sermouse_poll
sermouse_init, sermouse_close, NULL,
sermouse_poll, NULL, NULL, NULL,
sermouse_config
};