Skip to content

Commit dbd7486

Browse files
committed
Hook up Bidirectional LPT, EPP, and ECP to all Super I/O chips (missing is vendor-specific Configuration Register B behavior but that's next on my list), fixed Super I/O chip mistakes for a number of machines, split 286/386SX/M6117D machines into three separate files and reordered them as well.
1 parent 42fa1db commit dbd7486

51 files changed

Lines changed: 4999 additions & 4400 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/chipset/wd76c10.c‎

Lines changed: 100 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ typedef struct {
8181
typedef struct
8282
{
8383
uint8_t ep, p92;
84+
uint8_t addr_sel;
8485

86+
uint8_t addr_regs[8];
8587
uint8_t vbios_states[4];
8688
uint8_t bios_states[8];
8789
uint8_t high_bios_states[8];
@@ -100,6 +102,7 @@ typedef struct
100102
};
101103

102104
uint16_t ems_page_regs[40];
105+
uint16_t lpt_base;
103106

104107
int locked;
105108

@@ -873,6 +876,92 @@ wd76c10_low_pages_recalc(wd76c10_t *dev)
873876
}
874877
}
875878

879+
static void
880+
wd73c30_reset(wd76c10_t *dev)
881+
{
882+
dev->addr_sel = 0x00;
883+
884+
dev->addr_regs[0x00] = 0x00;
885+
dev->addr_regs[0x01] = 0x00;
886+
dev->addr_regs[0x05] = 0x00;
887+
888+
serial_set_type(dev->uart[0], SERIAL_16450);
889+
serial_set_type(dev->uart[1], SERIAL_16450);
890+
891+
serial_set_clock_src(dev->uart[1], 1843200.0);
892+
serial_set_clock_src(dev->uart[0], 1843200.0);
893+
894+
lpt_set_ext(dev->lpt, 0);
895+
}
896+
897+
static void
898+
wd76c30_write(uint16_t port, uint8_t val, void *priv)
899+
{
900+
wd76c10_t *dev = (wd76c10_t *) priv;
901+
902+
switch (port & 0x0007) {
903+
case 0x0003:
904+
dev->addr_sel = val;
905+
switch (val & 0x60) {
906+
case 0x00:
907+
serial_set_clock_src(dev->uart[1], 1843200.0);
908+
break;
909+
case 0x20:
910+
serial_set_clock_src(dev->uart[1], 3072000.0);
911+
break;
912+
case 0x40:
913+
serial_set_clock_src(dev->uart[1], 6000000.0); /* What is MSTRX1? */
914+
break;
915+
case 0x60:
916+
serial_set_clock_src(dev->uart[1], 8000000.0);
917+
break;
918+
}
919+
switch (val & 0x18) {
920+
case 0x00:
921+
serial_set_clock_src(dev->uart[0], 1843200.0);
922+
break;
923+
case 0x08:
924+
serial_set_clock_src(dev->uart[0], 3072000.0);
925+
break;
926+
case 0x10:
927+
serial_set_clock_src(dev->uart[0], 6000000.0); /* What is MSTRX1? */
928+
break;
929+
case 0x18:
930+
serial_set_clock_src(dev->uart[0], 8000000.0);
931+
break;
932+
}
933+
break;
934+
case 0x0007:
935+
dev->addr_regs[dev->addr_sel & 0x07] = val;
936+
switch (dev->addr_sel & 0x07) {
937+
case 0x05:
938+
lpt_set_ext(dev->lpt, !!(val & 0x02));
939+
serial_set_type(dev->uart[0], (val & 0x01) ? SERIAL_16550 : SERIAL_16450);
940+
serial_set_type(dev->uart[1], (val & 0x01) ? SERIAL_16550 : SERIAL_16450);
941+
break;
942+
}
943+
break;
944+
}
945+
}
946+
947+
static uint8_t
948+
wd76c30_read(uint16_t port, void *priv)
949+
{
950+
wd76c10_t *dev = (wd76c10_t *) priv;
951+
uint8_t ret = 0xff;
952+
953+
switch (port & 0x0007) {
954+
case 0x0003:
955+
ret = dev->addr_sel;
956+
break;
957+
case 0x0007:
958+
ret = dev->addr_regs[dev->addr_sel & 0x07];
959+
break;
960+
}
961+
962+
return ret;
963+
}
964+
876965
static void
877966
wd76c10_ser_par_cs_recalc(wd76c10_t *dev)
878967
{
@@ -912,20 +1001,23 @@ wd76c10_ser_par_cs_recalc(wd76c10_t *dev)
9121001

9131002
/* LPT */
9141003
lpt_port_remove(dev->lpt);
1004+
if (dev->lpt_base != 0x0000)
1005+
io_removehandler(dev->lpt_base, 0x0008, wd76c30_read, NULL, NULL, wd76c30_write, NULL, NULL, dev);
1006+
dev->lpt_base = 0x0000;
9151007
switch ((dev->ser_par_cs >> 9) & 0x03) {
9161008
case 1:
917-
lpt_port_setup(dev->lpt, LPT_MDA_ADDR);
918-
lpt_port_irq(dev->lpt, LPT1_IRQ);
1009+
dev->lpt_base = LPT_MDA_ADDR;
9191010
break;
9201011
case 2:
921-
lpt_port_setup(dev->lpt, LPT1_ADDR);
922-
lpt_port_irq(dev->lpt, LPT1_IRQ);
1012+
dev->lpt_base = LPT1_ADDR;
9231013
break;
9241014
case 3:
925-
lpt_port_setup(dev->lpt, LPT2_ADDR);
926-
lpt_port_irq(dev->lpt, LPT1_IRQ);
1015+
dev->lpt_base = LPT2_ADDR;
9271016
break;
9281017
}
1018+
io_sethandler(dev->lpt_base, 0x0008, wd76c30_read, NULL, NULL, wd76c30_write, NULL, NULL, dev);
1019+
lpt_port_setup(dev->lpt, dev->lpt_base);
1020+
lpt_port_irq(dev->lpt, LPT1_IRQ);
9291021
}
9301022

