Intel SIO overhaul, slight DMA clean-ups and SIO-related additions, made the PIIX/SMSC series of southbridges aware of CPU speed changes, and fixed a bug in the 86F loading code.

src/floppy/fdd_86f.c

@@ -3811,7 +3811,7 @@ d86f_load(int drive, wchar_t *fn)
 			if (dev->extra_bit_cells[1] > 32768)  dev->extra_bit_cells[1] = 32768;
 		}
 	} else {
-		dev->extra_bit_cells[0] = 0;
+		dev->extra_bit_cells[1] = 0;
 	}
     } else {
 	switch ((dev->disk_flags >> 1) >> 3) {

src/include/86box/dma.h

@@ -46,19 +46,21 @@
 
 
 typedef struct {
-    uint32_t	ab, ac;
+    uint8_t	m, mode, page, stat,
-    uint16_t	cb;
+		stat_rq, command,
-    int		cc;
+		ps2_mode, arb_level,
-    int		wp;
+		sg_command, sg_status,
-    uint8_t	m, mode;
+		ptr0, enabled,
-    uint8_t	page;
+		ext_mode, page_l,
-    uint8_t	stat, stat_rq;
+		page_h, pad;
-    uint8_t	command;
+    uint16_t	cb, io_addr,
-    int		size;
+		base, transfer_mode;
-
+    uint32_t	ptr, ptr_cur,
-    uint8_t	ps2_mode;
+		addr,
-    uint8_t	arb_level;
+		ab, ac;
-    uint16_t	io_addr;
+    int		cc, wp,
+		size, count,
+		eot;
 } dma_t;
 
 
@@ -93,5 +95,13 @@ extern void	dma_alias_remove_piix(void);
 extern void	dma_bm_read(uint32_t PhysAddress, uint8_t *DataRead, uint32_t TotalSize, int TransferSize);
 extern void	dma_bm_write(uint32_t PhysAddress, const uint8_t *DataWrite, uint32_t TotalSize, int TransferSize);
 
+void		dma_set_params(uint8_t advanced, uint32_t mask);
+void		dma_ext_mode_init(void);
+
+void		dma_high_page_init(void);
+
+void		dma_remove_sg(void);
+void		dma_set_sg_base(uint8_t sg_base);
+
 
 #endif	/*EMU_DMA_H*/

src/intel_piix.c

@@ -1161,6 +1161,20 @@ piix_close(void *p)
 }
 
 
+static void
+piix_speed_changed(void *priv)
+{
+    piix_t *dev = (piix_t *) priv;
+    int te;
+
+    te = timer_is_enabled(&dev->fast_off_timer);
+
+    timer_stop(&dev->fast_off_timer);
+    if (te)
+	timer_on_auto(&dev->fast_off_timer, dev->fast_off_period);
+}
+
+
 static void
 *piix_init(const device_t *info)
 {
@@ -1300,7 +1314,7 @@ const device_t piix_device =
     piix_close, 
     piix_reset,
     NULL,
-    NULL,
+    piix_speed_changed,
     NULL,
     NULL
 };
@@ -1314,7 +1328,7 @@ const device_t piix_rev02_device =
     piix_close, 
     piix_reset,
     NULL,
-    NULL,
+    piix_speed_changed,
     NULL,
     NULL
 };
@@ -1328,7 +1342,7 @@ const device_t piix3_device =
     piix_close, 
     piix_reset,
     NULL,
-    NULL,
+    piix_speed_changed,
     NULL,
     NULL
 };
@@ -1342,7 +1356,7 @@ const device_t piix4_device =
     piix_close, 
     piix_reset,
     NULL,
-    NULL,
+    piix_speed_changed,
     NULL,
     NULL
 };
@@ -1356,7 +1370,7 @@ const device_t piix4e_device =
     piix_close, 
     piix_reset,
     NULL,
-    NULL,
+    piix_speed_changed,
     NULL,
     NULL
 };
@@ -1370,7 +1384,7 @@ const device_t slc90e66_device =
     piix_close, 
     piix_reset,
     NULL,
