80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed InPort mouse base address configuration;

Browse Source 
The NCR 53c810 SCSI controller now optionally supports an external BIOS.
This commit is contained in:
OBattler
2018-05-23 00:32:40 +02:00
parent 2807291276
commit ae644a8fda
2 changed files with 93 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mouse_bus.c
View File

@@ -49,7 +49,7 @@
*
* Based on an early driver for MINIX 1.5.
*
* Version: @(#)mouse_bus.c 1.0.36 2018/05/22
* Version: @(#)mouse_bus.c 1.0.37 2018/05/22
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -82,6 +82,7 @@
typedef struct mouse {
const char *name; /* name of this device */
int8_t type; /* type of this device */
uint16_t base; /* I/O port base to use */
int8_t irq; /* IRQ channel to use */
uint16_t flags; /* device flags */
@@ -601,7 +602,7 @@ bm_write(uint16_t port, uint8_t val, void *priv)
{
mouse_t *dev = (mouse_t *)priv;
mouse_bus_log("%s: write(%d,%02x)\n", dev->name, port-MOUSE_PORT, val);
mouse_bus_log("%s: write(%d,%02x)\n", dev->name, port & 0x03, val);
dev->write(dev, port & 0x03, val);
}
@@ -616,7 +617,7 @@ bm_read(uint16_t port, void *priv)
ret = dev->read(dev, port & 0x03);
mouse_bus_log("%s: read(%d): %02x\n", dev->name, port-MOUSE_PORT, ret);
mouse_bus_log("%s: read(%d): %02x\n", dev->name, port & 0x03, ret);
return(ret);
}
@@ -710,7 +711,7 @@ bm_close(void *priv)
mouse_t *dev = (mouse_t *)priv;
/* Release our I/O range. */
io_removehandler(MOUSE_PORT, 4,
io_removehandler(dev->base, 4,
bm_read, NULL, NULL, bm_write, NULL, NULL, dev);
free(dev);
@@ -723,12 +724,12 @@ bm_init(const device_t *info)
{
mouse_t *dev;
int i, j;
uint16_t base;
dev = (mouse_t *)malloc(sizeof(mouse_t));
memset(dev, 0x00, sizeof(mouse_t));
dev->name = info->name;
dev->type = info->local;
dev->base = device_get_config_hex16("base");
dev->irq = device_get_config_int("irq");
i = device_get_config_int("buttons");
if (i > 2)
@@ -737,9 +738,6 @@ bm_init(const device_t *info)
if (j)
dev->flags |= FLAG_NEW;
mouse_bus_log("%s: I/O=%04x, IRQ=%d, buttons=%d, model=%s\n",
dev->name, MOUSE_PORT, dev->irq, i, j ? "new" : "old");
switch(dev->type) {
case MOUSE_TYPE_LOGIBUS:
lt_reset(dev);
@@ -766,10 +764,12 @@ bm_init(const device_t *info)
}
/* Request an I/O range. */
base = device_get_config_int("base");
io_sethandler(base, 4,
io_sethandler(dev->base, 4,
bm_read, NULL, NULL, bm_write, NULL, NULL, dev);
mouse_bus_log("%s: I/O=%04x, IRQ=%d, buttons=%d, model=%s\n",
dev->name, dev->base, dev->irq, i, j ? "new" : "old");
/* Tell them how many buttons we have. */
mouse_set_buttons((dev->flags & FLAG_3BTN) ? 3 : 2);

90
src/scsi/scsi_ncr53c810.c
View File

@@ -10,7 +10,7 @@
* NCR and later Symbios and LSI. This controller was designed
* for the PCI bus.
*
* Version: @(#)scsi_ncr53c810.c 1.0.12 2018/04/26
* Version: @(#)scsi_ncr53c810.c 1.0.13 2018/05/23
*
* Authors: Paul Brook (QEMU)
* Artyom Tarasenko (QEMU)
@@ -43,6 +43,8 @@
#include "scsi_device.h"
#include "scsi_ncr53c810.h"
#define NCR53C810_ROM L"roms/scsi/ncr53c810/NCR307.BIN"
#define NCR_SCNTL0_TRG 0x01
#define NCR_SCNTL0_AAP 0x02
#define NCR_SCNTL0_EPC 0x08
@@ -187,6 +189,9 @@ typedef enum
typedef struct {
uint8_t pci_slot;
int has_bios;
rom_t bios;
uint32_t bios_addr, bios_mask;
int PCIBase;
int MMIOBase;
mem_mapping_t mmio_mapping;
@@ -1975,7 +1980,28 @@ ncr53c810_mem_disable(ncr53c810_t *dev)
uint8_t ncr53c810_pci_regs[256];
bar_t ncr53c810_pci_bar[2];
bar_t ncr53c810_pci_bar[3];
static void
ncr53c810_bios_update(ncr53c810_t *dev)
{
int bios_enabled = ncr53c810_pci_bar[2].addr_regs[0] & 0x01;
if (!dev->has_bios)
return;
/* PCI BIOS stuff, just enable_disable. */
if ((dev->bios_addr > 0) && bios_enabled) {
mem_mapping_enable(&dev->bios.mapping);
mem_mapping_set_addr(&dev->bios.mapping,
dev->bios_addr, 0x4000);
ncr53c810_log("NCR53c810: BIOS now at: %06X\n", dev->bios_addr);
} else {
ncr53c810_log("NCR53c810: BIOS disabled\n");
mem_mapping_disable(&dev->bios.mapping);
}
}
static uint8_t
@@ -1985,9 +2011,11 @@ ncr53c810_pci_read(int func, int addr, void *p)
ncr53c810_log("NCR53c810: Reading register %02X\n", addr & 0xff);
if ((addr >= 0x80) && (addr <= 0xDF)) {
if ((addr >= 0x30) && (addr <= 0x33) && !dev->has_bios)
return 0x00;
if ((addr >= 0x80) && (addr <= 0xDF))
return ncr53c810_reg_readb(dev, addr & 0x7F);
}
switch (addr) {
case 0x00:
@@ -2041,6 +2069,17 @@ ncr53c810_pci_read(int func, int addr, void *p)
return 0x01;
case 0x2F:
return 0x00;
case 0x30: /* PCI_ROMBAR */
return ncr53c810_pci_bar[2].addr_regs[0] & 0x01;
case 0x31: /* PCI_ROMBAR 15:11 */
return ncr53c810_pci_bar[2].addr_regs[1];
break;
case 0x32: /* PCI_ROMBAR 23:16 */
return ncr53c810_pci_bar[2].addr_regs[2];
break;
case 0x33: /* PCI_ROMBAR 31:24 */
return ncr53c810_pci_bar[2].addr_regs[3];
break;
case 0x3C:
return dev->irq;
case 0x3D:
@@ -2063,6 +2102,9 @@ ncr53c810_pci_write(int func, int addr, uint8_t val, void *p)
ncr53c810_log("NCR53c810: Write value %02X to register %02X\n", val, addr & 0xff);
if ((addr >= 0x30) && (addr <= 0x33) && !dev->has_bios)
return;
if ((addr >= 0x80) && (addr <= 0xDF)) {
ncr53c810_reg_writeb(dev, addr & 0x7F, val);
return;
@@ -2133,6 +2175,17 @@ ncr53c810_pci_write(int func, int addr, uint8_t val, void *p)
}
return;
case 0x30: /* PCI_ROMBAR */
case 0x31: /* PCI_ROMBAR */
case 0x32: /* PCI_ROMBAR */
case 0x33: /* PCI_ROMBAR */
ncr53c810_pci_bar[2].addr_regs[addr & 3] = val;
ncr53c810_pci_bar[2].addr &= 0xffffc001;
dev->bios_addr = ncr53c810_pci_bar[2].addr & 0xffffc000;
ncr53c810_log("NCR53c810: BIOS BAR %02X = NOW %02X (%02X)\n", addr & 3, ncr53c810_pci_bar[2].addr_regs[addr & 3], val);
ncr53c810_bios_update(dev);
return;
case 0x3C:
ncr53c810_pci_regs[addr] = val;
dev->irq = val;
@@ -2163,6 +2216,20 @@ ncr53c810_init(const device_t *info)
timer_add(ncr53c810_callback, &dev->timer_period, &dev->timer_enabled, dev);
dev->has_bios = device_get_config_int("bios");
/* Enable our BIOS space in PCI, if needed. */
if (dev->has_bios) {
dev->bios_mask = 0xffffc000;
rom_init(&dev->bios, NCR53C810_ROM, 0xd8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
ncr53c810_pci_bar[2].addr = 0xFFFFC000;
mem_mapping_disable(&dev->bios.mapping);
} else
ncr53c810_pci_bar[2].addr = 0;
return(dev);
}
@@ -2179,13 +2246,22 @@ ncr53c810_close(void *priv)
}
static const device_config_t ncr53c810_pci_config[] = {
{
"bios", "Enable BIOS", CONFIG_BINARY, "", 0
},
{
"", "", -1
}
};
const device_t ncr53c810_pci_device =
{
"NCR 53c810 (SCSI)",
DEVICE_PCI,
0,
ncr53c810_init, ncr53c810_close, NULL,
NULL,
NULL, NULL,
NULL
NULL, NULL, NULL,
ncr53c810_pci_config
};