PCI changes :

- Each machine now specifies what PCI device IDs are used as generic card slots
- Implemented IRQ handling
- Added SIO chip to allow IRQ routing for Premiere/PCI

src/Makefile.am

@@ -16,7 +16,7 @@ dac.c dells200.c device.c disc.c disc_fdi.c disc_img.c disc_sector.c dma.c fdc.c
 hdd.c hdd_esdi.c headland.c i430lx.c i430fx.c i430vx.c ide.c intel.c intel_flash.c io.c jim.c joystick_ch_flightstick_pro.c joystick_standard.c joystick_sw_pad.c \
 joystick_tm_fcs.c keyboard.c keyboard_amstrad.c keyboard_at.c keyboard_olim24.c keyboard_pcjr.c keyboard_xt.c \
 lpt.c mca.c mcr.c mem.c mfm_at.c mfm_xebec.c model.c mouse.c mouse_ps2.c mouse_serial.c neat.c nmi.c nvr.c olivetti_m24.c \
-opti495.c pc.c pci.c pic.c piix.c pit.c ppi.c ps1.c ps2.c ps2_mca.c ps2_nvr.c rom.c rtc.c scat.c serial.c sis496.c sound.c \
+opti495.c pc.c pci.c pic.c piix.c pit.c ppi.c ps1.c ps2.c ps2_mca.c ps2_nvr.c rom.c rtc.c scat.c serial.c sio.c sis496.c sound.c \
 sound_ad1848.c sound_adlib.c sound_adlibgold.c sound_cms.c sound_emu8k.c sound_gus.c \
 sound_mpu401_uart.c sound_opl.c sound_pas16.c sound_ps1.c sound_pssj.c sound_sb.c sound_sb_dsp.c sound_sn76489.c \
 sound_speaker.c sound_ssi2001.c sound_wss.c sound_ym7128.c soundopenal.c tandy_eeprom.c tandy_rom.c \

src/Makefile.linux32

@@ -11,7 +11,7 @@ dac.o dells200.o device.o disc.o disc_fdi.o disc_img.o disc_sector.o dma.o fdc.o
 hdd.o hdd_esdi.o headland.o i430lx.o i430fx.o i430vx.o ide.o intel.o intel_flash.o io.o jim.o joystick_ch_flightstick_pro.o joystick_standard.o joystick_sw_pad.o \
 joystick_tm_fcs.o keyboard.o keyboard_amstrad.o keyboard_at.o keyboard_olim24.o keyboard_pcjr.o keyboard_xt.o \
 lpt.o mca.o mcr.o mem.o mfm_at.o mfm_xebec.o model.o mouse.o mouse_ps2.o mouse_serial.o neat.o nmi.o nvr.o olivetti_m24.o \
-opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sis496.o sound.o \
+opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sio.o sis496.o sound.o \
 sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_emu8k.o sound_gus.o \
 sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
 sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o thread-pthread.o \

src/Makefile.linux32-wx-sdl2

@@ -9,7 +9,7 @@ dac.o dells200.o device.o disc.o disc_fdi.o disc_img.o disc_sector.o dma.o fdc.o
 hdd.o hdd_esdi.o headland.o i430lx.o i430fx.o i430vx.o ide.o intel.o intel_flash.o io.o jim.o joystick_ch_flightstick_pro.o joystick_standard.o joystick_sw_pad.o \
 joystick_tm_fcs.o keyboard.o keyboard_amstrad.o keyboard_at.o keyboard_olim24.o keyboard_pcjr.o keyboard_xt.o \
 lpt.o mca.o mcr.o mem.o mfm_at.o mfm_xebec.o model.o mouse.o mouse_ps2.o mouse_serial.o neat.o nmi.o nvr.o olivetti_m24.o \
-opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sis496.o sound.o \
+opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sio.o sis496.o sound.o \
 sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_emu8k.o sound_gus.o \
 sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
 sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o \

src/Makefile.linux64

