80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Writes to port 23F of the Logitech Bus mouse with bit 7 clear are now correctly treated as a Port C single bit set/reset operations (and made it so that said bit is no longer treated as a bus mouse activate/deactivate switch, which it is not), fixes MS MOUSE.COM 7.x and later.

Browse Source
This commit is contained in:
OBattler
2018-10-09 02:06:28 +02:00
parent 17a96ac660
commit e231f91229
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/mouse_bus.c
View File

@@ -51,7 +51,7 @@
* Microsoft Windows NT 3.1 * Microsoft Windows NT 3.1
* Microsoft Windows 98 SE * Microsoft Windows 98 SE
* *
* Version: @(#)mouse_bus.c 1.0.1 2018/10/02 * Version: @(#)mouse_bus.c 1.0.2 2018/10/09
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
@@ -197,7 +197,6 @@ lt_read(uint16_t port, void *priv)
case BUSM_PORT_CONTROL: case BUSM_PORT_CONTROL:
value = dev->control_val; value = dev->control_val;
dev->control_val |= 0x0F; dev->control_val |= 0x0F;
/* If the conditions are right, simulate the flakiness of the correct IRQ bit. */ /* If the conditions are right, simulate the flakiness of the correct IRQ bit. */
if (dev->flags & FLAG_TIMER_INT) if (dev->flags & FLAG_TIMER_INT)
dev->control_val = (dev->control_val & ~IRQ_MASK) | (random_generate() & IRQ_MASK); dev->control_val = (dev->control_val & ~IRQ_MASK) | (random_generate() & IRQ_MASK);
@@ -269,6 +268,7 @@ static void
lt_write(uint16_t port, uint8_t val, void *priv) lt_write(uint16_t port, uint8_t val, void *priv)
{ {
mouse_t *dev = (mouse_t *)priv; mouse_t *dev = (mouse_t *)priv;
uint8_t bit;
bm_log("DEBUG: write to address 0x%04x, value = 0x%02x\n", port, val); bm_log("DEBUG: write to address 0x%04x, value = 0x%02x\n", port, val);
@@ -306,6 +306,8 @@ lt_write(uint16_t port, uint8_t val, void *priv)
* explains the value: * explains the value:
* *
* D7 = Mode set flag (1 = active) * D7 = Mode set flag (1 = active)
* This indicates the mode of operation of D7:
* 1 = Mode set, 0 = Bit set/reset
* D6,D5 = Mode selection (port A) * D6,D5 = Mode selection (port A)
* 00 = Mode 0 = Basic I/O * 00 = Mode 0 = Basic I/O
* 01 = Mode 1 = Strobed I/O * 01 = Mode 1 = Strobed I/O
@@ -322,17 +324,24 @@ lt_write(uint16_t port, uint8_t val, void *priv)
* port, B is an output port, C is split with upper 4 bits * port, B is an output port, C is split with upper 4 bits
* being an output port and lower 4 bits an input port, and * being an output port and lower 4 bits an input port, and
* enable the sucker. Courtesy Intel 8255 databook. Lars * enable the sucker. Courtesy Intel 8255 databook. Lars
*
* 1001 1011 9B 1111 Default state
* 1001 0001 91 1001 Driver-initialized state
* The only difference is - port C upper and port B go from
* input to output.
*/ */
dev->config_val = val;
if (val & DEVICE_ACTIVE) { if (val & DEVICE_ACTIVE) {
/* Mode set/reset - enable this */
dev->config_val = val;
dev->flags |= (FLAG_ENABLED | FLAG_TIMER_INT); dev->flags |= (FLAG_ENABLED | FLAG_TIMER_INT);
dev->control_val = 0x0F & ~IRQ_MASK; dev->control_val = 0x0F & ~IRQ_MASK;
dev->timer = ((int64_t) dev->period) * TIMER_USEC;
dev->timer_enabled = 1LL;
} else { } else {
dev->flags &= ~(FLAG_ENABLED | FLAG_TIMER_INT); /* Single bit set/reset */
dev->timer = 0LL; bit = 1 << ((val >> 1) & 0x07); /* Bits 3-1 specify the target bit */
dev->timer_enabled = 0LL; if (val & 1)
dev->control_val |= bit; /* Set */
else
dev->control_val &= ~bit; /* Reset */
} }
break; break;
} }
@@ -612,17 +621,22 @@ bm_init(const device_t *info)
io_sethandler(dev->base, 4, io_sethandler(dev->base, 4,
ms_read, NULL, NULL, ms_write, NULL, NULL, dev); ms_read, NULL, NULL, ms_write, NULL, NULL, dev);
dev->timer = 0LL;
dev->timer_enabled = 0LL;
} else { } else {
dev->control_val = 0x0f; /* the control port value */ dev->control_val = 0x0f; /* the control port value */
dev->config_val = 0x0e; /* the config port value */ dev->config_val = 0x9b; /* the config port value - 0x9b is the
default state of the 8255: all ports
are set to input */
dev->period = 1000000.0 / ((double) device_get_config_int("hz")); dev->period = 1000000.0 / ((double) device_get_config_int("hz"));
io_sethandler(dev->base, 4, io_sethandler(dev->base, 4,
lt_read, NULL, NULL, lt_write, NULL, NULL, dev); lt_read, NULL, NULL, lt_write, NULL, NULL, dev);
}
dev->timer = 0LL; dev->timer = ((int64_t) dev->period) * TIMER_USEC;
dev->timer_enabled = 0LL; dev->timer_enabled = 1LL;
}
timer_add(bm_timer, &dev->timer, &dev->timer_enabled, dev); timer_add(bm_timer, &dev->timer, &dev->timer_enabled, dev);