-    NULL,
+    piix_speed_changed,
     NULL,
     NULL
 };

src/intel_sio.c

@@ -41,12 +41,35 @@ typedef struct
     uint16_t	timer_base,
 		timer_latch;
 
-    pc_timer_t	timer;
+    double	fast_off_period;
 
+    pc_timer_t	timer, fast_off_timer;
+
+    apm_t *	apm;
     port_92_t *	port_92;
 } sio_t;
 
 
+#ifdef ENABLE_SIO_LOG
+int sio_do_log = ENABLE_SIO_LOG;
+
+
+static void
+sio_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sio_do_log) {
+	va_start(ap, fmt);
+	pclog_ex(fmt, ap);
+	va_end(ap);
+    }
+}
+#else
+#define sio_log(fmt, ...)
+#endif
+
+
 static void
 sio_timer_write(uint16_t addr, uint8_t val, void *priv)
 {
@@ -131,39 +154,57 @@ sio_write(int func, int addr, uint8_t val, void *priv)
 	return;
 
     old = dev->regs[addr];
-    dev->regs[addr] = val;
 
     switch (addr) {
-	case 0x00: case 0x01: case 0x02: case 0x03:
-	case 0x08: case 0x09: case 0x0a: case 0x0b:
-	case 0x0e:
-		return;
-
 	case 0x04: /*Command register*/
-		val &= 0x08;
+		if (dev->id == 0x03)
-		val |= 0x07;
+			dev->regs[addr] = (dev->regs[addr] & 0xf7) | (val & 0x08);
-		break;
-	case 0x05:
-		val = 0;
 		break;
 
-	case 0x06: /*Status*/
-		val = 0;
-		break;
 	case 0x07:
-		val = 0x02;
+		dev->regs[addr] &= ~(val & 0x38);
 		break;
 
 	case 0x40:
-		if (!((val ^ old) & 0x40))
+		if (dev->id == 0x03) {
-			return;
+			dev->regs[addr] = (val & 0x7f);
 
-		dma_alias_remove();
+			if (!((val ^ old) & 0x40))
-		if (val & 0x40)
+				return;
-			dma_alias_set();
+
+			dma_alias_remove();
+			if (val & 0x40)
+				dma_alias_set();
+		} else
+			dev->regs[addr] = (val & 0x3f);
+		break;
+	case 0x41: case 0x44:
+		dev->regs[addr] = (val & 0x1f);
+		break;
+	case 0x42:
+		if (dev->id == 0x03)
+			dev->regs[addr] = val;
+		else
+			dev->regs[addr] = (val & 0x77);
+		break;
+	case 0x43:
+		if (dev->id == 0x03)
+			dev->regs[addr] = (val & 0x01);
+		break;
+	case 0x45: case 0x46:
+	case 0x47: case 0x48:
+	case 0x49: case 0x4a:
+	case 0x4b: case 0x4e:
+	case 0x54: case 0x55:
+	case 0x56:
+		dev->regs[addr] = val;
+		break;
+	case 0x4c: case 0x4d:
+		dev->regs[addr] = (val & 0x7f);
 		break;
-
 	case 0x4f:
+		dev->regs[addr] = val;
+
 		if (!((val ^ old) & 0x40))
 			return;
 
@@ -171,34 +212,29 @@ sio_write(int func, int addr, uint8_t val, void *priv)
 		if (val & 0x40)
 			port_92_add(dev->port_92);
 		break;
+	case 0x57:
+		dev->regs[addr] = val;
 
-	case 0x60:
+		dma_remove_sg();
-		if (val & 0x80)
+		dma_set_sg_base(val);
-			pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
-		else
-			pci_set_irq_routing(PCI_INTA, val & 0xf);
 		break;
-	case 0x61:
+	case 0x60: case 0x61: case 0x62: case 0x63:
-		if (val & 0x80)
+		if (dev->id == 0x03) {
-			pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
+			sio_log("Set IRQ routing: INT %c -> %02X\n", 0x41 + (addr & 0x03), val);
-		else
+			dev->regs[addr] = val & 0x8f;
-			pci_set_irq_routing(PCI_INTC, val & 0xf);
+			if (val & 0x80)
+				pci_set_irq_routing(PCI_INTA + (addr & 0x03), PCI_IRQ_DISABLED);
+			else
+				pci_set_irq_routing(PCI_INTA + (addr & 0x03), val & 0xf);
+		}
 		break;
-	case 0x62:
-		if (val & 0x80)
-			pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
-		else
-			pci_set_irq_routing(PCI_INTB, val & 0xf);
-		break;
-	case 0x63:
-		if (val & 0x80)
-			pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
-		else
-			pci_set_irq_routing(PCI_INTD, val & 0xf);
-		break;
-
 	case 0x80:
 	case 0x81:
+		if (addr == 0x80)
+			dev->regs[addr] = val & 0xfd;
+		else
+			dev->regs[addr] = val;
+
 		if (dev->timer_base & 0x01) {
 			io_removehandler(dev->timer_base & 0xfffc, 0x0004,
 					 sio_timer_read, sio_timer_readw, NULL,
@@ -211,6 +247,67 @@ sio_write(int func, int addr, uint8_t val, void *priv)
 				      sio_timer_write, sio_timer_writew, NULL, dev);
 		}
 		break;
+	case 0xa0:
+		if (dev->id == 0x03) {
+			dev->regs[addr] = val & 0x1f;
+			apm_set_do_smi(dev->apm, !!(val & 0x01) && !!(dev->regs[0xa2] & 0x80));
+			switch ((val & 0x18) >> 3) {
+				case 0x00:
+					dev->fast_off_period = PCICLK * 32768.0 * 60000.0;
+					break;
+				case 0x01:
+				default:
+					dev->fast_off_period = 0.0;
+					break;
+				case 0x02:
+					dev->fast_off_period = PCICLK;
+					break;
+				case 0x03:
+					dev->fast_off_period = PCICLK * 32768.0;
+					break;
+			}
+			cpu_fast_off_count = dev->regs[0xa8] + 1;
+			timer_disable(&dev->fast_off_timer);
+			if (dev->fast_off_period != 0.0)
+				timer_on_auto(&dev->fast_off_timer, dev->fast_off_period);
+		}
+		break;
+	case 0xa2:
+		if (dev->id == 0x03) {
+			dev->regs[addr] = val & 0xff;
+			apm_set_do_smi(dev->apm, !!(dev->regs[0xa0] & 0x01) && !!(val & 0x80));
+		}
+		break;
+	case 0xaa: case 0xac: case 0xae:
+		if (dev->id == 0x03)
+			dev->regs[addr] = val & 0xff;
+		break;
+	case 0xa4:
+		if (dev->id == 0x03) {
+			dev->regs[addr] = val & 0xfb;
+			cpu_fast_off_flags = (cpu_fast_off_flags & 0xffffff00) | dev->regs[addr];
+		}
+		break;
+	case 0xa5:
+		if (dev->id == 0x03) {
+			dev->regs[addr] = val & 0xff;
+			cpu_fast_off_flags = (cpu_fast_off_flags & 0xffff00ff) | (dev->regs[addr] << 8);
+		}
+		break;
+	case 0xa7:
+		if (dev->id == 0x03) {
+			dev->regs[addr] = val & 0xa0;
+			cpu_fast_off_flags = (cpu_fast_off_flags & 0x00ffffff) | (dev->regs[addr] << 24);
+		}
+		break;
+	case 0xa8:
+		dev->regs[addr] = val & 0xff;
+		cpu_fast_off_val = val;
+		cpu_fast_off_count = val + 1;
+		timer_disable(&dev->fast_off_timer);
+		if (dev->fast_off_period != 0.0)
+			timer_on_auto(&dev->fast_off_timer, dev->fast_off_period);
+		break;
     }
 }
 