@@ -10,7 +10,7 @@ dac.o dells200.o device.o disc.o disc_fdi.o disc_img.o disc_sector.o dma.o fdc.o
 hdd.o hdd_esdi.o headland.o i430lx.o i430fx.o i430vx.o ide.o intel.o intel_flash.o io.o jim.o joystick_ch_flightstick_pro.o joystick_standard.o joystick_sw_pad.o \
 joystick_tm_fcs.o keyboard.o keyboard_amstrad.o keyboard_at.o keyboard_olim24.o keyboard_pcjr.o keyboard_xt.o \
 lpt.o mca.o mcr.o mem.o mfm_at.o mfm_xebec.o model.o mouse.o mouse_ps2.o mouse_serial.o neat.o nmi.o nvr.o olivetti_m24.o \
-opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sis496.o sound.o \
+opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sio.o sis496.o sound.o \
 sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_emu8k.o sound_gus.o \
 sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
 sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o thread-pthread.o \

src/Makefile.linux64-wx-sdl2

@@ -9,7 +9,7 @@ dac.o dells200.o device.o disc.o disc_fdi.o disc_img.o disc_sector.o dma.o fdc.o
 hdd.o hdd_esdi.o headland.o i430lx.o i430fx.o i430vx.o ide.o intel.o intel_flash.o io.o jim.o joystick_ch_flightstick_pro.o joystick_standard.o joystick_sw_pad.o \
 joystick_tm_fcs.o keyboard.o keyboard_amstrad.o keyboard_at.o keyboard_olim24.o keyboard_pcjr.o keyboard_xt.o \
 lpt.o mca.o mcr.o mem.o mfm_at.o mfm_xebec.o model.o mouse.o mouse_ps2.o mouse_serial.o neat.o nmi.o nvr.o olivetti_m24.o \
-opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sis496.o sound.o \
+opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sio.o sis496.o sound.o \
 sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_emu8k.o sound_gus.o \
 sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
 sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o \

src/Makefile.mingw

@@ -9,7 +9,7 @@ OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad
 	i430vx.o ide.o intel.o intel_flash.o io.o jim.o joystick_ch_flightstick_pro.o joystick_standard.o joystick_sw_pad.o joystick_tm_fcs.o keyboard.o keyboard_amstrad.o keyboard_at.o \
 	keyboard_olim24.o keyboard_pcjr.o keyboard_xt.o lpt.o mca.o mcr.o mem.o mfm_at.o mfm_xebec.o model.o mouse.o mouse_ps2.o \
 	mouse_serial.o neat.o nmi.o nvr.o olivetti_m24.o opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o \
-	scat.o serial.o sis496.o sound.o sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_dbopl.o \
+	scat.o serial.o sio.o sis496.o sound.o sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_dbopl.o \
 	sound_emu8k.o sound_gus.o sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_resid.o \
 	sound_sb.o sound_sb_dsp.o sound_sn76489.o sound_speaker.o sound_ssi2001.o sound_wss.o \
 	sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o timer.o um8881f.o um8669f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o \

src/Makefile.mingw-wx-sdl2

@@ -9,7 +9,7 @@ OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad
 	i430vx.o ide.o intel.o intel_flash.o io.o jim.o joystick_ch_flightstick_pro.o joystick_standard.o joystick_sw_pad.o joystick_tm_fcs.o keyboard.o keyboard_amstrad.o keyboard_at.o \
 	keyboard_olim24.o keyboard_pcjr.o keyboard_xt.o lpt.o mca.o mcr.o mem.o mfm_at.o mfm_xebec.o model.o mouse.o mouse_ps2.o \
 	mouse_serial.o neat.o nmi.o nvr.o olivetti_m24.o opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o \
-	scat.o serial.o sis496.o sound.o sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_dbopl.o \
+	scat.o serial.o sio.o sis496.o sound.o sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_dbopl.o \
 	sound_emu8k.o sound_gus.o sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_resid.o \
 	sound_sb.o sound_sb_dsp.o sound_sn76489.o sound_speaker.o sound_ssi2001.o sound_wss.o \
 	sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o timer.o um8881f.o um8669f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o \

src/Makefile.mingw64

@@ -9,7 +9,7 @@ OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad
 	i430vx.o ide.o intel.o intel_flash.o io.o jim.o joystick_ch_flightstick_pro.o joystick_standard.o joystick_sw_pad.o joystick_tm_fcs.o keyboard.o keyboard_amstrad.o keyboard_at.o \
 	keyboard_olim24.o keyboard_pcjr.o keyboard_xt.o lpt.o mca.o mcr.o mem.o mfm_at.o mfm_xebec.o model.o mouse.o mouse_ps2.o \
 	mouse_serial.o neat.o nmi.o nvr.o olivetti_m24.o opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o \