9311023
static void
@@ -1239,6 +1331,8 @@ wd76c10_reset(void *priv)
12391331

12401332
nvr_lock_set(0x38, 0x08, 0x00, dev->nvr);
12411333

1334+
wd73c30_reset(dev);
1335+
12421336
wd76c10_banks_recalc(dev);
12431337
wd76c10_split_recalc(dev);
12441338
wd76c10_dis_mem_recalc(dev);

‎src/device/lpt.c‎

Lines changed: 114 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <86box/device.h>
2424
#include <86box/machine.h>
2525
#include <86box/network.h>
26+
#include <86box/plat_fallthrough.h>
2627

2728
static int next_inst = 0;
2829
int lpt_3bc_used = 0;
@@ -378,7 +379,35 @@ lpt_write(const uint16_t port, const uint8_t val, void *priv)
378379
}
379380
break;
380381

381-
case 0x0400: case 0x0404:
382+
case 0x0404:
383+
if (dev->cfg_regs_enabled) {
384+
switch (dev->eir) {
385+
case 0x00:
386+
dev->ext_regs[0x00] = val & 0x31;
387+
break;
388+
case 0x02:
389+
dev->ext_regs[0x02] = val & 0xd0;
390+
if (dev->ext_regs[0x02] & 0x80)
391+
dev->ecr = dev->ret_ecr;
392+
else switch (dev->ret_ecr & 0xe0) {
393+
case 0x00: case 0x20:
394+
case 0x80:
395+
dev->ecr = (dev->ret_ecr & 0x1f) | 0x60;
396+
break;
397+
}
398+
break;
399+
case 0x04:
400+
dev->ext_regs[0x00] = val & 0x37;
401+
break;
402+
case 0x05:
403+
dev->ext_regs[0x00] = val;
404+
dev->cnfga_readout = (val & 0x80) ? 0x1c : 0x14;
405+
break;
406+
}
407+
break;
408+
} else
409+
fallthrough;
410+
case 0x0400:
382411
switch (dev->ecr >> 5) {
383412
default:
384413
break;
@@ -424,10 +453,23 @@ lpt_write(const uint16_t port, const uint8_t val, void *priv)
424453

425454
dev->state = LPT_STATE_IDLE;
426455
}
427-
dev->ecr = val;
456+
if (dev->ext_regs[0x02] & 0x80)
457+
dev->ecr = val;
458+
else switch (val & 0xe0) {
459+
case 0x00: case 0x20:
460+
case 0x80:
461+
dev->ecr = (val & 0x1f) | 0x60;
462+
break;
463+
}
464+
dev->ret_ecr = val;
428465
lpt_ecp_update_irq(dev);
429466
break;
430467

468+
case 0x0403: case 0x0407:
469+
if (dev->cfg_regs_enabled)
470+
dev->eir = val & 0x07;
471+
break;
472+
431473
default:
432474
break;
433475
}
@@ -519,6 +561,12 @@ lpt_read_status(lpt_t *dev)
519561
return ret;
520562
}
521563

564+
uint8_t
565+
lpt_read_ecp_mode(lpt_t *dev)
566+
{
567+
return ((dev->ret_ecr & 0xe0) == 0x60) ? 0x60 : 0x00;
568+
}
569+
522570
uint8_t
523571
lpt_read(const uint16_t port, void *priv)
524572
{
@@ -567,7 +615,21 @@ lpt_read(const uint16_t port, void *priv)
567615
}
568616
break;
569617

570-
case 0x0400: case 0x0404:
618+
case 0x0404:
619+
if (dev->cfg_regs_enabled) {
620+
switch (dev->eir) {
621+
default:
622+
ret = 0xff;
623+
break;
624+
case 0x00: case 0x02:
625+
case 0x04: case 0x05:
626+
ret = dev->ext_regs[dev->eir];
627+
break;
628+
}
629+
break;
630+
} else
631+
fallthrough;
632+
case 0x0400:
571633
switch (dev->ecr >> 5) {
572634
default:
573635
break;
@@ -587,7 +649,13 @@ lpt_read(const uint16_t port, void *priv)
587649
}
588650
break;
589651

