Interim cleanup with several small (but, as it turned out, fatal) bugs fixed. This commit mostly cleans the mouse code, but a second commit will finalize those changes.

This commit is contained in:
waltje
2017-10-26 04:54:50 -04:00
parent fd432b8eb1
commit 4eba751cb0
13 changed files with 439 additions and 860 deletions

View File

@@ -32,10 +32,9 @@
* Based on an early driver for MINIX 1.5.
* Based on the 86Box PS/2 mouse driver as a framework.
*
* Version: @(#)mouse_bus.c 1.0.10 2017/10/16
* Version: @(#)mouse_bus.c 1.0.20 2017/10/25
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* TheCollector1995
*
* Copyright 1989-2017 Fred N. van Kempen.
*/
@@ -62,7 +61,8 @@
/* Our mouse device. */
typedef struct mouse_bus {
int8_t type;
char *name; /* name of this device */
int8_t type; /* type of this device */
uint8_t flags; /* device flags */
uint16_t port; /* I/O port range start */
uint16_t portlen; /* length of I/O port range */
@@ -80,15 +80,16 @@ typedef struct mouse_bus {
void (*write)(struct mouse_bus *, uint16_t, uint8_t);
} mouse_bus_t;
#define MOUSE_ENABLED 0x80 /* device is enabled for use */
#define MOUSE_SCALED 0x40 /* enable delta scaling */
#define MOUSE_FROZEN 0x01 /* do not update counters */
/* Definitions for Logitech. */
#define LTMOUSE_DATA 0 /* DATA register */
#define LTMOUSE_MAGIC 1 /* signature magic register */
#define MOUSE_DATA 0 /* DATA register */
#define MOUSE_MAGIC 1 /* signature magic register */
# define MAGIC_BYTE1 0xa5 /* most drivers use this */
# define MAGIC_BYTE2 0x5a /* some drivers use this */
#define LTMOUSE_CTRL 2 /* CTRL register */
#define MOUSE_CTRL 2 /* CTRL register */
# define CTRL_FREEZE 0x80 /* do not sample when set */
# define CTRL_RD_Y_HI 0x60 /* plus FREEZE */
# define CTRL_RD_Y_LO 0x40 /* plus FREEZE */
@@ -97,45 +98,31 @@ typedef struct mouse_bus {
# define CTRL_RD_MASK 0x60
# define CTRL_IDIS 0x10
# define CTRL_IENB 0x00
#define LTMOUSE_CONFIG 3 /* CONFIG register */
/* Definitions for Microsoft. */
#define MSMOUSE_CTRL 0 /* CTRL register */
# define MSCTRL_RESET 0x80
# define MSCTRL_MODE 0x07
# define MSCTRL_RD_Y 0x02
# define MSCTRL_RD_X 0x01
# define MSCTRL_RD_BUT 0x00
#define MSMOUSE_DATA 1 /* DATA register */
# define MSDATA_BASE 0x10
# define MSDATA_IRQ 0x01
#define MSMOUSE_MAGIC 2 /* MAGIC register */
# define MAGIC_MSBYTE1 0xde /* indicates MS InPort */
# define MAGIC_MSBYTE2 0xad
#define MSMOUSE_CONFIG 3 /* CONFIG register */
#define MOUSE_CONFIG 3 /* CONFIG register */
/* Handle a WRITE to a LOGITECH register. */
static void
lt_write(mouse_bus_t *ms, uint16_t port, uint8_t val)
{
uint8_t b = (ms->r_ctrl ^ val);
uint8_t b;
#if 0
pclog("BUSMOUSE: lt_write(%d,%02x)\n", port, val);
#endif
switch (port) {
case LTMOUSE_DATA: /* [00] data register */
case MOUSE_DATA: /* [00] data register */
break;
case LTMOUSE_MAGIC: /* [01] magic data register */
case MOUSE_MAGIC: /* [01] magic data register */
if (val == MAGIC_BYTE1 || val == MAGIC_BYTE2) {
ms->r_magic = val;
}
break;
case LTMOUSE_CTRL: /* [02] control register */
case MOUSE_CTRL: /* [02] control register */
b = (ms->r_ctrl ^ val);
if (b & CTRL_FREEZE) {
if (val & CTRL_FREEZE) {
/* Hold the sampling while we do something. */
@@ -159,7 +146,7 @@ lt_write(mouse_bus_t *ms, uint16_t port, uint8_t val)
ms->r_ctrl = val;
break;
case LTMOUSE_CONFIG: /* [03] config register */
case MOUSE_CONFIG: /* [03] config register */
ms->r_conf = val;
break;
@@ -176,7 +163,7 @@ lt_read(mouse_bus_t *ms, uint16_t port)
uint8_t r = 0xff;
switch (port) {
case LTMOUSE_DATA: /* [00] data register */
case MOUSE_DATA: /* [00] data register */
if (! (ms->r_ctrl & CTRL_FREEZE)) {
r = 0x00;
} else switch(ms->r_ctrl & CTRL_RD_MASK) {
@@ -228,7 +215,7 @@ lt_read(mouse_bus_t *ms, uint16_t port)
}
break;
case LTMOUSE_MAGIC: /* [01] magic data register */
case MOUSE_MAGIC: /* [01] magic data register */
/*
* Logitech drivers start out by blasting their magic
* value (0xA5) into this register, and then read it
@@ -239,7 +226,7 @@ lt_read(mouse_bus_t *ms, uint16_t port)
r = ms->r_magic;
break;
case LTMOUSE_CTRL: /* [02] control register */
case MOUSE_CTRL: /* [02] control register */
/*
* This is the weird stuff mentioned in the file header
* above. Microsoft's "mouse.exe" does some whacky stuff
@@ -272,7 +259,7 @@ lt_read(mouse_bus_t *ms, uint16_t port)
}
break;
case LTMOUSE_CONFIG: /* [03] config register */
case MOUSE_CONFIG: /* [03] config register */
r = ms->r_conf;
break;
@@ -292,7 +279,7 @@ lt_read(mouse_bus_t *ms, uint16_t port)
static void
lt_init(mouse_bus_t *ms)
{
pclog("Logitech Bus Mouse, I/O=%04x, IRQ=%d\n", ms->port, ms->irq);
pclog("BUSMOUSE: %s, I/O=%04x, IRQ=%d\n", ms->name, ms->port, ms->irq);
/* Initialize registers. */
ms->r_magic = 0x00;
@@ -310,7 +297,7 @@ lt_init(mouse_bus_t *ms)
/* Handle a WRITE operation to one of our registers. */
static void
busmouse_write(uint16_t port, uint8_t val, void *priv)
bm_write(uint16_t port, uint8_t val, void *priv)
{
mouse_bus_t *ms = (mouse_bus_t *)priv;
@@ -320,7 +307,7 @@ busmouse_write(uint16_t port, uint8_t val, void *priv)
/* Handle a READ operation from one of our registers. */
static uint8_t
busmouse_read(uint16_t port, void *priv)
bm_read(uint16_t port, void *priv)
{
mouse_bus_t *ms = (mouse_bus_t *)priv;
uint8_t r;
@@ -333,7 +320,7 @@ busmouse_read(uint16_t port, void *priv)
/* The emulator calls us with an update on the host mouse device. */
static uint8_t
busmouse_poll(int x, int y, int z, int b, void *priv)
bm_poll(int x, int y, int z, int b, void *priv)
{
mouse_bus_t *ms = (mouse_bus_t *)priv;
@@ -343,10 +330,16 @@ busmouse_poll(int x, int y, int z, int b, void *priv)
/* If we are not interested, return. */
if (!(ms->flags & MOUSE_ENABLED) || (ms->flags & MOUSE_FROZEN)) return(0);
#if 0
#if 1
pclog("BUSMOUSE: poll(%d,%d,%d, %02x)\n", x, y, z, b);
#endif
if (ms->flags & MOUSE_SCALED) {
/* Scale down the motion. */
if ((x < -1) || (x > 1)) x >>= 1;
if ((y < -1) || (y > 1)) y >>= 1;
}
/* Add the delta to our state. */
x += ms->x;
if (x > 127)
@@ -365,7 +358,7 @@ busmouse_poll(int x, int y, int z, int b, void *priv)
ms->but = b;
/* All set, generate an interrupt. */
if (! (ms->r_ctrl & CTRL_IDIS))
// if (! (ms->r_ctrl & CTRL_IDIS))
picint(1 << ms->irq);
return(0);
@@ -374,13 +367,13 @@ busmouse_poll(int x, int y, int z, int b, void *priv)
/* Release all resources held by the device. */
static void
busmouse_close(void *priv)
bm_close(void *priv)
{
mouse_bus_t *ms = (mouse_bus_t *)priv;
/* Release our I/O range. */
io_removehandler(ms->port, ms->portlen,
busmouse_read, NULL, NULL, busmouse_write, NULL, NULL, ms);
bm_read, NULL, NULL, bm_write, NULL, NULL, ms);
free(ms);
}
@@ -388,13 +381,14 @@ busmouse_close(void *priv)
/* Initialize the device for use by the user. */
static void *
busmouse_init(int type)
bm_init(mouse_t *info)
{
mouse_bus_t *ms;
pclog("BUSMOUSE: initializing as '%s'\n", info->name);
ms = (mouse_bus_t *)malloc(sizeof(mouse_bus_t));
memset(ms, 0x00, sizeof(mouse_bus_t));
ms->type = type;
ms->type = info->type;
ms->port = BUSMOUSE_PORT;
ms->portlen = BUSMOUSE_PORTLEN;
#if BUSMOUSE_IRQ
@@ -416,423 +410,27 @@ busmouse_init(int type)
/* Request an I/O range. */
io_sethandler(ms->port, ms->portlen,
busmouse_read, NULL, NULL, busmouse_write, NULL, NULL, ms);
bm_read, NULL, NULL, bm_write, NULL, NULL, ms);
/* Return our private data to the I/O layer. */
return(ms);
}
static void *
logibus_init(void)
{
return(busmouse_init(MOUSE_TYPE_LOGIBUS));
}
static void *
inport_init(void)
{
return(busmouse_init(MOUSE_TYPE_LOGIBUS));
}
#if 0
@@@@
#define BUS_MOUSE_IRQ 5
#define IRQ_MASK ((1<<5) >> BUS_MOUSE_IRQ)
/* MS Inport Bus Mouse Adapter. */
#define INP_PORT_CONTROL 0x023C
#define INP_PORT_DATA 0x023D
#define INP_PORT_SIGNATURE 0x023E
#define INP_PORT_CONFIG 0x023F
#define INP_CTRL_READ_BUTTONS 0x00
#define INP_CTRL_READ_X 0x01
#define INP_CTRL_READ_Y 0x02
#define INP_CTRL_COMMAND 0x07
#define INP_CTRL_RAISE_IRQ 0x16
#define INP_CTRL_RESET 0x80
#define INP_HOLD_COUNTER (1 << 5)
#define INP_ENABLE_IRQ (1 << 0)
/* MS/Logictech Standard Bus Mouse Adapter. */
#define BUSM_PORT_DATA 0x023C
#define BUSM_PORT_SIGNATURE 0x023D
#define BUSM_PORT_CONTROL 0x023E
#define BUSM_PORT_CONFIG 0x023F
#define HOLD_COUNTER (1 << 7)
#define READ_X (0 << 6)
#define READ_Y (1 << 6)
#define READ_LOW (0 << 5)
#define READ_HIGH (1 << 5)
#define DISABLE_IRQ (1 << 4)
#define READ_X_LOW (READ_X | READ_LOW)
#define READ_X_HIGH (READ_X | READ_HIGH)
#define READ_Y_LOW (READ_Y | READ_LOW)
#define READ_Y_HIGH (READ_Y | READ_HIGH)
/* Our mouse device. */
typedef struct mouse_bus_t
{
int irq;
int timer_index;
int x_delay;
int y_delay;
uint8_t mouse_buttons;
uint8_t mouse_buttons_last;
uint8_t x, y, but;
uint8_t command_val;
uint8_t control_val;
uint8_t config_val;
uint8_t sig_val;
uint16_t toggle_counter;
int interrupts;
int is_inport;
} mouse_bus_t;
/* Handle a WRITE operation to one of our registers. */
static void busmouse_write(uint16_t port, uint8_t val, void *priv)
{
mouse_bus_t *busmouse = (mouse_bus_t *)priv;
switch (port)
{
case BUSM_PORT_CONTROL:
busmouse->control_val = val | 0x0f;
busmouse->interrupts = (val & DISABLE_IRQ) == 0;
picintc(1 << busmouse->irq);
break;
case BUSM_PORT_CONFIG:
busmouse->config_val = val;
break;
case BUSM_PORT_SIGNATURE:
busmouse->sig_val = val;
break;
case BUSM_PORT_DATA:
break;
}
}
/* Handle a READ operation from one of our registers. */
static uint8_t busmouse_read(uint16_t port, void *priv)
{
mouse_bus_t *busmouse = (mouse_bus_t *)priv;
uint8_t r = 0;
switch (port)
{
case BUSM_PORT_CONTROL:
r = busmouse->control_val;
/* This is to allow the driver to see which IRQ the card has "jumpered"
only happens if IRQ's are enabled */
busmouse->control_val |= 0x0f;
busmouse->control_val &= ~IRQ_MASK;
busmouse->toggle_counter = (busmouse->toggle_counter + 1) & 0x7ff;
break;
case BUSM_PORT_DATA:
switch (busmouse->control_val & 0x60)
{
case READ_X_LOW:
/* r = busmouse->x & 0x0f; */
r = ((busmouse->but ^ 7) << 5) | (busmouse->x & 0x0f);
break;
case READ_X_HIGH:
r = (busmouse->x >> 4) & 0x0f;
break;
case READ_Y_LOW:
r = busmouse->y & 0x0f;
break;
case READ_Y_HIGH:
r = ((busmouse->but ^ 7) << 5) | ((busmouse->y >> 4) & 0x0f);
break;
default:
break;
}
break;
case BUSM_PORT_CONFIG:
r = busmouse->config_val;
break;
case BUSM_PORT_SIGNATURE:
r = busmouse->sig_val;
break;
}
return(r);
}
static void inport_write(uint16_t port, uint8_t val, void *priv)
{
mouse_bus_t *inport = (mouse_bus_t *)priv;
switch (port)
{
case INP_PORT_CONTROL:
switch (val)
{
case INP_CTRL_RESET:
inport->control_val = 0;
inport->command_val = 0;
break;
case INP_CTRL_COMMAND:
case INP_CTRL_READ_BUTTONS:
case INP_CTRL_READ_X:
case INP_CTRL_READ_Y:
inport->command_val = val;
break;
case 0x87:
inport->control_val = 0;
inport->command_val = 0x07;
break;
}
break;
case INP_PORT_DATA:
picintc(1 << inport->irq);
if (val == INP_CTRL_RAISE_IRQ)
{
picint(1 << inport->irq);
}
else
{
switch (inport->command_val)
{
case INP_CTRL_COMMAND:
inport->control_val = val;
inport->interrupts = (val & INP_ENABLE_IRQ) > 0;
break;
default:
break;
}
}
break;
case INP_PORT_SIGNATURE:
case INP_PORT_CONFIG:
break;
}
}
static uint8_t inport_read(uint16_t port, void *priv)
{
mouse_bus_t *inport = (mouse_bus_t *)priv;
uint8_t r = 0;
switch (port)
{
case INP_PORT_CONTROL:
r = inport->control_val;
break;
case INP_PORT_DATA:
switch (inport->command_val)
{
case INP_CTRL_READ_BUTTONS:
r = inport->but;
r |= 0x40;
break;
case INP_CTRL_READ_X:
r = inport->x;
break;
case INP_CTRL_READ_Y:
r = inport->y;
break;
case INP_CTRL_COMMAND:
r = inport->control_val;
break;
}
break;
case INP_PORT_SIGNATURE:
if (!inport->toggle_counter)
{
r = 0xde;
}
else
{
r = 0x12;
}
inport->toggle_counter ^= 1;
break;
case INP_PORT_CONFIG:
break;
}
return(r);
}
void busmouse_update_mouse_data(void *priv)
{
mouse_bus_t *busmouse = (mouse_bus_t *)priv;
int delta_x, delta_y;
int hold;
if (busmouse->x_delay > 127) {
delta_x = 127;
busmouse->x_delay -= 127;
} else if (busmouse->x_delay < -128) {
delta_x = -128;
busmouse->x_delay += 128;
} else {
delta_x = busmouse->x_delay;
busmouse->x_delay = 0;
}
if (busmouse->y_delay > 127) {
delta_y = 127;
busmouse->y_delay -= 127;
} else if (busmouse->y_delay < -128) {
delta_y = -128;
busmouse->y_delay += 128;
} else {
delta_y = busmouse->y_delay;
busmouse->y_delay = 0;
}
if (busmouse->is_inport) {
hold = (busmouse->control_val & INP_HOLD_COUNTER) > 0;
} else {
hold = (busmouse->control_val & HOLD_COUNTER) > 0;
}
if (!hold) {
busmouse->x = (uint8_t) delta_x;
busmouse->y = (uint8_t) delta_y;
busmouse->but = busmouse->mouse_buttons;
}
}
/* Called at 30hz */
void busmouse_timer_handler(void *priv)
{
mouse_bus_t *busmouse = (mouse_bus_t *)priv;
busmouse->timer_index += ((1000000.0 / 30.0) * TIMER_USEC);
/* The controller updates the data on every interrupt
We just don't copy it to the current_X if the 'hold' bit is set */
busmouse_update_mouse_data(busmouse);
}
/* The emulator calls us with an update on the host mouse device. */
static uint8_t busmouse_poll(int x, int y, int z, int b, void *priv)
{
mouse_bus_t *busmouse = (mouse_bus_t *)priv;
/* Return early if nothing to do. */
if (!x && !y && !z && (busmouse->mouse_buttons == b)) return(1);
#if 1
pclog("BUSMOUSE: poll(%d,%d,%d, %02x)\n", x, y, z, b);
#endif
// scale down the motion
if ((x < -1) || (x > 1))
x /= 2;
if ((y < -1) || (y > 1))
y /= 2;
if (x > 127) x =127;
if (y > 127) y =127;
if (x < -128) x = -128;
if (y < -128) y = -128;
busmouse->x_delay += x;
busmouse->y_delay += y;
busmouse->mouse_buttons = (uint8_t)(((b & 1) << 2) |
((b & 4) >> 1) | ((b & 2) >> 1));
if (busmouse->is_inport)
{
if ((busmouse->mouse_buttons & (1<<2)) ||
((busmouse->mouse_buttons_last & (1<<2)) && !(busmouse->mouse_buttons & (1<<2))))
busmouse->mouse_buttons |= (1<<5);
if ((busmouse->mouse_buttons & (1<<1)) ||
((busmouse->mouse_buttons_last & (1<<1)) && !(busmouse->mouse_buttons & (1<<1))))
busmouse->mouse_buttons |= (1<<4);
if ((busmouse->mouse_buttons & (1<<0)) ||
((busmouse->mouse_buttons_last & (1<<0)) && !(busmouse->mouse_buttons & (1<<0))))
busmouse->mouse_buttons |= (1<<3);
busmouse->mouse_buttons_last = busmouse->mouse_buttons;
}
picint(1 << busmouse->irq);
return(0);
}
/* Initialize the device for use by the user. */
static void *inport_init(void)
{
mouse_bus_t *inport;
inport = (mouse_bus_t *)malloc(sizeof(mouse_bus_t));
memset(inport, 0x00, sizeof(mouse_bus_t));
inport->is_inport = 1;
inport->irq = BUS_MOUSE_IRQ;
/* Initialize registers. */
inport->control_val = 0x00; /* The control port value */
inport->config_val = 0x00; /* The config port value */
/* Common. */
inport->command_val = 0;
inport->toggle_counter = 0;
inport->interrupts = 0;
/* Request an I/O range. */
io_sethandler(0x023C, 0x0004, inport_read, NULL, NULL, inport_write, NULL, NULL, inport);
timer_add(busmouse_timer_handler, &inport->timer_index, TIMER_ALWAYS_ENABLED, inport);
/* Return our private data to the I/O layer. */
return(inport);
}
#endif
mouse_t mouse_bus_logitech = {
"Logitech Bus Mouse",
"logibus",
MOUSE_TYPE_LOGIBUS,
logibus_init,
busmouse_close,
busmouse_poll
bm_init,
bm_close,
bm_poll
};
mouse_t mouse_bus_msinport = {
"Microsoft Bus Mouse (InPort)",
"msbus",
MOUSE_TYPE_INPORT,
inport_init,
busmouse_close,
busmouse_poll
bm_init,
bm_close,
bm_poll
};