claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

And more fixes.

Browse Source
This commit is contained in:
OBattler
2021-07-04 18:22:00 +02:00
parent a896953dd5
commit 2f24523802
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/chipset/ali1543.c
View File

@@ -34,10 +34,12 @@
#include <86box/fdc.h> #include <86box/fdc.h>
#include <86box/hdc_ide.h> #include <86box/hdc_ide.h>
#include <86box/hdc_ide_sff8038i.h> #include <86box/hdc_ide_sff8038i.h>
#include <86box/keyboard.h>
#include <86box/lpt.h> #include <86box/lpt.h>
#include <86box/mem.h> #include <86box/mem.h>
#include <86box/nvr.h> #include <86box/nvr.h>
#include <86box/pci.h> #include <86box/pci.h>
#include <86box/pic.h>
#include <86box/port_92.h> #include <86box/port_92.h>
#include <86box/serial.h> #include <86box/serial.h>
#include <86box/smbus.h> #include <86box/smbus.h>
@@ -113,11 +115,15 @@ static void ali5229_ide_irq_handler(ali1543_t *dev);
static void ali5229_write(int func, int addr, uint8_t val, void *priv); static void ali5229_write(int func, int addr, uint8_t val, void *priv);
static void ali7101_write(int func, int addr, uint8_t val, void *priv);
static uint8_t ali7101_read(int func, int addr, void *priv);
static void static void
ali1533_write(int func, int addr, uint8_t val, void *priv) ali1533_write(int func, int addr, uint8_t val, void *priv)
{ {
ali1543_t *dev = (ali1543_t *)priv; ali1543_t *dev = (ali1543_t *)priv;
int irq;
ali1543_log("M1533: dev->pci_conf[%02x] = %02x\n", addr, val); ali1543_log("M1533: dev->pci_conf[%02x] = %02x\n", addr, val);
if (func > 0) if (func > 0)
@@ -548,7 +554,6 @@ ali5229_ide_irq_handler(ali1543_t *dev)
static void static void
ali5229_ide_handler(ali1543_t *dev) ali5229_ide_handler(ali1543_t *dev)
ali5229_ide_handler(ali1543_t *dev)
{ {
uint32_t ch = 0; uint32_t ch = 0;

4
src/include/86box/pci.h
View File

@@ -45,6 +45,10 @@
#define PCI_MIRQ1 1 #define PCI_MIRQ1 1
#define PCI_MIRQ2 2 #define PCI_MIRQ2 2
#define PCI_MIRQ3 3 #define PCI_MIRQ3 3
#define PCI_MIRQ4 4
#define PCI_MIRQ5 5
#define PCI_MIRQ6 6
#define PCI_MIRQ7 7
#define PCI_IRQ_DISABLED -1 #define PCI_IRQ_DISABLED -1

2
src/win/Makefile.mingw
View File

@@ -643,7 +643,7 @@ DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o hwm_vt82c686.o ibm
else else
DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o hwm_vt82c686.o ibm_5161.o isamem.o isartc.o \ DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o hwm_vt82c686.o ibm_5161.o isamem.o isartc.o \
lpt.o pci_bridge.o postcard.o serial.o vpc2007.o clock_ics9xxx.o isapnp.o \ lpt.o pci_bridge.o postcard.o serial.o vpc2007.o clock_ics9xxx.o isapnp.o \
i2c.o i2c_gpio.o smbus_piix4.o \ i2c.o i2c_gpio.o smbus_ali7101.o smbus_piix4.o \
keyboard.o \ keyboard.o \
keyboard_xt.o keyboard_at.o \ keyboard_xt.o keyboard_at.o \
mouse.o \ mouse.o \