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

Implemented missing ALi M1543C behavior.

Browse Source
This commit is contained in:
OBattler
2022-12-04 22:59:22 +01:00
parent f2ff608e34
commit 60b5c5ba74
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chipset/ali1543.c
View File

@@ -254,6 +254,14 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
dev->pci_conf[addr] = val & 0xcf;
/* This actually enables/disables the USB *device* rather than the interface itself. */
dev->usb_dev_enable = !(val & 0x40);
if (dev->type == 1) {
nvr_at_index_read_handler(0, 0x0070, dev->nvr);
nvr_at_index_read_handler(0, 0x0072, dev->nvr);
if (val & 0x20) {
nvr_at_index_read_handler(1, 0x0070, dev->nvr);
nvr_at_index_read_handler(1, 0x0072, dev->nvr);
}
}
break;
/* Hardware setting status bits, read-only (register 0x54) */

1
src/include/86box/nvr.h
View File

@@ -118,6 +118,7 @@ extern void nvr_time_set(struct tm *);
extern void nvr_reg_write(uint16_t reg, uint8_t val, void *priv);
extern void nvr_at_handler(int set, uint16_t base, nvr_t *nvr);
extern void nvr_at_sec_handler(int set, uint16_t base, nvr_t *nvr);
extern void nvr_at_index_read_handler(int set, uint16_t base, nvr_t *nvr);
extern void nvr_read_addr_set(int set, nvr_t *nvr);
extern void nvr_wp_set(int set, int h, nvr_t *nvr);
extern void nvr_via_wp_set(int set, int reg, nvr_t *nvr);

17
src/nvr_at.c
View File

@@ -892,6 +892,23 @@ nvr_at_handler(int set, uint16_t base, nvr_t *nvr)
nvr_read, NULL, NULL, nvr_write, NULL, NULL, nvr);
}
void
nvr_at_index_read_handler(int set, uint16_t base, nvr_t *nvr)
{
io_handler(0, base, 1,
nvr_read, NULL, NULL, NULL, NULL, NULL, nvr);
nvr_at_handler(0, base, nvr);
if (set)
nvr_at_handler(1, base, nvr);
else {
io_handler(set, base, 1,
nvr_read, NULL, NULL, NULL, NULL, NULL, nvr);
io_handler(set, base + 1, 1,
nvr_read, NULL, NULL, nvr_write, NULL, NULL, nvr);
}
}
void
nvr_at_sec_handler(int set, uint16_t base, nvr_t *nvr)
{