-	scat.o serial.o sis496.o sound.o sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_dbopl.o \
+	scat.o serial.o sio.o sis496.o sound.o sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_dbopl.o \
 	sound_emu8k.o sound_gus.o sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_resid.o \
 	sound_sb.o sound_sb_dsp.o sound_sn76489.o sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o \
 	soundopenal.o tandy_eeprom.o tandy_rom.o timer.o um8881f.o um8669f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o \

src/Makefile.osx64-wx-sdl2

@@ -9,7 +9,7 @@ dac.o device.o dells200.o disc.o disc_fdi.o disc_img.o disc_sector.o dma.o fdc.o
 hdd.o hdd_esdi.o headland.o i430lx.o i430fx.o i430vx.o ide.o intel.o intel_flash.o io.o jim.o joystick_ch_flightstick_pro.o joystick_standard.o joystick_sw_pad.o \
 joystick_tm_fcs.o keyboard.o keyboard_amstrad.o keyboard_at.o keyboard_olim24.o keyboard_pcjr.o keyboard_xt.o \
 lpt.o mca.o mcr.o mem.o mfm_at.o mfm_xebec.o model.o mouse.o mouse_ps2.o mouse_serial.o neat.o nmi.o nvr.o olivetti_m24.o \
-opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sis496.o sound.o \
+opti495.o pc.o pci.o pic.o piix.o pit.o ppi.o ps1.o ps2.o ps2_mca.o ps2_nvr.o rom.o rtc.o scat.o serial.o sio.o sis496.o sound.o \
 sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_emu8k.o sound_gus.o \
 sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
 sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o \

src/model.c

@@ -44,6 +44,7 @@
 #include "ps2_mca.h"
 #include "scat.h"
 #include "serial.h"
+#include "sio.h"
 #include "sis496.h"
 #include "sound_ps1.h"
 #include "sound_pssj.h"
@@ -51,7 +52,6 @@
 #include "tandy_eeprom.h"
 #include "tandy_rom.h"
 #include "um8669f.h"
-#include "um8881f.h"
 #include "vid_pcjr.h"
 #include "vid_tandy.h"
 #include "wd76c10.h"
@@ -81,7 +81,6 @@ void     at_wd76c10_init();
 void     at_ali1429_init();
 void    at_headland_init();
 void     at_opti495_init();
-void     at_um8881f_init();
 void      at_sis496_init();
 void      at_i430vx_init();
 void      at_batman_init();
