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

Fixed some bugs in cdrom.c;

Browse Source 
Fixed (hopefully) pass through in the Windows CD-ROM IOCtl code;
Fixed the legacy I/O address handling on the BT-958D, now it behaves correctly - legacy I/O address disabled by default, can be enabled in AutoSCSI (removed the setting from the device config struct);
The BT-958D PCI-configured I/O space now correctly gets 32 ports and not 4.
This commit is contained in:
OBattler
2017-10-23 01:36:00 +02:00
parent 5155dc605e
commit bffc39ddbf
6 changed files with 97 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cdrom/cdrom.c
View File

@@ -2569,8 +2569,8 @@ cdrom_readtoc_fallback:
case GPCMD_READ_HEADER:
SCSIPhase = SCSI_PHASE_DATA_IN;
alloc_length = ((cdb[7] << 8) | cdb[8]) << 3;
cdrom_buf_alloc(id, 65536);
alloc_length = ((cdb[7] << 8) | cdb[8]);
cdrom_buf_alloc(id, 8);
if (cdrom_drives[id].handler->pass_through)
{
@@ -2582,7 +2582,7 @@ cdrom_readtoc_fallback:
}
else
{
cdrom[id].sector_len = (cdb[7] << 8) | cdb[8];
cdrom[id].sector_len = 1;
cdrom[id].sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4]<<8) | cdb[5];
if (msf)
{

8
src/scsi/scsi_aha154x.c
View File

@@ -10,7 +10,7 @@
* made by Adaptec, Inc. These controllers were designed for
* the ISA bus.
*
* Version: @(#)scsi_aha154x.c 1.0.32 2017/10/22
* Version: @(#)scsi_aha154x.c 1.0.33 2017/10/22
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Original Buslogic version by SA1988 and Miran Grca.
@@ -500,7 +500,7 @@ aha_mca_write(int port, uint8_t val, void *priv)
dev->pos_regs[port & 7] = val;
/* This is always necessary so that the old handler doesn't remain. */
x54x_io_remove(dev, dev->Base);
x54x_io_remove(dev, dev->Base, 4);
/* Get the new assigned I/O base address. */
dev->Base = (dev->pos_regs[3] & 7) << 8;
@@ -569,7 +569,7 @@ aha_mca_write(int port, uint8_t val, void *priv)
/* Initialize the device if fully configured. */
if (dev->pos_regs[2] & 0x01) {
/* Card enabled; register (new) I/O handler. */
x54x_io_set(dev, dev->Base);
x54x_io_set(dev, dev->Base, 4);
/* Reset the device. */
x54x_reset_ctrl(dev, CTRL_HRST);
@@ -858,7 +858,7 @@ aha_init(device_t *info)
if (!(dev->bus & DEVICE_MCA)) {
/* Register our address space. */
x54x_io_set(dev, dev->Base);
x54x_io_set(dev, dev->Base, 4);
/* Enable the memory. */
if (dev->rom_addr != 0x000000) {

99
src/scsi/scsi_buslogic.c
View File

@@ -11,7 +11,7 @@
* 1 - BT-545S ISA;
* 2 - BT-958D PCI
*
* Version: @(#)scsi_buslogic.c 1.0.25 2017/10/22
* Version: @(#)scsi_buslogic.c 1.0.26 2017/10/22
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -292,6 +292,8 @@ BuslogicAutoSCSIRamSetDefaults(x54x_t *dev, uint8_t safe)
HALR->structured.autoSCSIData.cbInformation = 64;
HALR->structured.autoSCSIData.uReserved1 = 6;
HALR->structured.autoSCSIData.aHostAdaptertype[0] = ' ';
HALR->structured.autoSCSIData.aHostAdaptertype[5] = ' ';
switch (bl->chip) {
@@ -385,6 +387,8 @@ BuslogicAutoSCSIRamSetDefaults(x54x_t *dev, uint8_t safe)
HALR->structured.autoSCSIData.fCDROMBoot = safe ? 0 : 1;
HALR->structured.autoSCSIData.fMultiBoot = safe ? 0 : 1;
HALR->structured.autoSCSIData.fAggressiveRoundRobinMode = safe ? 0 : 1; /* 1 = aggressive, 0 = strict */
HALR->structured.autoSCSIData.uHostAdapterIoPortAddress = 2; /* 0 = primary (330h), 1 = secondary (334h), 2 = disable, 3 = reserved */
}
@@ -392,6 +396,8 @@ static void
BuslogicInitializeAutoSCSIRam(x54x_t *dev)
{
buslogic_data_t *bl = (buslogic_data_t *) dev->ven_data;
HALocalRAM *HALR = &bl->LocalRAM;
FILE *f;
f = nvr_fopen(BuslogicGetNVRFileName(bl), L"rb");
@@ -400,6 +406,21 @@ BuslogicInitializeAutoSCSIRam(x54x_t *dev)
fread(&(bl->LocalRAM.structured.autoSCSIData), 1, 64, f);
fclose(f);
f = NULL;
if (bl->chip == CHIP_BUSLOGIC_PCI) {
x54x_io_remove(dev, dev->Base, 4);
switch(HALR->structured.autoSCSIData.uHostAdapterIoPortAddress) {
case 0:
dev->Base = 0x330;
break;
case 1:
dev->Base = 0x334;
break;
default:
dev->Base = 0;
break;
}
x54x_io_set(dev, dev->Base, 4);
}
}
else
{
@@ -648,6 +669,8 @@ buslogic_cmds(void *p)
x54x_t *dev = (x54x_t *)p;
buslogic_data_t *bl = (buslogic_data_t *) dev->ven_data;
HALocalRAM *HALR = &bl->LocalRAM;
FILE *f;
uint16_t TargetsPresentMask = 0;
uint8_t Offset;
@@ -759,7 +782,7 @@ buslogic_cmds(void *p)
ReplyPI->IsaIOPort = 5;
break;
default:
ReplyPI->IsaIOPort = 0xFF;
ReplyPI->IsaIOPort = 6;
break;
}
ReplyPI->IRQ = dev->Irq;
@@ -874,6 +897,22 @@ buslogic_cmds(void *p)
dev->Status |= STAT_INVCMD;
break;
}
if ((bl->chip == CHIP_BUSLOGIC_PCI) && !(dev->Status & STAT_INVCMD)) {
x54x_io_remove(dev, dev->Base, 4);
switch(HALR->structured.autoSCSIData.uHostAdapterIoPortAddress) {
case 0:
dev->Base = 0x330;
break;
case 1:
dev->Base = 0x334;
break;
default:
dev->Base = 0;
break;
}
x54x_io_set(dev, dev->Base, 4);
}
break;
case 0x94:
if ((bl->chip == CHIP_BUSLOGIC_ISA_542) || (bl->chip == CHIP_BUSLOGIC_MCA)) {
@@ -897,10 +936,10 @@ buslogic_cmds(void *p)
case 0x95:
if (bl->chip == CHIP_BUSLOGIC_PCI) {
if (dev->Base != 0)
x54x_io_remove(dev, dev->Base);
x54x_io_remove(dev, dev->Base, 4);
if (dev->CmdBuf[0] < 6) {
dev->Base = ((3 - (dev->CmdBuf[0] >> 1)) << 8) | ((dev->CmdBuf[0] & 1) ? 0x34 : 0x30);
x54x_io_set(dev, dev->Base);
x54x_io_set(dev, dev->Base, 4);
} else
dev->Base = 0;
dev->DataReplyLeft = 0;
@@ -1168,9 +1207,9 @@ BuslogicPCIWrite(int func, int addr, uint8_t val, void *p)
case 0x04:
valxor = (val & 0x27) ^ buslogic_pci_regs[addr];
if (valxor & PCI_COMMAND_IO) {
x54x_io_remove(dev, bl->PCIBase);
x54x_io_remove(dev, bl->PCIBase, 32);
if ((bl->PCIBase != 0) && (val & PCI_COMMAND_IO)) {
x54x_io_set(dev, bl->PCIBase);
x54x_io_set(dev, bl->PCIBase, 32);
}
}
if (valxor & PCI_COMMAND_MEM) {
@@ -1189,7 +1228,7 @@ BuslogicPCIWrite(int func, int addr, uint8_t val, void *p)
case 0x11: case 0x12: case 0x13:
/* I/O Base set. */
/* First, remove the old I/O. */
x54x_io_remove(dev, bl->PCIBase);
x54x_io_remove(dev, bl->PCIBase, 32);
/* Then let's set the PCI regs. */
buslogic_pci_bar[0].addr_regs[addr & 3] = val;
/* Then let's calculate the new I/O base. */
@@ -1199,7 +1238,7 @@ BuslogicPCIWrite(int func, int addr, uint8_t val, void *p)
/* We're done, so get out of the here. */
if (buslogic_pci_regs[4] & PCI_COMMAND_IO) {
if (bl->PCIBase != 0) {
x54x_io_set(dev, bl->PCIBase);
x54x_io_set(dev, bl->PCIBase, 32);
}
}
return;
@@ -1292,7 +1331,7 @@ buslogic_mca_write(int port, uint8_t val, void *priv)
dev->pos_regs[port & 7] = val;
/* This is always necessary so that the old handler doesn't remain. */
x54x_io_remove(dev, dev->Base);
x54x_io_remove(dev, dev->Base, 4);
/* Get the new assigned I/O base address. */
if (dev->pos_regs[3]) {
@@ -1383,7 +1422,7 @@ buslogic_mca_write(int port, uint8_t val, void *priv)
/* Initialize the device if fully configured. */
if (dev->pos_regs[2] & 0x01) {
/* Card enabled; register (new) I/O handler. */
x54x_io_set(dev, dev->Base);
x54x_io_set(dev, dev->Base, 4);
/* Reset the device. */
x54x_reset_ctrl(dev, CTRL_HRST);
@@ -1436,11 +1475,14 @@ buslogic_init(device_t *info)
bl = (buslogic_data_t *) dev->ven_data;
dev->bus = info->flags;
dev->Base = device_get_config_hex16("base");
if ((info->flags != DEVICE_MCA) && (info->flags != DEVICE_PCI)) {
if (!(info->flags & DEVICE_MCA) && !(info->flags & DEVICE_PCI)) {
dev->Base = device_get_config_hex16("base");
dev->Irq = device_get_config_int("irq");
dev->DmaChannel = device_get_config_int("dma");
}
else if (info->flags & DEVICE_PCI) {
dev->Base = 0;
}
dev->HostID = 7; /* default HA ID */
dev->setup_info_len = sizeof(buslogic_setup_t);
dev->max_id = 7;
@@ -1542,8 +1584,8 @@ buslogic_init(device_t *info)
break;
}
if ((dev->Base != 0) && !(dev->bus & DEVICE_MCA)) {
x54x_io_set(dev, dev->Base);
if ((dev->Base != 0) && !(dev->bus & DEVICE_MCA) && !(dev->bus & DEVICE_PCI)) {
x54x_io_set(dev, dev->Base, 4);
}
memset(bl->AutoSCSIROM, 0xff, 32768);
@@ -1713,35 +1755,6 @@ static device_config_t BT_ISA_Config[] = {
static device_config_t BT958D_Config[] = {
{
"base", "Legacy Address", CONFIG_HEX16, "", 0x334,
{
{
"None", 0
},
{
"0x330", 0x330
},
{
"0x334", 0x334
},
{
"0x230", 0x230
},
{
"0x234", 0x234
},
{
"0x130", 0x130
},
{
"0x134", 0x134
},
{
""
}
},
},
{
"bios", "Enable BIOS", CONFIG_BINARY, "", 0
},

14
src/scsi/scsi_x54x.c
View File

@@ -11,7 +11,7 @@
* series of SCSI Host Adapters made by Mylex.
* These controllers were designed for various buses.
*
* Version: @(#)scsi_x54x.c 1.0.3 2017/10/19
* Version: @(#)scsi_x54x.c 1.0.4 2017/10/22
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -1861,7 +1861,7 @@ x54x_writel(uint32_t port, uint32_t val, void *priv)
void
x54x_io_set(x54x_t *dev, uint32_t base)
x54x_io_set(x54x_t *dev, uint32_t base, uint8_t len)
{
int bit32 = 0;
@@ -1872,12 +1872,12 @@ x54x_io_set(x54x_t *dev, uint32_t base)
if (bit32) {
x54x_log("x54x: [PCI] Setting I/O handler at %04X\n", base);
io_sethandler(base, 4,
io_sethandler(base, len,
x54x_in, x54x_inw, x54x_inl,
x54x_out, x54x_outw, x54x_outl, dev);
} else {
x54x_log("x54x: [ISA] Setting I/O handler at %04X\n", base);
io_sethandler(base, 4,
io_sethandler(base, len,
x54x_in, x54x_inw, NULL,
x54x_out, x54x_outw, NULL, dev);
}
@@ -1885,7 +1885,7 @@ x54x_io_set(x54x_t *dev, uint32_t base)
void
x54x_io_remove(x54x_t *dev, uint32_t base)
x54x_io_remove(x54x_t *dev, uint32_t base, uint8_t len)
{
int bit32 = 0;
@@ -1897,11 +1897,11 @@ x54x_io_remove(x54x_t *dev, uint32_t base)
x54x_log("x54x: Removing I/O handler at %04X\n", base);
if (bit32) {
io_removehandler(base, 4,
io_removehandler(base, len,
x54x_in, x54x_inw, x54x_inl,
x54x_out, x54x_outw, x54x_outl, dev);
} else {
io_removehandler(base, 4,
io_removehandler(base, len,
x54x_in, x54x_inw, NULL,
x54x_out, x54x_outw, NULL, dev);
}

6
src/scsi/scsi_x54x.h
View File

@@ -11,7 +11,7 @@
* of SCSI Host Adapters made by Mylex.
* These controllers were designed for various buses.
*
* Version: @(#)scsi_x54x.h 1.0.1 2017/10/16
* Version: @(#)scsi_x54x.h 1.0.2 2017/10/22
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -500,8 +500,8 @@ extern void x54x_buf_alloc(uint8_t id, uint8_t lun, int length);
extern void x54x_buf_free(uint8_t id, uint8_t lun);
extern uint8_t x54x_mbo_process(x54x_t *dev);
extern void x54x_wait_for_poll(void);
extern void x54x_io_set(x54x_t *dev, uint32_t base);
extern void x54x_io_remove(x54x_t *dev, uint32_t base);
extern void x54x_io_set(x54x_t *dev, uint32_t base, uint8_t len);
extern void x54x_io_remove(x54x_t *dev, uint32_t base, uint8_t len);
extern void x54x_mem_init(x54x_t *dev, uint32_t addr);
extern void x54x_mem_enable(x54x_t *dev);
extern void x54x_mem_set_addr(x54x_t *dev, uint32_t base);

82
src/win/win_cdrom_ioctl.c
View File

@@ -659,8 +659,8 @@ static int ioctl_get_block_length(uint8_t id, const UCHAR *cdb, int number_of_bl
{
switch (cdb[0])
{
case 0x25:
/* READ CAPACITY */
case 0x25: /* READ CAPACITY */
case 0x44: /* READ HEADER */
return 8;
case 0x42: /* READ SUBCHANNEL */
case 0x43: /* READ TOC */
@@ -668,6 +668,8 @@ static int ioctl_get_block_length(uint8_t id, const UCHAR *cdb, int number_of_bl
case 0x52: /* READ TRACK INFORMATION */
case 0x5A: /* MODE SENSE (10) */
return ((uint16_t) cdb[8]) + (((uint16_t) cdb[7]) << 8);
case 0xAD: /* READ DVD STRUCTURE */
return (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) | (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
default:
return 65534;
}
@@ -675,8 +677,8 @@ static int ioctl_get_block_length(uint8_t id, const UCHAR *cdb, int number_of_bl
switch (cdb[0])
{
case 0x25:
/* READ CAPACITY */
case 0x25: /* READ CAPACITY */
case 0x44: /* READ HEADER */
return 8;
case 0x42: /* READ SUBCHANNEL */
case 0x43: /* READ TOC */
@@ -684,6 +686,8 @@ static int ioctl_get_block_length(uint8_t id, const UCHAR *cdb, int number_of_bl
case 0x52: /* READ TRACK INFORMATION */
case 0x5A: /* MODE SENSE (10) */
return ((uint16_t) cdb[8]) + (((uint16_t) cdb[7]) << 8);
case 0xAD: /* READ DVD STRUCTURE */
return (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) | (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
case 0x08:
case 0x28:
case 0xa8:
@@ -966,19 +970,13 @@ static int ioctl_pass_through(uint8_t id, uint8_t *in_cdb, uint8_t *b, uint32_t
const UCHAR cdb[12];
int ret = 0;
int block_length = 0;
int temp_block_length = 0;
int temp_pos = 0;
int blocks_at_once = 0;
int buffer_pos = 0;
int transferred_blocks = 0;
uint32_t temp_len = 0;
int chunk = 0;
int i = 0;
if (in_cdb[0] == 0x43)
{
@@ -989,60 +987,28 @@ static int ioctl_pass_through(uint8_t id, uint8_t *in_cdb, uint8_t *b, uint32_t
ioctl_hopen(id);
memcpy((void *) cdb, in_cdb, 12);
temp_block_length = ioctl_get_block_length(id, cdb, cdrom[id].requested_blocks, 0);
*len = 0;
if (temp_block_length != -1)
{
if (temp_block_length > 65534)
{
block_length = temp_block_length / cdrom[id].requested_blocks;
blocks_at_once = 32768 / block_length;
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): Expected transfer length %i is bigger than 65534, splitting the transfer into chunks of %i blocks...\n", id, temp_block_length, blocks_at_once);
temp_len = 0;
temp_block_length = ioctl_get_block_length(id, cdb, cdrom[id].requested_blocks, 0);
if (temp_block_length != -1) {
cdrom_ioctl[id].actual_requested_blocks = 1;
if ((cdb[0] == 0x08) || (cdb[0] == 0x28) || (cdb[0] == 0xA8) || (cdb[0] == 0xB9) || (cdb[0] == 0xBE)) {
buffer_pos = 0;
temp_pos = cdrom[id].sector_pos;
transferred_blocks = 0;
temp_len = 0;
split_block_read_iterate:
chunk = (cdrom[id].requested_blocks - transferred_blocks);
if (chunk < blocks_at_once)
for (i = 0; i < cdrom[id].requested_blocks; i++)
{
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): The remaining chunk (%i blocks) is less than a complete split block\n", id, chunk);
cdrom_ioctl[id].actual_requested_blocks = chunk;
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): Transferring block...\n", id, cdrom_ioctl[id].actual_requested_blocks);
cdrom_update_cdb((uint8_t *) cdb, cdrom[id].sector_pos + i, 1);
ret = SCSICommand(id, cdb, b + buffer_pos, &temp_len, 0);
buffer_pos += temp_len;
}
else
{
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): The remaining chunk (%i blocks) is more or equal than a complete split block\n", id, chunk);
cdrom_ioctl[id].actual_requested_blocks = blocks_at_once;
}
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): Transferring %i blocks...\n", id, cdrom_ioctl[id].actual_requested_blocks);
cdrom_update_cdb((uint8_t *) cdb, temp_pos, cdrom_ioctl[id].actual_requested_blocks);
ret = SCSICommand(id, cdb, buf + buffer_pos, &temp_len, 0);
*len += temp_len;
transferred_blocks += cdrom_ioctl[id].actual_requested_blocks;
if (ret && (transferred_blocks < cdrom[id].requested_blocks))
{
/* Return value was successful and there are still more blocks left to transfer. */
temp_pos += cdrom_ioctl[id].actual_requested_blocks;
buffer_pos += (cdrom_ioctl[id].actual_requested_blocks * block_length);
goto split_block_read_iterate;
}
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): Split transfer done\n", id);
}
else
{
*len = buffer_pos;
} else {
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): Expected transfer length %i is smaller than 65534, transferring all at once...\n", id, temp_block_length);
cdrom_ioctl[id].actual_requested_blocks = cdrom[id].requested_blocks;
ret = SCSICommand(id, cdb, buf, len, 0);
ret = SCSICommand(id, cdb, b, len, 0);
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): Single transfer done\n", id);
}
memcpy(b, buf, *len);
}
else
{
cdrom_ioctl_log("CD-ROM %i: ioctl_pass_through(): Expected transfer length %i is -1, this indicates an illegal mode\n", id, temp_block_length);
}
cdrom_ioctl_log("IOCTL DATA: %02X %02X %02X %02X %02X %02X %02X %02X\n", b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);