@@ -271,7 +368,7 @@ sio_config_read(uint16_t port, void *priv)
 
 
 static void
-sio_reset(void *priv)
+sio_reset_hard(void *priv)
 {
     sio_t *dev = (sio_t *) priv;
 
@@ -279,23 +376,26 @@ sio_reset(void *priv)
 
     dev->regs[0x00] = 0x86; dev->regs[0x01] = 0x80; /*Intel*/
     dev->regs[0x02] = 0x84; dev->regs[0x03] = 0x04; /*82378IB (SIO)*/
-    dev->regs[0x04] = 0x07; dev->regs[0x05] = 0x00;
+    dev->regs[0x04] = 0x07;
-    dev->regs[0x06] = 0x00; dev->regs[0x07] = 0x02;
+    dev->regs[0x07] = 0x02;
     dev->regs[0x08] = dev->id;
 
     dev->regs[0x40] = 0x20; dev->regs[0x41] = 0x00;
-    dev->regs[0x42] = 0x04; dev->regs[0x43] = 0x00;
+    dev->regs[0x42] = 0x04;
-    dev->regs[0x44] = 0x20; dev->regs[0x45] = 0x10;
+    dev->regs[0x45] = 0x10; dev->regs[0x46] = 0x0f;
-    dev->regs[0x46] = 0x0f; dev->regs[0x47] = 0x00;
+    dev->regs[0x48] = 0x01;
-    dev->regs[0x48] = 0x01; dev->regs[0x49] = 0x10;
     dev->regs[0x4a] = 0x10; dev->regs[0x4b] = 0x0f;
     dev->regs[0x4c] = 0x56; dev->regs[0x4d] = 0x40;
     dev->regs[0x4e] = 0x07; dev->regs[0x4f] = 0x4f;
-    dev->regs[0x54] = 0x00; dev->regs[0x55] = 0x00; dev->regs[0x56] = 0x00;
+    dev->regs[0x57] = 0x04;
-    dev->regs[0x60] = 0x80; dev->regs[0x61] = 0x80; dev->regs[0x62] = 0x80; dev->regs[0x63] = 0x80;
+    if (dev->id == 0x03) {
-    dev->regs[0x80] = 0x78; dev->regs[0x81] = 0x00;
+	dev->regs[0x60] = 0x80; dev->regs[0x61] = 0x80; dev->regs[0x62] = 0x80; dev->regs[0x63] = 0x80;
-    dev->regs[0xa0] = 0x08;
+    }
-    dev->regs[0xa8] = 0x0f;
+    dev->regs[0x80] = 0x78;
+    if (dev->id == 0x03) {
+	dev->regs[0xa0] = 0x08;
+	dev->regs[0xa8] = 0x0f;
+    }
 
     pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
     pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
@@ -312,12 +412,60 @@ sio_reset(void *priv)
 }
 
 