@@ -134,7 +133,6 @@ MODEL models[] =
         {"AMI 386DX clone",       ROM_AMI386DX_OPTI495, "ami386dx",       { {"Intel", cpus_i386DX},      {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, 0, MODEL_AT|MODEL_HAS_IDE,             1, 256,   1,     at_opti495_init, NULL},
         {"AMI 486 clone",         ROM_AMI486,           "ami486",         { {"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486}},  0, MODEL_AT|MODEL_HAS_IDE,             1, 256,   1,     at_ali1429_init, NULL},
         {"AMI WinBIOS 486",       ROM_WIN486,           "win486",         { {"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486}},  0, MODEL_AT|MODEL_HAS_IDE,             1, 256,   1,     at_ali1429_init, NULL},
-/*        {"AMI WinBIOS 486 PCI", ROM_PCI486,    { "Intel", cpus_i486,    "AMD", cpus_Am486, "Cyrix", cpus_Cx486},   0, 1,  1, 256, 1, at_um8881f_init},*/
         {"Award SiS 496/497",     ROM_SIS496,           "sis496",         { {"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486}},  0, MODEL_AT|MODEL_PCI|MODEL_HAS_IDE,             1, 256,   1,      at_sis496_init, NULL},
         {"Intel Premiere/PCI",    ROM_REVENGE,          "revenge",        { {"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL}},        0, MODEL_AT|MODEL_PCI|MODEL_PS2|MODEL_HAS_IDE,   1, 128,   1,      at_batman_init, NULL},
         {"Intel Advanced/EV",     ROM_ENDEAVOR,         "endeavor",       { {"Intel", cpus_PentiumS5},   {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}},   0, MODEL_AT|MODEL_PCI|MODEL_PS2|MODEL_HAS_IDE,   1, 128,   1,    at_endeavor_init, NULL},
@@ -458,19 +456,14 @@ void at_ali1429_init()
         ali1429_init();
 }
 
-void at_um8881f_init()
-{
-        at_init();
-        ide_init();
-        pci_init(PCI_CONFIG_TYPE_1, 0, 31);
-        um8881f_init();
-}
-
 void at_sis496_init()
 {
         at_init();
         ide_init();
-        pci_init(PCI_CONFIG_TYPE_1, 0, 31);
+        pci_init(PCI_CONFIG_TYPE_1);
+        pci_slot(0xb);
+        pci_slot(0xd);
+        pci_slot(0xf);
         device_add(&sis496_device);
 }
 
@@ -478,8 +471,12 @@ void at_batman_init()
 {
         at_init();
         ide_init();
-        pci_init(PCI_CONFIG_TYPE_2, 0xd, 0x10);
+        pci_init(PCI_CONFIG_TYPE_2);
+        pci_slot(0xc);
+        pci_slot(0xe);
+        pci_slot(0x6);
         i430lx_init();
+        sio_init(2, 0xc, 0xe, 0x6, 0);
         fdc37c665_init();
         intel_batman_init();
         device_add(&intel_flash_bxt_ami_device);
@@ -488,9 +485,13 @@ void at_endeavor_init()
 {
         at_init();
         ide_init();
-        pci_init(PCI_CONFIG_TYPE_1, 0xd, 0x10);
+        pci_init(PCI_CONFIG_TYPE_1);
+        pci_slot(0xd);
+        pci_slot(0xe);
+        pci_slot(0xf);
+        pci_slot(0x10);
         i430fx_init();
-        piix_init(7);
+        piix_init(7, 0xd, 0xe, 0xf, 0x10);
         um8669f_init();
         intel_endeavor_init();
         device_add(&intel_flash_bxt_ami_device);
@@ -500,9 +501,13 @@ void at_i430vx_init()
 {
         at_init();
         ide_init();
-        pci_init(PCI_CONFIG_TYPE_1, 0, 31);
+        pci_init(PCI_CONFIG_TYPE_1);
+        pci_slot(0x11);
+        pci_slot(0x12);
+        pci_slot(0x13);
+        pci_slot(0x14);
         i430vx_init();
-        piix_init(7);
+        piix_init(7, 18, 17, 20, 19);
         um8669f_init();
         device_add(&intel_flash_bxt_device);
 }

src/pci.c

@@ -1,14 +1,19 @@
 #include "ibm.h"
 #include "io.h"
 #include "mem.h"
+#include "pic.h"
 
 #include "pci.h"
 
 void    (*pci_card_write[32])(int func, int addr, uint8_t val, void *priv);
 uint8_t  (*pci_card_read[32])(int func, int addr, void *priv);
 void           *pci_priv[32];
+static int pci_irq_routing[32];
+static int pci_irq_active[32];
+static int pci_irqs[4];
+static int pci_card_valid[32];
+
 static int pci_index, pci_func, pci_card, pci_bus, pci_enable, pci_key;
-static int pci_min_card, pci_max_card;
 int pci_burst_time, pci_nonburst_time;
 
 void pci_cf8_write(uint16_t port, uint32_t val, void *p)
@@ -116,8 +121,46 @@ uint8_t pci_type2_read(uint16_t port, void *priv)
         }
         return 0xff;
 }
-                
-void pci_init(int type, int min_card, int max_card)
+
+void pci_set_irq_routing(int pci_int, int irq)
+{
+        pci_irqs[pci_int - 1] = irq;
+//        pclog("pci_set_irq_routing: pci_int=%i irq=%i\n", pci_int, irq);
+}
+
+void pci_set_card_routing(int card, int pci_int)
+{
+        pci_irq_routing[card] = pci_int;
+//        pclog("pci_irq_routing: card=%i pci_int=%i\n", card, pci_int);
+}
+
+void pci_set_irq(int card, int pci_int)
+{
+//        pclog("pci_set_irq: card=%i irq_routing=%i\n", card, pci_irq_routing[card]);
+        if (pci_irq_routing[card])
+        {
+                int irq = ((pci_int - PCI_INTA) + (pci_irq_routing[card] - PCI_INTA)) & 3;
+//                pclog("  irq=%i pci_irqs=%i active=%i\n", irq, pci_irqs[irq], pci_irq_active[card]);
+                if (pci_irqs[irq] != PCI_IRQ_DISABLED && !pci_irq_active[card])
+                        picint(1 << pci_irqs[irq]);
+                pci_irq_active[card] = 1;
+        }
+}
+
+void pci_clear_irq(int card, int pci_int)
+{
+//        pclog("pci_clear_irq: card=%i irq_routing=%i\n", card, pci_irq_routing[card]);
+        if (pci_irq_routing[card])
+        {
+                int irq = ((pci_int - PCI_INTA) + (pci_irq_routing[card] - PCI_INTA)) & 3;
+//                pclog("  irq=%i pci_irqs=%i active=%i\n", irq, pci_irqs[irq], pci_irq_active[card]);        
+                if (pci_irqs[irq] != PCI_IRQ_DISABLED && pci_irq_active[card])
+                        picintc(1 << pci_irqs[irq]);
+                pci_irq_active[card] = 0;
+        }
+}
+
+void pci_init(int type)
 {
         int c;
 
@@ -139,10 +182,18 @@ void pci_init(int type, int min_card, int max_card)
                 pci_card_read[c] = NULL;
                 pci_card_write[c] = NULL;
                 pci_priv[c] = NULL;
+                pci_irq_routing[c] = 0;
+                pci_irq_active[c] = 0;
+                pci_card_valid[c] = 0;
         }
         
-        pci_min_card = min_card;
-        pci_max_card = max_card;
+        for (c = 0; c < 4; c++)
+                pci_irqs[c] = PCI_IRQ_DISABLED;
+}
+
+void pci_slot(int card)
+{
+        pci_card_valid[card] = 1;
 }
 
 void pci_add_specific(int card, uint8_t (*read)(int func, int addr, void *priv), void (*write)(int func, int addr, uint8_t val, void *priv), void *priv)
@@ -152,18 +203,20 @@ void pci_add_specific(int card, uint8_t (*read)(int func, int addr, void *priv),
               pci_priv[card] = priv;
 }
 
-void pci_add(uint8_t (*read)(int func, int addr, void *priv), void (*write)(int func, int addr, uint8_t val, void *priv), void *priv)
+int pci_add(uint8_t (*read)(int func, int addr, void *priv), void (*write)(int func, int addr, uint8_t val, void *priv), void *priv)
 {
         int c;
         
-        for (c = pci_min_card; c <= pci_max_card; c++)
+        for (c = 0; c < 32; c++)
         {
-                if (!pci_card_read[c] && !pci_card_write[c])
+                if (pci_card_valid[c] && !pci_card_read[c] && !pci_card_write[c])
                 {
                          pci_card_read[c] = read;
                         pci_card_write[c] = write;
                               pci_priv[c] = priv;
-                        return;
+                        return c;
                 }
         }
+        
+        return -1;
 }

src/pci.h

@@ -1,6 +1,11 @@
-void pci_init(int type, int min_card, int max_card);
+void pci_init(int type);
+void pci_slot(int card);
 void pci_add_specific(int card, uint8_t (*read)(int func, int addr, void *priv), void (*write)(int func, int addr, uint8_t val, void *priv), void *priv);
-void pci_add(uint8_t (*read)(int func, int addr, void *priv), void (*write)(int func, int addr, uint8_t val, void *priv), void *priv);
+int pci_add(uint8_t (*read)(int func, int addr, void *priv), void (*write)(int func, int addr, uint8_t val, void *priv), void *priv);
+void pci_set_irq_routing(int card, int irq);
+void pci_set_card_routing(int card, int pci_int);
+void pci_set_irq(int card, int pci_int);
+void pci_clear_irq(int card, int pci_int);
 
 #define PCI_REG_COMMAND 0x04
 
@@ -10,4 +15,11 @@ void pci_add(uint8_t (*read)(int func, int addr, void *priv), void (*write)(int
 #define PCI_CONFIG_TYPE_1 1
 #define PCI_CONFIG_TYPE_2 2
 
+#define PCI_INTA 1
+#define PCI_INTB 2
+#define PCI_INTC 3
+#define PCI_INTD 4
+
+#define PCI_IRQ_DISABLED -1
+
 extern int pci_burst_time, pci_nonburst_time;

src/piix.c

@@ -87,6 +87,35 @@ void piix_write(int func, int addr, uint8_t val, void *priv)
                         case 0x08: case 0x09: case 0x0a: case 0x0b:
                         case 0x0e:
                         return;
+                        
+                        case 0x60:
+//                        pclog("IRQ routing %02x %02x\n", addr, val);
+                        if (val & 0x80)
+                                pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
+                        else
+                                pci_set_irq_routing(PCI_INTA, val & 0xf);
+                        break;
+                        case 0x61:
+//                        pclog("IRQ routing %02x %02x\n", addr, val);
+                        if (val & 0x80)
+                                pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
+                        else
+                                pci_set_irq_routing(PCI_INTB, val & 0xf);
+                        break;
+                        case 0x62:
+//                        pclog("IRQ routing %02x %02x\n", addr, val);
+                        if (val & 0x80)
+                                pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
+                        else
+                                pci_set_irq_routing(PCI_INTC, val & 0xf);
+                        break;
+                        case 0x63:
+//                        pclog("IRQ routing %02x %02x\n", addr, val);
+                        if (val & 0x80)
+                                pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
+                        else
+                                pci_set_irq_routing(PCI_INTD, val & 0xf);
+                        break;
                 }
                 card_piix[addr] = val;
         }
@@ -306,7 +335,7 @@ void piix_bus_master_set_irq(int channel)
         piix_busmaster[channel].status |= 4;
 }
 
-void piix_init(int card)
+void piix_init(int card, int pci_a, int pci_b, int pci_c, int pci_d)
 {
         pci_add_specific(card, piix_read, piix_write, NULL);
         
@@ -346,4 +375,9 @@ void piix_init(int card)
         card_piix_ide[0x42] = card_piix_ide[0x43] = 0x00;
         
         ide_set_bus_master(piix_bus_master_sector_read, piix_bus_master_sector_write, piix_bus_master_set_irq);
+        
+        pci_set_card_routing(pci_a, PCI_INTA);
+        pci_set_card_routing(pci_b, PCI_INTB);
+        pci_set_card_routing(pci_c, PCI_INTC);
+        pci_set_card_routing(pci_d, PCI_INTD);
 }

src/piix.h

@@ -1 +1 @@
-void piix_init(int card);
+void piix_init(int card, int pci_a, int pci_b, int pci_c, int pci_d);

src/sio.c

@@ -0,0 +1,119 @@
+#include <string.h>
+
+#include "ibm.h"
+#include "ide.h"
+#include "io.h"
+#include "mem.h"
+#include "pci.h"
+
+#include "sio.h"
+
+static uint8_t card_sio[256];
+//static int pci_cards_ids[4];
+
+void sio_write(int func, int addr, uint8_t val, void *priv)
+{
+//        pclog("sio_write: func=%d addr=%02x val=%02x %04x:%08x\n", func, addr, val, CS, cpu_state.pc);
+        if (func > 0)
+                return;
+        
+                if (addr >= 0x0f && addr < 0x4c)
+                        return;
+
+        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;
+                val |= 0x07;
+                break;
+                case 0x05:
+                val = 0;
+                break;
+                
+                case 0x06: /*Status*/
+                val = 0;
+                break;
+                case 0x07:
+                val = 0x02;
+                break;
+
+                case 0x60:
+//                pclog("IRQ routing %02x %02x\n", addr, val);
+                if (val & 0x80)
+                        pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
+                else
+                        pci_set_irq_routing(PCI_INTA, val & 0xf);
+                break;
+                case 0x61:
+//                pclog("IRQ routing %02x %02x\n", addr, val);
+                if (val & 0x80)
+                        pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
+                else
+                        pci_set_irq_routing(PCI_INTC, val & 0xf);
+                break;
+                case 0x62:
+//                pclog("IRQ routing %02x %02x\n", addr, val);
+                if (val & 0x80)
+                        pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
+                else
+                        pci_set_irq_routing(PCI_INTB, val & 0xf);
+                break;
+                case 0x63:
+//                pclog("IRQ routing %02x %02x\n", addr, val);
+                if (val & 0x80)
+                        pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
+                else
+                        pci_set_irq_routing(PCI_INTD, val & 0xf);
+                break;
+        }
+        card_sio[addr] = val;
+}
+
+uint8_t sio_read(int func, int addr, void *priv)
+{
+//        pclog("sio_read: func=%d addr=%02x %04x:%08x\n", func, addr, CS, pc);
+        if (func > 0)
+                return 0xff;
+
+        return card_sio[addr];
+}
+
+void sio_init(int card, int pci_a, int pci_b, int pci_c, int pci_d)
+{
+        pci_add_specific(card, sio_read, sio_write, NULL);
+        
+        memset(card_sio, 0, 256);
+        card_sio[0x00] = 0x86; card_sio[0x01] = 0x80; /*Intel*/
+        card_sio[0x02] = 0x84; card_sio[0x03] = 0x04; /*82378IB (SIO)*/
+        card_sio[0x04] = 0x07; card_sio[0x05] = 0x00;
+        card_sio[0x06] = 0x00; card_sio[0x07] = 0x02;
+        card_sio[0x08] = 0x03; /*A0 stepping*/
+
+        card_sio[0x40] = 0x20; card_sio[0x41] = 0x00;
+        card_sio[0x42] = 0x04; card_sio[0x43] = 0x00;
+        card_sio[0x44] = 0x20; card_sio[0x45] = 0x10;
+        card_sio[0x46] = 0x0f; card_sio[0x47] = 0x00;
+        card_sio[0x48] = 0x01; card_sio[0x49] = 0x10;
+        card_sio[0x4a] = 0x10; card_sio[0x4b] = 0x0f;
+        card_sio[0x4c] = 0x56; card_sio[0x4d] = 0x40;
+        card_sio[0x4e] = 0x07; card_sio[0x4f] = 0x4f;
+        card_sio[0x54] = 0x00; card_sio[0x55] = 0x00; card_sio[0x56] = 0x00;
+        card_sio[0x60] = 0x80; card_sio[0x61] = 0x80; card_sio[0x62] = 0x80; card_sio[0x63] = 0x80;
+        card_sio[0x80] = 0x78; card_sio[0x81] = 0x00;
+        card_sio[0xa0] = 0x08;
+        card_sio[0xa8] = 0x0f;
+        
+        if (pci_a)
+                pci_set_card_routing(pci_a, PCI_INTA);
+        if (pci_b)
+                pci_set_card_routing(pci_b, PCI_INTB);
+        if (pci_c)
+                pci_set_card_routing(pci_c, PCI_INTC);
+        if (pci_d)
+                pci_set_card_routing(pci_d, PCI_INTD);
+}

src/sio.h

@@ -0,0 +1 @@
+void sio_init(int card, int pci_a, int pci_b, int pci_c, int pci_d);

src/sis496.c

@@ -65,6 +65,35 @@ void sis496_write(int func, int addr, uint8_t val, void *p)
                         sis496_recalcmapping(sis496);
                 }
                 break;
+                
+                case 0xc0:
+  //              pclog("IRQ routing %02x %02x\n", addr, val);
+                if (val & 0x80)
+                        pci_set_irq_routing(PCI_INTA, val & 0xf);
+                else
+                        pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
+                break;
+                case 0xc1:
+//                pclog("IRQ routing %02x %02x\n", addr, val);
+                if (val & 0x80)
+                        pci_set_irq_routing(PCI_INTB, val & 0xf);
+                else
+                        pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
+                break;
+                case 0xc2:
+//                pclog("IRQ routing %02x %02x\n", addr, val);
+                if (val & 0x80)
+                        pci_set_irq_routing(PCI_INTC, val & 0xf);
+                else
+                        pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
+                break;
+                case 0xc3:
+//                pclog("IRQ routing %02x %02x\n", addr, val);
+                if (val & 0x80)
+                        pci_set_irq_routing(PCI_INTD, val & 0xf);
+                else
+                        pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
+                break;
         }
                 
         if ((addr >= 4 && addr < 8) || addr >= 0x40)
@@ -104,6 +133,10 @@ void *sis496_init()
         
         sis496->pci_conf[0x0e] = 0x00; /*Single function device*/
 
+        pci_set_card_routing(15, PCI_INTA);
+        pci_set_card_routing(13, PCI_INTD);
+        pci_set_card_routing(11, PCI_INTC);
+
 	return sis496;
 }