590-
case 0x0401: case 0x0405:
652+
case 0x0405:
653+
if (dev->cfg_regs_enabled) {
654+
ret = 0x00;
655+
break;
656+
} else
657+
fallthrough;
658+
case 0x0401:
591659
if ((dev->ecr & 0xe0) == 0xe0) {
592660
/* CNFGB */
593661
ret = 0x08;
@@ -599,11 +667,16 @@ lpt_read(const uint16_t port, void *priv)
599667
break;
600668

601669
case 0x0402: case 0x0406:
602-
ret = dev->ecr | dev->fifo_stat | (dev->dma_stat & 0x04);
670+
ret = dev->ret_ecr | dev->fifo_stat | (dev->dma_stat & 0x04);
603671
ret |= (fifo_get_full(dev->fifo) ? 0x02 : 0x00);
604672
ret |= (fifo_get_empty(dev->fifo) ? 0x01 : 0x00);
605673
break;
606674

675+
case 0x0403: case 0x0407:
676+
if (dev->cfg_regs_enabled)
677+
ret = dev->eir;
678+
break;
679+
607680
default:
608681
break;
609682
}
@@ -688,6 +761,13 @@ lpt_set_fifo_threshold(lpt_t *dev, const int threshold)
688761
fifo_set_trigger_len(dev->fifo, threshold);
689762
}
690763

764+
void
765+
lpt_set_cfg_regs_enabled(lpt_t *dev, const uint8_t cfg_regs_enabled)
766+
{
767+
if (lpt_ports[dev->id].enabled)
768+
dev->cfg_regs_enabled = cfg_regs_enabled;
769+
}
770+
691771
void
692772
lpt_set_cnfga_readout(lpt_t *dev, const uint8_t cnfga_readout)
693773
{
@@ -834,14 +914,21 @@ lpt_reset(void *priv)
834914
}
835915
}
836916

837-
dev->enable_irq = 0x00;
838-
dev->ext = !!(machine_has_bus(machine, MACHINE_BUS_MCA));
839-
dev->epp = 0;
840-
dev->ecp = 0;
841-
dev->ecr = 0x15;
842-
dev->dat = 0xff;
843-
dev->fifo_stat = 0x00;
844-
dev->dma_stat = 0x00;
917+
dev->enable_irq = 0x00;
918+
dev->cfg_regs_enabled = 0;
919+
dev->ext = !!(machine_has_bus(machine, MACHINE_BUS_MCA));
920+
dev->epp = 0;
921+
dev->ecp = 0;
922+
dev->ecr = 0x15;
923+
dev->ret_ecr = 0x15;
924+
dev->dat = 0xff;
925+
dev->fifo_stat = 0x00;
926+
dev->dma_stat = 0x00;
927+
928+
memset(dev->ext_regs, 0x00, 8);
929+
dev->ext_regs[0x02] = 0x80;
930+
dev->ext_regs[0x04] = 0x07;
931+
dev->cnfga_readout &= 0xf7;
845932
}
846933
}
847934

@@ -869,15 +956,20 @@ lpt_init(const device_t *info)
869956

870957
lpt_port_zero(dev);
871958

872-
dev->addr = 0xffff;
873-
dev->irq = 0xff;
874-
dev->dma = 0xff;
875-
dev->enable_irq = 0x00;
876-
dev->ext = 0;
877-
dev->epp = 0;
878-
dev->ecp = 0;
879-
dev->ecr = 0x15;
880-
dev->cnfga_readout = 0x14;
959+
dev->addr = 0xffff;
960+
dev->irq = 0xff;
961+
dev->dma = 0xff;
962+
dev->enable_irq = 0x00;
963+
dev->cfg_regs_enabled = 0;
964+
dev->ext = 0;
965+
dev->epp = 0;
966+
dev->ecp = 0;
967+
dev->ecr = 0x15;
968+
dev->ret_ecr = 0x15;
969+
dev->cnfga_readout = 0x10;
970+
971+
memset(dev->ext_regs, 0x00, 8);
972+
dev->ext_regs[0x02] = 0x80;
881973

882974
if (lpt_ports[dev->id].enabled) {
883975
if (info->local & 0xfff00000) {

‎src/device/serial.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,12 @@ serial_set_clock_src(serial_t *dev, double clock_src)
475475
serial_update_speed(dev);
476476
}
477477

478+
void
479+
serial_set_type(serial_t *dev, uint8_t type)
480+
{
481+
dev->type = type;
482+
}
483+
478484
void
479485
serial_write(uint16_t addr, uint8_t val, void *priv)
480486
{

0 commit comments

Comments
 (0)