+static void
+sio_apm_out(uint16_t port, uint8_t val, void *p)
+{
+    sio_t *dev = (sio_t *) p;
+
+    if (dev->apm->do_smi)
+	dev->regs[0xaa] |= 0x80;
+}
+
+
+static void
+sio_fast_off_count(void *priv)
+{
+    sio_t *dev = (sio_t *) priv;
+
+    cpu_fast_off_count--;
+
+    if (cpu_fast_off_count == 0) {
+	smi_line = 1;
+	dev->regs[0xaa] |= 0x20;
+	cpu_fast_off_count = dev->regs[0xa8] + 1;
+    }
+
+    timer_on_auto(&dev->fast_off_timer, dev->fast_off_period);
+}
+
+
+static void
+sio_reset(void *p)
+{
+    sio_t *dev = (sio_t *) p;
+
+    sio_write(0, 0x57, 0x04, p);
+
+    dma_set_params(1, 0xffffffff);
+
+    if (dev->id == 0x03) {
+	sio_write(0, 0xa0, 0x08, p);
+	sio_write(0, 0xa2, 0x00, p);
+	sio_write(0, 0xa4, 0x00, p);
+	sio_write(0, 0xa5, 0x00, p);
+	sio_write(0, 0xa6, 0x00, p);
+	sio_write(0, 0xa7, 0x00, p);
+	sio_write(0, 0xa8, 0x0f, p);
+    }
+}
+
+
 static void
 sio_close(void *p)
 {
-    sio_t *sio = (sio_t *)p;
+    sio_t *dev = (sio_t *)p;
 
-    free(sio);
+    free(dev);
 }
 
 
