From 49b6c8b8d29b79c391e402fc1dd8c854bb24640a Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Wed, 31 Mar 2021 23:45:39 -0300 Subject: [PATCH 1/9] ISAPnP: mask the right bits for 10-bit decode --- src/device/isapnp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/device/isapnp.c b/src/device/isapnp.c index 20c55742b..edb921c93 100644 --- a/src/device/isapnp.c +++ b/src/device/isapnp.c @@ -541,18 +541,18 @@ isapnp_write_data(uint16_t addr, uint8_t val, void *priv) switch (dev->reg) { case 0x42: case 0x4a: case 0x52: case 0x5a: case 0x7a: case 0x84: case 0x94: case 0xa4: - /* read-only memory range length / upper limit bit */ + /* Read-only memory range length / upper limit bit. */ val = (val & 0xfe) | (dev->current_ld->regs[dev->reg] & 0x01); break; case 0x60: case 0x62: case 0x64: case 0x66: case 0x68: case 0x6a: case 0x6c: case 0x6e: - /* discard upper address bits if this I/O range can only decode 10-bit */ + /* Discard upper address bits if this I/O range can only decode 10-bit. */ if (!(dev->current_ld->io_16bit & (1 << ((dev->reg >> 1) & 0x07)))) - val &= 0x07; + val &= 0x03; break; case 0x71: case 0x73: - /* limit IRQ types to supported ones */ + /* Limit IRQ types to supported ones. */ if ((val & 0x01) && !(dev->current_ld->irq_types & ((dev->reg == 0x71) ? 0x0c : 0xc0))) /* level, not supported = force edge */ val &= ~0x01; else if (!(val & 0x01) && !(dev->current_ld->irq_types & ((dev->reg == 0x71) ? 0x03 : 0x30))) /* edge, not supported = force level */ From 75b2d4f6b4164a89935e03b2effa7b48fc2be925 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 2 Apr 2021 00:30:39 -0300 Subject: [PATCH 2/9] Overhaul tertiary/quaternary IDE PnP ROM to try the default IRQ first, allow for I/O port flexibility, and follow the Microsoft PNP???? device ID specification --- src/disk/hdc_ide.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index d2649e046..1c38fd0e3 100644 --- a/src/disk/hdc_ide.c +++ b/src/disk/hdc_ide.c @@ -136,10 +136,21 @@ static uint8_t ide_ter_pnp_rom[] = { 0x09, 0xf8, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, /* BOX0001, serial 0, dummy checksum (filled in by isapnp_add_card) */ 0x0a, 0x10, 0x10, /* PnP version 1.0, vendor version 1.0 */ - 0x15, 0x41, 0xd0, 0x06, 0x00, 0x00, /* logical device PNP0600 */ - 0x22, 0xb8, 0x1e, /* IRQ 3/4/5/7/9/10/11/12 */ - 0x47, 0x00, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 10-bit, 1-byte alignment, 8 addresses */ - 0x47, 0x00, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x01, /* I/O 0x36E, decodes 10-bit, 1-byte alignment, 1 address */ + 0x15, 0x09, 0xf8, 0x00, 0x01, 0x00, /* logical device BOX0001 */ + 0x1c, 0x41, 0xd0, 0x06, 0x00, /* compatible device PNP0600 */ + 0x31, 0x00, /* start dependent functions, preferred */ + 0x22, 0x00, 0x04, /* IRQ 10 */ + 0x47, 0x01, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 16-bit, 1-byte alignment, 8 addresses */ + 0x47, 0x01, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x01, /* I/O 0x36E, decodes 16-bit, 1-byte alignment, 1 address */ + 0x30, /* start dependent functions, acceptable */ + 0x22, 0xb8, 0x1e, /* IRQ 3/4/5/7/9/10/11/12 */ + 0x47, 0x01, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 16-bit, 1-byte alignment, 8 addresses */ + 0x47, 0x01, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x01, /* I/O 0x36E, decodes 16-bit, 1-byte alignment, 1 address */ + 0x30, /* start dependent functions, acceptable */ + 0x22, 0xb8, 0x1e, /* IRQ 3/4/5/7/9/10/11/12 */ + 0x47, 0x01, 0x00, 0x01, 0xf8, 0xff, 0x08, 0x08, /* I/O 0x100-0xFFF8, decodes 16-bit, 8-byte alignment, 8 addresses */ + 0x47, 0x01, 0x00, 0x01, 0xff, 0xff, 0x01, 0x01, /* I/O 0x100-0xFFFF, decodes 16-bit, 1-byte alignment, 1 address */ + 0x38, /* end dependent functions */ 0x79, 0x00 /* end tag, dummy checksum (filled in by isapnp_add_card) */ }; @@ -147,10 +158,21 @@ static uint8_t ide_qua_pnp_rom[] = { 0x09, 0xf8, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, /* BOX0001, serial 1, dummy checksum (filled in by isapnp_add_card) */ 0x0a, 0x10, 0x10, /* PnP version 1.0, vendor version 1.0 */ - 0x15, 0x41, 0xd0, 0x06, 0x00, 0x00, /* logical device PNP0600 */ - 0x22, 0xb8, 0x1e, /* IRQ 3/4/5/7/9/10/11/12 */ - 0x47, 0x00, 0xe8, 0x01, 0xe8, 0x01, 0x01, 0x08, /* I/O 0x1E8, decodes 10-bit, 1-byte alignment, 8 addresses */ - 0x47, 0x00, 0xee, 0x03, 0xee, 0x03, 0x01, 0x01, /* I/O 0x3EE, decodes 10-bit, 1-byte alignment, 1 address */ + 0x15, 0x09, 0xf8, 0x00, 0x01, 0x00, /* logical device BOX0001 */ + 0x1c, 0x41, 0xd0, 0x06, 0x00, /* compatible device PNP0600 */ + 0x31, 0x00, /* start dependent functions, preferred */ + 0x22, 0x00, 0x08, /* IRQ 11 */ + 0x47, 0x01, 0xe8, 0x01, 0xe8, 0x01, 0x01, 0x08, /* I/O 0x1E8, decodes 16-bit, 1-byte alignment, 8 addresses */ + 0x47, 0x01, 0xee, 0x03, 0xee, 0x03, 0x01, 0x01, /* I/O 0x3EE, decodes 16-bit, 1-byte alignment, 1 address */ + 0x30, /* start dependent functions, acceptable */ + 0x22, 0xb8, 0x1e, /* IRQ 3/4/5/7/9/10/11/12 */ + 0x47, 0x01, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 16-bit, 1-byte alignment, 8 addresses */ + 0x47, 0x01, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x01, /* I/O 0x36E, decodes 16-bit, 1-byte alignment, 1 address */ + 0x30, /* start dependent functions, acceptable */ + 0x22, 0xb8, 0x1e, /* IRQ 3/4/5/7/9/10/11/12 */ + 0x47, 0x01, 0x00, 0x01, 0xf8, 0xff, 0x08, 0x08, /* I/O 0x100-0xFFF8, decodes 16-bit, 8-byte alignment, 8 addresses */ + 0x47, 0x01, 0x00, 0x01, 0xff, 0xff, 0x01, 0x01, /* I/O 0x100-0xFFFF, decodes 16-bit, 1-byte alignment, 1 address */ + 0x38, /* end dependent functions */ 0x79, 0x00 /* end tag, dummy checksum (filled in by isapnp_add_card) */ }; From c9e75f66243f9f7fed46b833cd788a92645dbc0f Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 2 Apr 2021 23:44:24 -0300 Subject: [PATCH 3/9] Allow game port to be remapped --- src/game/gameport.c | 103 ++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 56 deletions(-) diff --git a/src/game/gameport.c b/src/game/gameport.c index a5ece27dd..7df2e7eda 100644 --- a/src/game/gameport.c +++ b/src/game/gameport.c @@ -60,6 +60,7 @@ typedef struct { typedef struct _gameport_ { uint8_t state; + uint16_t addr; g_axis_t axis[4]; @@ -243,10 +244,49 @@ timer_over(void *priv) } -static void * -init_common(void) +void +gameport_update_joystick_type(void) { - gameport_t *p = malloc(sizeof(gameport_t)); + gameport_t *p = gameport_global; + + if (p != NULL) { + p->joystick->close(p->joystick_dat); + p->joystick = joysticks[joystick_type].joystick; + p->joystick_dat = p->joystick->init(); + } +} + + +void +gameport_remap(uint16_t address) +{ + gameport_t *p = gameport_global; + if (!p) + return; + + if (p->addr) + io_removehandler(p->addr, (p->addr & 1) ? 1 : 8, + gameport_read, NULL, NULL, gameport_write, NULL, NULL, p); + + p->addr = address; + + if (p->addr) + io_sethandler(p->addr, (p->addr & 1) ? 1 : 8, + gameport_read, NULL, NULL, gameport_write, NULL, NULL, p); +} + + +static void * +gameport_init(const device_t *info) +{ + gameport_t *p = NULL; + + if (!joystick_type) { + gameport_global = p = NULL; + return(p); + } + + p = malloc(sizeof(gameport_t)); memset(p, 0x00, sizeof(gameport_t)); @@ -270,56 +310,7 @@ init_common(void) gameport_global = p; - return(p); -} - - -void -gameport_update_joystick_type(void) -{ - gameport_t *p = gameport_global; - - if (p != NULL) { - p->joystick->close(p->joystick_dat); - p->joystick = joysticks[joystick_type].joystick; - p->joystick_dat = p->joystick->init(); - } -} - - -static void * -gameport_init(const device_t *info) -{ - gameport_t *p = NULL; - - if (!joystick_type) { - p = NULL; - return(p); - } - - p = init_common(); - - io_sethandler(0x0200, 8, - gameport_read,NULL,NULL, gameport_write,NULL,NULL, p); - - return(p); -} - - -static void * -gameport_201_init(const device_t *info) -{ - gameport_t *p; - - if (!joystick_type) { - p = NULL; - return(p); - } - - p = init_common(); - - io_sethandler(0x0201, 1, - gameport_read,NULL,NULL, gameport_write,NULL,NULL, p); + gameport_remap(info->local); return(p); } @@ -342,7 +333,7 @@ gameport_close(void *priv) const device_t gameport_device = { "Game port", - 0, 0, + 0, 0x200, gameport_init, gameport_close, NULL, { NULL }, NULL, @@ -351,8 +342,8 @@ const device_t gameport_device = { const device_t gameport_201_device = { "Game port (port 201h only)", - 0, 0, - gameport_201_init, + 0, 0x201, + gameport_init, gameport_close, NULL, { NULL }, NULL, NULL From 340448dfb698ac8b76d0ff993f6ea657e87a2b8b Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 2 Apr 2021 23:46:38 -0300 Subject: [PATCH 4/9] ISAPnP: add card disable/reenable, default device configuration and card/device reset to the API --- src/device/isapnp.c | 160 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 150 insertions(+), 10 deletions(-) diff --git a/src/device/isapnp.c b/src/device/isapnp.c index edb921c93..f60f4f54c 100644 --- a/src/device/isapnp.c +++ b/src/device/isapnp.c @@ -16,7 +16,6 @@ * Copyright 2016-2018 Miran Grca. * Copyright 2021 RichardG. */ - #include #include #include @@ -37,7 +36,7 @@ #define CHECK_CURRENT_CARD() if (1) { \ card = dev->first_card; \ while (card) { \ - if (card->state == PNP_STATE_CONFIG) \ + if (card->enable && (card->state == PNP_STATE_CONFIG)) \ break; \ card = card->next; \ } \ @@ -86,12 +85,13 @@ typedef struct _isapnp_device_ { uint8_t number; uint8_t regs[256]; uint8_t mem_upperlimit, irq_types, io_16bit, io_len[8]; + const isapnp_device_config_t *defaults; struct _isapnp_device_ *next; } isapnp_device_t; typedef struct _isapnp_card_ { - uint8_t state, csn, id_checksum, serial_read, serial_read_pair, serial_read_pos, *rom; + uint8_t enable, state, csn, id_checksum, serial_read, serial_read_pair, serial_read_pos, *rom; uint16_t rom_pos, rom_size; void *priv; @@ -163,6 +163,59 @@ isapnp_device_config_changed(isapnp_card_t *card, isapnp_device_t *ld) } +static void +isapnp_reset_ld_config(isapnp_device_t *ld) +{ + /* Do nothing if there's no default configuration for this device. */ + const isapnp_device_config_t *config = ld->defaults; + if (!config) + return; + + /* Populate configuration registers. */ + ld->regs[0x30] = !!config->activate; + uint8_t i, reg_base; + uint32_t size; + for (i = 0; i < 4; i++) { + reg_base = 0x40 + (8 * i); + ld->regs[reg_base] = config->mem[i].base >> 16; + ld->regs[reg_base + 1] = config->mem[i].base >> 8; + size = config->mem[i].size; + if (ld->regs[reg_base + 2] & 0x01) /* upper limit */ + size += config->mem[i].base; + ld->regs[reg_base + 3] = size >> 16; + ld->regs[reg_base + 4] = size >> 8; + } + for (i = 0; i < 4; i++) { + reg_base = (i == 0) ? 0x76 : (0x80 + (16 * i)); + ld->regs[reg_base] = config->mem32[i].base >> 24; + ld->regs[reg_base + 1] = config->mem32[i].base >> 16; + ld->regs[reg_base + 2] = config->mem32[i].base >> 8; + ld->regs[reg_base + 3] = config->mem32[i].base; + size = config->mem32[i].size; + if (ld->regs[reg_base + 4] & 0x01) /* upper limit */ + size += config->mem32[i].base; + ld->regs[reg_base + 5] = size >> 24; + ld->regs[reg_base + 6] = size >> 16; + ld->regs[reg_base + 7] = size >> 8; + ld->regs[reg_base + 8] = size; + } + for (i = 0; i < 8; i++) { + reg_base = 0x60 + (2 * i); + ld->regs[reg_base] = config->io[i].base >> 8; + ld->regs[reg_base + 1] = config->io[i].base; + } + for (i = 0; i < 2; i++) { + reg_base = 0x70 + (2 * i); + ld->regs[reg_base] = config->irq[i].irq; + ld->regs[reg_base + 1] = (!!config->irq[i].level << 1) | !!config->irq[i].type; + } + for (i = 0; i < 2; i++) { + reg_base = 0x74 + i; + ld->regs[reg_base] = config->dma[i].dma; + } +} + + static void isapnp_reset_ld_regs(isapnp_device_t *ld) { @@ -190,6 +243,9 @@ isapnp_reset_ld_regs(isapnp_device_t *ld) else if (ld->irq_types & (0x8 << (4 * i))) ld->regs[0x70 + (2 * i)] = 0x01; } + + /* Reset configuration registers to match the default configuration. */ + isapnp_reset_ld_config(ld); } @@ -212,7 +268,7 @@ isapnp_read_data(uint16_t addr, void *priv) case 0x01: /* Serial Isolation */ card = dev->first_card; while (card) { - if (card->state == PNP_STATE_ISOLATION) + if (card->enable && (card->state == PNP_STATE_ISOLATION)) break; card = card->next; } @@ -349,6 +405,8 @@ isapnp_write_addr(uint16_t addr, uint8_t val, void *priv) if (!card) /* don't do anything if we have no PnP cards */ return; + dev->reg = val; + if (card->state == PNP_STATE_WAIT_FOR_KEY) { /* checking only the first card should be fine */ /* Check written value against LFSR key. */ if (val == pnp_init_key[dev->key_pos]) { @@ -356,7 +414,7 @@ isapnp_write_addr(uint16_t addr, uint8_t val, void *priv) if (!dev->key_pos) { isapnp_log("ISAPnP: Key unlocked, putting cards to SLEEP\n"); while (card) { - if (card->state == PNP_STATE_WAIT_FOR_KEY) + if (card->enable && (card->state == PNP_STATE_WAIT_FOR_KEY)) card->state = PNP_STATE_SLEEP; card = card->next; } @@ -364,9 +422,6 @@ isapnp_write_addr(uint16_t addr, uint8_t val, void *priv) } else { dev->key_pos = 0; } - } else { - /* Nobody waiting for key, set register address. */ - dev->reg = val; } } @@ -483,7 +538,7 @@ isapnp_write_data(uint16_t addr, uint8_t val, void *priv) case 0x30: /* Activate */ CHECK_CURRENT_LD(); - isapnp_log("ISAPnP: Activate CSN %02X device %02X\n", dev->current_ld_card->csn, dev->current_ld->number); + isapnp_log("ISAPnP: %sctivate CSN %02X device %02X\n", (val & 0x01) ? "A" : "Dea", dev->current_ld_card->csn, dev->current_ld->number); dev->current_ld->regs[dev->reg] = val & 0x01; isapnp_device_config_changed(dev->current_ld_card, dev->current_ld); @@ -629,6 +684,7 @@ isapnp_add_card(uint8_t *rom, uint16_t rom_size, isapnp_card_t *card = (isapnp_card_t *) malloc(sizeof(isapnp_card_t)); memset(card, 0, sizeof(isapnp_card_t)); + card->enable = 1; card->rom = rom; card->rom_size = rom_size; card->priv = priv; @@ -839,6 +895,37 @@ isapnp_add_card(uint8_t *rom, uint16_t rom_size, } +void +isapnp_enable_card(void *priv, uint8_t enable) +{ + isapnp_t *dev = (isapnp_t *) device_get_priv(&isapnp_device); + if (!dev) + return; + + /* Look for a matching card. */ + isapnp_card_t *card = dev->first_card; + while (card) { + if (card == priv) { + /* Enable or disable the card. */ + card->enable = !!enable; + + /* enable=2 is a cheat code to jump straight into CONFIG state. */ + card->state = (enable == 2) ? PNP_STATE_CONFIG : PNP_STATE_WAIT_FOR_KEY; + + /* Invalidate other references if we're disabling this card. */ + if (dev->isolated_card == card) + dev->isolated_card = NULL; + if (dev->current_ld_card == card) + dev->current_ld = dev->current_ld_card = NULL; + + break; + } + + card = card->next; + } +} + + void isapnp_set_csn(void *priv, uint8_t csn) { @@ -850,9 +937,62 @@ isapnp_set_csn(void *priv, uint8_t csn) } +void +isapnp_set_device_defaults(void *priv, uint8_t ldn, const isapnp_device_config_t *config) +{ + isapnp_card_t *card = (isapnp_card_t *) priv; + isapnp_device_t *ld = card->first_ld; + + /* Look for a logical device with this number. */ + while (ld && (ld->number != ldn)) + ld = ld->next; + + if (!ld) /* none found */ + return; + + ld->defaults = config; +} + + +void +isapnp_reset_card(void *priv) +{ + isapnp_card_t *card = (isapnp_card_t *) priv; + isapnp_device_t *ld = card->first_ld; + + /* Reset all logical devices. */ + while (ld) { + /* Reset the logical device's configuration. */ + isapnp_reset_ld_config(ld); + isapnp_device_config_changed(card, ld); + + ld = ld->next; + } +} + + +void +isapnp_reset_device(void *priv, uint8_t ldn) +{ + isapnp_card_t *card = (isapnp_card_t *) priv; + isapnp_device_t *ld = card->first_ld; + + /* Look for a logical device with this number. */ + while (ld && (ld->number != ldn)) + ld = ld->next; + + if (!ld) /* none found */ + return; + + /* Reset the logical device's configuration. */ + isapnp_reset_ld_config(ld); + isapnp_device_config_changed(card, ld); +} + + static const device_t isapnp_device = { "ISA Plug and Play", - DEVICE_ISA, + 0, 0, isapnp_init, isapnp_close, NULL, { NULL }, NULL, NULL, From a4af5ccfa84c623c4bbe061c7ee69c42b20febbc Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 2 Apr 2021 23:47:10 -0300 Subject: [PATCH 5/9] Missing header files for previous commits --- src/include/86box/gameport.h | 1 + src/include/86box/isapnp.h | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/include/86box/gameport.h b/src/include/86box/gameport.h index 105b6cd62..4ceac12e9 100644 --- a/src/include/86box/gameport.h +++ b/src/include/86box/gameport.h @@ -150,6 +150,7 @@ extern char *joystick_get_button_name(int js, int id); extern char *joystick_get_pov_name(int js, int id); extern void gameport_update_joystick_type(void); +extern void gameport_remap(uint16_t address); #ifdef __cplusplus } diff --git a/src/include/86box/isapnp.h b/src/include/86box/isapnp.h index eaf2cb713..d241d74f3 100644 --- a/src/include/86box/isapnp.h +++ b/src/include/86box/isapnp.h @@ -51,8 +51,11 @@ void *isapnp_add_card(uint8_t *rom, uint16_t rom_size, uint8_t (*read_vendor_reg)(uint8_t ld, uint8_t reg, void *priv), void (*write_vendor_reg)(uint8_t ld, uint8_t reg, uint8_t val, void *priv), void *priv); +void isapnp_enable_card(void *priv, uint8_t enable); void isapnp_set_csn(void *priv, uint8_t csn); -uint8_t isapnp_get_rom_checksum(void *priv); +void isapnp_set_device_defaults(void *priv, uint8_t ldn, const isapnp_device_config_t *config); +void isapnp_reset_card(void *priv); +void isapnp_reset_device(void *priv, uint8_t ld); #endif /*EMU_ISAPNP_H*/ From 985e498d6d9c5ede4db0645b6c7751a7003ae239 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 2 Apr 2021 23:48:23 -0300 Subject: [PATCH 6/9] Rewrite UM8669F Super I/O to use the ISAPnP framework --- src/sio/sio_um8669f.c | 365 +++++++++++++++++++---------------------- src/sio/sio_vt82c686.c | 3 +- 2 files changed, 175 insertions(+), 193 deletions(-) diff --git a/src/sio/sio_um8669f.c b/src/sio/sio_um8669f.c index c7cf65970..ad3d3f5ad 100644 --- a/src/sio/sio_um8669f.c +++ b/src/sio/sio_um8669f.c @@ -1,31 +1,30 @@ -/*um8669f : - - aa to 108 unlocks - next 108 write is register select (Cx?) - data read/write to 109 - 55 to 108 locks - -C1 -bit 7 - enable PnP registers - -PnP registers : - -07 - device : - 0 = FDC - 1 = COM1 - 2 = COM2 - 3 = LPT1 - 5 = Game port -30 - enable -60/61 - addr -70 - IRQ -74 - DMA*/ - +/* + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. + * + * This file is part of the 86Box distribution. + * + * Emulation of the UMC UM8669F Super I/O chip. + * + * + * + * Authors: Sarah Walker, + * Miran Grca, + * RichardG, + * + * Copyright 2008-2021 Sarah Walker. + * Copyright 2016-2021 Miran Grca. + * Copyright 2021 RichardG. + */ +#include #include #include #include #include #include +#define HAVE_STDARG_H #include <86box/86box.h> #include <86box/device.h> #include <86box/io.h> @@ -35,37 +34,94 @@ PnP registers : #include <86box/serial.h> #include <86box/fdd.h> #include <86box/fdc.h> +#include <86box/gameport.h> #include <86box/sio.h> +#include <86box/isapnp.h> -#define DEV_FDC 0 -#define DEV_COM1 1 -#define DEV_COM2 2 -#define DEV_LPT1 3 -#define DEV_GAME 5 +/* This ROM is reconstructed out of the several assumptions, some of which based on the IT8671F. */ +static uint8_t um8669f_pnp_rom[] = { + 0x55, 0xa3, 0x86, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, /* UMC8669, dummy checksum (filled in by isapnp_add_card) */ + 0x0a, 0x10, 0x10, /* PnP version 1.0, vendor version 1.0 */ -#define REG_DEVICE 0x07 -#define REG_ENABLE 0x30 -#define REG_ADDRHI 0x60 -#define REG_ADDRLO 0x61 -#define REG_IRQ 0x70 -#define REG_DMA 0x74 + 0x15, 0x41, 0xd0, 0x07, 0x00, 0x01, /* logical device PNP0700, can participate in boot */ + 0x22, 0xfa, 0x1f, /* IRQ 1/3/4/5/6/7/8/9/10/11/12 */ + 0x2a, 0x0f, 0x0c, /* DMA 0/1/2/3, compatibility, no count by word, count by byte, is bus master, 8-bit only */ + 0x47, 0x00, 0x00, 0x01, 0xf8, 0x03, 0x08, 0x08, /* I/O 0x100-0x3F8, decodes 10-bit, 8-byte alignment, 8 addresses */ + + 0x15, 0x41, 0xd0, 0x05, 0x01, 0x01, /* logical device PNP0501, can participate in boot */ + 0x22, 0xfa, 0x1f, /* IRQ 1/3/4/5/6/7/8/9/10/11/12 */ + 0x47, 0x00, 0x00, 0x01, 0xf8, 0x03, 0x08, 0x08, /* I/O 0x100-0x3F8, decodes 10-bit, 8-byte alignment, 8 addresses */ + + 0x15, 0x41, 0xd0, 0x05, 0x01, 0x01, /* logical device PNP0501, can participate in boot */ + 0x22, 0xfa, 0x1f, /* IRQ 1/3/4/5/6/7/8/9/10/11/12 */ + 0x47, 0x00, 0x00, 0x01, 0xf8, 0x03, 0x08, 0x08, /* I/O 0x100-0x3F8, decodes 10-bit, 8-byte alignment, 8 addresses */ + + 0x15, 0x41, 0xd0, 0x04, 0x00, 0x01, /* logical device PNP0400, can participate in boot */ + 0x22, 0xfa, 0x1f, /* IRQ 1/3/4/5/6/7/8/9/10/11/12 */ + 0x47, 0x00, 0x00, 0x01, 0xf8, 0x03, 0x08, 0x08, /* I/O 0x100-0x3F8, decodes 10-bit, 8-byte alignment, 8 addresses */ + + 0x15, 0x55, 0xa3, 0x86, 0x69, 0x00, /* logical device UMC8669 (just a dummy to create a gap in LDNs) */ + + 0x15, 0x41, 0xd0, 0xb0, 0x2f, 0x01, /* logical device PNPB02F, can participate in boot */ + 0x47, 0x00, 0x00, 0x01, 0xf8, 0x03, 0x08, 0x08, /* I/O 0x100-0x3F8, decodes 10-bit, 8-byte alignment, 8 addresses */ + + 0x79, 0x00 /* end tag, dummy checksum (filled in by isapnp_add_card) */ +}; +static const isapnp_device_config_t um8669f_pnp_defaults[] = { + { + .activate = 1, + .io = { { .base = 0x03f0 }, }, + .irq = { { .irq = 6 }, }, + .dma = { { .dma = 2 }, } + }, { + .activate = 1, + .io = { { .base = 0x03f8 }, }, + .irq = { { .irq = 4 }, } + }, { + .activate = 1, + .io = { { .base = 0x02f8 }, }, + .irq = { { .irq = 3 }, } + }, { + .activate = 1, + .io = { { .base = 0x0378 }, }, + .irq = { { .irq = 7 }, } + }, { + .activate = 0 + }, { + .activate = 1, + .io = { { .base = 0x200 }, } + } +}; + + +#ifdef ENABLE_UM8669F_LOG +int um8669f_do_log = ENABLE_UM8669F_LOG; + + +static void +um8669f_log(const char *fmt, ...) +{ + va_list ap; + + if (um8669f_do_log) { + va_start(ap, fmt); + pclog_ex(fmt, ap); + va_end(ap); + } +} +#else +#define um8669f_log(fmt, ...) +#endif typedef struct um8669f_t { - int locked, cur_reg_108, - cur_reg, cur_device, - pnp_active; + int locked, cur_reg_108; + void *pnp_card; + isapnp_device_config_t *pnp_config[5]; uint8_t regs_108[256]; - - struct { - int enable; - uint16_t addr; - int irq; - int dma; - } dev[8]; fdc_t *fdc; serial_t *uart[2]; @@ -73,111 +129,64 @@ typedef struct um8669f_t static void -um8669f_pnp_write(uint16_t port, uint8_t val, void *priv) +um8669f_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv) { - um8669f_t *dev = (um8669f_t *) priv; - - uint8_t valxor = 0; - uint8_t lpt_irq = 0xff; - - if (port == 0x279) - dev->cur_reg = val; - else { - if (dev->cur_reg == REG_DEVICE) - dev->cur_device = val & 7; - else { - switch (dev->cur_reg) { - case REG_ENABLE: - valxor = dev->dev[dev->cur_device].enable ^ val; - dev->dev[dev->cur_device].enable = val; - break; - case REG_ADDRLO: - valxor = (dev->dev[dev->cur_device].addr & 0xff) ^ val; - dev->dev[dev->cur_device].addr = (dev->dev[dev->cur_device].addr & 0xff00) | val; - break; - case REG_ADDRHI: - valxor = ((dev->dev[dev->cur_device].addr >> 8) & 0xff) ^ val; - dev->dev[dev->cur_device].addr = (dev->dev[dev->cur_device].addr & 0x00ff) | (val << 8); - break; - case REG_IRQ: - valxor = dev->dev[dev->cur_device].irq ^ val; - dev->dev[dev->cur_device].irq = val; - break; - case REG_DMA: - valxor = dev->dev[dev->cur_device].dma ^ val; - dev->dev[dev->cur_device].dma = val; - break; - default: - valxor = 0; - break; - } - - switch (dev->cur_device) { - case DEV_FDC: - if (valxor) { - fdc_remove(dev->fdc); - if (dev->dev[DEV_FDC].enable & 1) - fdc_set_base(dev->fdc, dev->dev[DEV_FDC].addr); - } - break; - case DEV_COM1: - if (valxor) { - serial_remove(dev->uart[0]); - if (dev->dev[DEV_COM1].enable & 1) - serial_setup(dev->uart[0], dev->dev[DEV_COM1].addr, dev->dev[DEV_COM1].irq); - } - break; - case DEV_COM2: - if (valxor) { - serial_remove(dev->uart[1]); - if (dev->dev[DEV_COM2].enable & 1) - serial_setup(dev->uart[1], dev->dev[DEV_COM2].addr, dev->dev[DEV_COM2].irq); - } - break; - case DEV_LPT1: - if (valxor) { - lpt1_remove(); - if (dev->dev[DEV_LPT1].enable & 1) - lpt1_init(dev->dev[DEV_LPT1].addr); - } - if (dev->dev[DEV_LPT1].irq <= 15) - lpt_irq = dev->dev[DEV_LPT1].irq; - lpt1_irq(lpt_irq); - break; - } - } - } -} - - -static uint8_t -um8669f_pnp_read(uint16_t port, void *priv) -{ - um8669f_t *dev = (um8669f_t *) priv; - uint8_t ret = 0xff; - - switch (dev->cur_reg) { - case REG_DEVICE: - ret = dev->cur_device; - break; - case REG_ENABLE: - ret = dev->dev[dev->cur_device].enable; - break; - case REG_ADDRLO: - ret = dev->dev[dev->cur_device].addr & 0xff; - break; - case REG_ADDRHI: - ret = dev->dev[dev->cur_device].addr >> 8; - break; - case REG_IRQ: - ret = dev->dev[dev->cur_device].irq; - break; - case REG_DMA: - ret = dev->dev[dev->cur_device].dma; - break; + if (ld > 5) { + um8669f_log("UM8669F: Unknown logical device %d\n", ld); + return; } - return ret; + um8669f_t *dev = (um8669f_t *) priv; + + switch (ld) { + case 0: + fdc_remove(dev->fdc); + + if (config->activate) { + um8669f_log("UM8669F: FDC enabled at port %04X IRQ %d DMA %d\n", config->io[0].base, config->irq[0].irq, (config->dma[0].dma == ISAPNP_DMA_DISABLED) ? -1 : config->dma[0].dma); + + if (config->io[0].base != ISAPNP_IO_DISABLED) + fdc_set_base(dev->fdc, config->io[0].base); + + fdc_set_irq(dev->fdc, config->irq[0].irq); + fdc_set_dma_ch(dev->fdc, (config->dma[0].dma == ISAPNP_DMA_DISABLED) ? -1 : config->dma[0].dma); + } else + um8669f_log("UM8669F: FDC disabled\n"); + + break; + + case 1: + case 2: + serial_remove(dev->uart[ld - 1]); + + if (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) { + um8669f_log("UM8669F: UART %d enabled at port %04X IRQ %d\n", ld - 1, config->io[0].base, config->irq[0].irq); + serial_setup(dev->uart[ld - 1], config->io[0].base, config->irq[0].irq); + } else + um8669f_log("UM8669F: UART %d disabled\n", ld - 1); + + break; + + case 3: + lpt1_remove(); + + if (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) { + um8669f_log("UM8669F: LPT enabled at port %04X IRQ %d\n", config->io[0].base, config->irq[0].irq); + lpt1_init(config->io[0].base); + } else + um8669f_log("UM8669F: LPT disabled\n"); + + break; + + case 5: + gameport_remap(0); + + if (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) { + um8669f_log("UM8669F: Game port enabled at port %04X\n", config->io[0].base); + gameport_remap(config->io[0].base); + } else + um8669f_log("UM8669F: Game port disabled\n"); + } } @@ -185,7 +194,8 @@ void um8669f_write(uint16_t port, uint8_t val, void *priv) { um8669f_t *dev = (um8669f_t *) priv; - int new_pnp_active; + + um8669f_log("UM8669F: write(%04X, %02X)\n", port, val); if (dev->locked) { if ((port == 0x108) && (val == 0xaa)) @@ -200,26 +210,8 @@ um8669f_write(uint16_t port, uint8_t val, void *priv) dev->regs_108[dev->cur_reg_108] = val; if (dev->cur_reg_108 == 0xc1) { - new_pnp_active = !!(dev->regs_108[0xc1] & 0x80); - if (new_pnp_active != dev->pnp_active) { - io_removehandler(0x0279, 0x0001, - NULL, NULL, NULL, um8669f_pnp_write, NULL, NULL, dev); - io_removehandler(0x0a79, 0x0001, - NULL, NULL, NULL, um8669f_pnp_write, NULL, NULL, dev); - io_removehandler(0x03e3, 0x0001, - um8669f_pnp_read, NULL, NULL, NULL, NULL, NULL, dev); - - if (new_pnp_active) { - io_sethandler(0x0279, 0x0001, - NULL, NULL, NULL, um8669f_pnp_write, NULL, NULL, dev); - io_sethandler(0x0a79, 0x0001, - NULL, NULL, NULL, um8669f_pnp_write, NULL, NULL, dev); - io_sethandler(0x03e3, 0x0001, - um8669f_pnp_read, NULL, NULL, NULL, NULL, NULL, dev); - } - - dev->pnp_active = new_pnp_active; - } + um8669f_log("UM8669F: ISAPnP %sabled\n", (val & 0x80) ? "en" : "dis"); + isapnp_enable_card(dev->pnp_card, (val & 0x80) ? 2 : 0); } } } @@ -239,6 +231,8 @@ um8669f_read(uint16_t port, void *priv) ret = dev->regs_108[dev->cur_reg_108]; } + um8669f_log("UM8669F: read(%04X) = %02X\n", port, ret); + return ret; } @@ -246,42 +240,21 @@ um8669f_read(uint16_t port, void *priv) void um8669f_reset(um8669f_t *dev) { + um8669f_log("UM8669F: reset()\n"); + fdc_reset(dev->fdc); serial_remove(dev->uart[0]); - serial_setup(dev->uart[0], SERIAL1_ADDR, SERIAL1_IRQ); serial_remove(dev->uart[1]); - serial_setup(dev->uart[1], SERIAL2_ADDR, SERIAL2_IRQ); lpt1_remove(); - lpt1_init(0x378); - if (dev->pnp_active) { - io_removehandler(0x0279, 0x0001, NULL, NULL, NULL, um8669f_pnp_write, NULL, NULL, dev); - io_removehandler(0x0a79, 0x0001, NULL, NULL, NULL, um8669f_pnp_write, NULL, NULL, dev); - io_removehandler(0x03e3, 0x0001, um8669f_pnp_read, NULL, NULL, NULL, NULL, NULL, dev); - dev->pnp_active = 0; - } + isapnp_enable_card(dev->pnp_card, 0); dev->locked = 1; - dev->dev[DEV_FDC].enable = 1; - dev->dev[DEV_FDC].addr = 0x03f0; - dev->dev[DEV_FDC].irq = 6; - dev->dev[DEV_FDC].dma = 2; - - dev->dev[DEV_COM1].enable = 1; - dev->dev[DEV_COM1].addr = 0x03f8; - dev->dev[DEV_COM1].irq = 4; - - dev->dev[DEV_COM2].enable = 1; - dev->dev[DEV_COM2].addr = 0x02f8; - dev->dev[DEV_COM2].irq = 3; - - dev->dev[DEV_LPT1].enable = 1; - dev->dev[DEV_LPT1].addr = 0x0378; - dev->dev[DEV_LPT1].irq = 7; + isapnp_reset_card(dev->pnp_card); } @@ -290,6 +263,8 @@ um8669f_close(void *priv) { um8669f_t *dev = (um8669f_t *) priv; + um8669f_log("UM8669F: close()\n"); + free(dev); } @@ -297,9 +272,15 @@ um8669f_close(void *priv) static void * um8669f_init(const device_t *info) { + um8669f_log("UM8669F: init()\n"); + um8669f_t *dev = (um8669f_t *) malloc(sizeof(um8669f_t)); memset(dev, 0, sizeof(um8669f_t)); + dev->pnp_card = isapnp_add_card(um8669f_pnp_rom, sizeof(um8669f_pnp_rom), um8669f_pnp_config_changed, NULL, NULL, NULL, dev); + for (uint8_t i = 0; i < (sizeof(um8669f_pnp_defaults) / sizeof(isapnp_device_config_t)); i++) + isapnp_set_device_defaults(dev->pnp_card, i, &um8669f_pnp_defaults[i]); + dev->fdc = device_add(&fdc_at_smc_device); dev->uart[0] = device_add_inst(&ns16550_device, 1); diff --git a/src/sio/sio_vt82c686.c b/src/sio/sio_vt82c686.c index 3963eed77..3c887fce0 100644 --- a/src/sio/sio_vt82c686.c +++ b/src/sio/sio_vt82c686.c @@ -11,6 +11,7 @@ * * * Author: RichardG, + * * Copyright 2020 RichardG. */ #include @@ -149,7 +150,7 @@ vt82c686_read(uint16_t port, void *priv) { vt82c686_t *dev = (vt82c686_t *) priv; uint8_t ret = 0xff; - + /* NOTE: Registers are [0xE0:0xFF] but we store them as [0x00:0x1F]. */ if (!(port & 1)) ret = dev->cur_reg; From 429d5f5c4ef8448dae610053a101c6f6996cd6ea Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 3 Apr 2021 00:16:15 -0300 Subject: [PATCH 7/9] Add string identifier to PnP IDE controllers as mandated by spec, fixes summary hanging on AMI machines --- src/disk/hdc_ide.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index 1c38fd0e3..a383da34c 100644 --- a/src/disk/hdc_ide.c +++ b/src/disk/hdc_ide.c @@ -135,6 +135,7 @@ static ide_bm_t *ide_bm[4] = { NULL, NULL, NULL, NULL }; static uint8_t ide_ter_pnp_rom[] = { 0x09, 0xf8, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, /* BOX0001, serial 0, dummy checksum (filled in by isapnp_add_card) */ 0x0a, 0x10, 0x10, /* PnP version 1.0, vendor version 1.0 */ + 0x82, 0x0e, 0x00, 'I', 'D', 'E', ' ', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'l', 'e', 'r', /* ANSI identifier */ 0x15, 0x09, 0xf8, 0x00, 0x01, 0x00, /* logical device BOX0001 */ 0x1c, 0x41, 0xd0, 0x06, 0x00, /* compatible device PNP0600 */ @@ -157,6 +158,7 @@ static uint8_t ide_ter_pnp_rom[] = { static uint8_t ide_qua_pnp_rom[] = { 0x09, 0xf8, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, /* BOX0001, serial 1, dummy checksum (filled in by isapnp_add_card) */ 0x0a, 0x10, 0x10, /* PnP version 1.0, vendor version 1.0 */ + 0x82, 0x0e, 0x00, 'I', 'D', 'E', ' ', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'l', 'e', 'r', /* ANSI identifier */ 0x15, 0x09, 0xf8, 0x00, 0x01, 0x00, /* logical device BOX0001 */ 0x1c, 0x41, 0xd0, 0x06, 0x00, /* compatible device PNP0600 */ From b6a948018a181bf985b5b5975f412f5234c4995d Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 3 Apr 2021 00:23:58 -0300 Subject: [PATCH 8/9] Fix warning in isapnp.c --- src/device/isapnp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/device/isapnp.c b/src/device/isapnp.c index f60f4f54c..cb9069481 100644 --- a/src/device/isapnp.c +++ b/src/device/isapnp.c @@ -915,8 +915,10 @@ isapnp_enable_card(void *priv, uint8_t enable) /* Invalidate other references if we're disabling this card. */ if (dev->isolated_card == card) dev->isolated_card = NULL; - if (dev->current_ld_card == card) - dev->current_ld = dev->current_ld_card = NULL; + if (dev->current_ld_card == card) { + dev->current_ld = NULL; + dev->current_ld_card = NULL; + } break; } From 5940b3f12eacb7c53bb3d50f7b188e343bb896c5 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 3 Apr 2021 19:02:11 -0300 Subject: [PATCH 9/9] ISAPnP: only invalidate card references when disabling the card --- src/device/isapnp.c | 12 +++++++----- src/sio/sio_um8669f.c | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/device/isapnp.c b/src/device/isapnp.c index cb9069481..f611a18ae 100644 --- a/src/device/isapnp.c +++ b/src/device/isapnp.c @@ -913,11 +913,13 @@ isapnp_enable_card(void *priv, uint8_t enable) card->state = (enable == 2) ? PNP_STATE_CONFIG : PNP_STATE_WAIT_FOR_KEY; /* Invalidate other references if we're disabling this card. */ - if (dev->isolated_card == card) - dev->isolated_card = NULL; - if (dev->current_ld_card == card) { - dev->current_ld = NULL; - dev->current_ld_card = NULL; + if (!card->enable) { + if (dev->isolated_card == card) + dev->isolated_card = NULL; + if (dev->current_ld_card == card) { + dev->current_ld = NULL; + dev->current_ld_card = NULL; + } } break; diff --git a/src/sio/sio_um8669f.c b/src/sio/sio_um8669f.c index ad3d3f5ad..2cfff686c 100644 --- a/src/sio/sio_um8669f.c +++ b/src/sio/sio_um8669f.c @@ -39,7 +39,7 @@ #include <86box/isapnp.h> -/* This ROM is reconstructed out of the several assumptions, some of which based on the IT8671F. */ +/* This ROM is reconstructed out of the several assumptions, some of which are based on the IT8671F. */ static uint8_t um8669f_pnp_rom[] = { 0x55, 0xa3, 0x86, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, /* UMC8669, dummy checksum (filled in by isapnp_add_card) */ 0x0a, 0x10, 0x10, /* PnP version 1.0, vendor version 1.0 */