@@ -332,34 +480,64 @@ sio_speed_changed(void *priv)
     timer_disable(&dev->timer);
     if (te)
 	timer_set_delay_u64(&dev->timer, ((uint64_t) dev->timer_latch) * TIMER_USEC);
+
+    if (dev->id == 0x03) {
+	te = timer_is_enabled(&dev->fast_off_timer);
+
+	timer_stop(&dev->fast_off_timer);
+	if (te)
+		timer_on_auto(&dev->fast_off_timer, dev->fast_off_period);
+    }
 }
 
 
 static void *
 sio_init(const device_t *info)
 {
-    sio_t *sio = (sio_t *) malloc(sizeof(sio_t));
+    sio_t *dev = (sio_t *) malloc(sizeof(sio_t));
-    memset(sio, 0, sizeof(sio_t));
+    memset(dev, 0, sizeof(sio_t));
 
-    pci_add_card(PCI_ADD_SOUTHBRIDGE, sio_read, sio_write, sio);
+    pci_add_card(PCI_ADD_SOUTHBRIDGE, sio_read, sio_write, dev);
 
-    device_add(&apm_device);
+    dev->id = info->local;
 
-    sio->id = info->local;
+    if (dev->id == 0x03)
-    sio_reset(sio);
+	timer_add(&dev->fast_off_timer, sio_fast_off_count, dev, 0);
 
-    sio->port_92 = device_add(&port_92_pci_device);
+    sio_reset_hard(dev);
 
-    dma_alias_set();
+    cpu_fast_off_flags = 0x00000000;
+
+    if (dev->id == 0x03) {
+	cpu_fast_off_val = dev->regs[0xa8];
+	cpu_fast_off_count = cpu_fast_off_val + 1;
+    } else
+	cpu_fast_off_val = cpu_fast_off_count = 0;
+
+    if (dev->id == 0x03) {
+	dev->apm = device_add(&apm_pci_device);
+	/* APM intercept handler to update 82378ZB SMI status on APM SMI. */
+	io_sethandler(0x00b2, 0x0001, NULL, NULL, NULL, sio_apm_out, NULL, NULL, dev);
+    }
+
+    dev->port_92 = device_add(&port_92_pci_device);
+
+    dma_set_sg_base(0x04);
+    dma_set_params(1, 0xffffffff);
+    dma_ext_mode_init();
+    dma_high_page_init();
+
+    if (dev->id == 0x03)
+	dma_alias_set();
 
     io_sethandler(0x0073, 0x0001,
-		  sio_config_read, NULL, NULL, sio_config_write, NULL, NULL, sio);
+		  sio_config_read, NULL, NULL, sio_config_write, NULL, NULL, dev);
     io_sethandler(0x0075, 0x0001,
-		  sio_config_read, NULL, NULL, sio_config_write, NULL, NULL, sio);
+		  sio_config_read, NULL, NULL, sio_config_write, NULL, NULL, dev);
 
-    timer_add(&sio->timer, NULL, NULL, 0);
+    timer_add(&dev->timer, NULL, NULL, 0);
 
-    return sio;
+    return dev;
 }
 
 
@@ -370,7 +548,7 @@ const device_t sio_device =
     0x00,
     sio_init,
     sio_close,
-    NULL,
+    sio_reset,
     NULL,
     sio_speed_changed,
     NULL,
@@ -385,7 +563,7 @@ const device_t sio_zb_device =
     0x03,
     sio_init,
     sio_close,
-    NULL,
+    sio_reset,
     NULL,
     sio_speed_changed,
     NULL,

src/pci.c

@@ -677,6 +677,7 @@ static void
 trc_reset(uint8_t val)
 {
     if (val & 2) {
+	dma_reset();
 	device_reset_all_pci();
 
 	cpu_alt_reset = 0;