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

Added the IBM 5161 ISA expansion for PC and XT;

Browse Source 
Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port;
Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX);
Finished the 586MC1;
Added 8087 emulation;
Moved Cyrix 6x86'es to the Dev branch;
Sanitized/cleaned up memregs.c/h and intel.c/h;
Split the chipsets from machines and sanitized Port 92 emulation;
Added support for the 15bpp mode to the Compaq ATI 28800;
Moved the MR 386DX and 486 machines to the Dev branch;
Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00;
Ported the new timer code from PCem;
Cleaned up the CPU table of unused stuff and better optimized its structure;
Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch;
Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem;
Added the AHA-1540A and the BusTek BT-542B;
Moved the Sumo SCSI-AT to the Dev branch;
Minor IDE, FDC, and floppy drive code clean-ups;
Made NCR 5380/53C400-based cards' BIOS address configurable;
Got rid of the legacy romset variable;
Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit;
Added the Amstead PPC512 per PCem patch by John Elliott;
Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages);
Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing;
Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem;
Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit;
Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement;
Amstrad MegaPC does now works correctly with non-internal graphics card;
The SLiRP code no longer casts a packed struct type to a non-packed struct type;
The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present;
The S3 Virge on BeOS is no longer broken (was broken by build #1591);
OS/2 2.0 build 6.167 now sees key presses again;
Xi8088 now work on CGA again;
86F images converted from either the old or new variants of the HxC MFM format now work correctly;
Hardware interrupts with a vector of 0xFF are now handled correctly;
OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct;
Fixed VNC keyboard input bugs;
Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g  / 81 MIDI play no longer hangs with the build's own VTD driver;
Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly;
Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4;
Compaq Portable now works with all graphics cards;
Fixed various MDSI Genius bugs;
Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly;
Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355;
OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400.
Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391.
Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389.
Fixed a minor IDE timing bug, fixes #388.
Fixed Toshiba T1000 RAM issues, fixes #379.
Fixed EGA/(S)VGA overscan border handling, fixes #378;
Got rid of the now long useless IDE channel 2 auto-removal, fixes #370;
Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366;
Ported the Unicode CD image file name fix from VARCem, fixes #365;
Fixed high density floppy disks on the Xi8088, fixes #359;
Fixed some bugs in the Hercules emulation, fixes #346, fixes #358;
Fixed the SCSI hard disk mode sense pages, fixes #356;
Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349;
Fixed bugs in the serial mouse emulation, fixes #344;
Compiled 86Box binaries now include all the required .DLL's, fixes #341;
Made some combo boxes in the Settings dialog slightly wider, fixes #276.
This commit is contained in:
OBattler
2019-09-20 14:02:30 +02:00
parent b06296bbf6
commit 552a87ea3d
524 changed files with 129555 additions and 21862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/scsi/scsi_disk.c
View File

@@ -111,13 +111,13 @@ uint64_t scsi_disk_mode_sense_page_flags = (GPMODEP_FORMAT_DEVICE_PAGE |
/* This should be done in a better way but for time being, it's been done this way so it's not as huge and more readable. */
static const mode_sense_pages_t scsi_disk_mode_sense_pages_default =
{ { [GPMODE_FORMAT_DEVICE_PAGE] = { GPMODE_FORMAT_DEVICE_PAGE, 0x16, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
[GPMODE_RIGID_DISK_PAGE ] = { GPMODE_RIGID_DISK_PAGE, 0x16, 0, 0x10, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0, 0, 0 },
[GPMODE_RIGID_DISK_PAGE ] = { GPMODE_RIGID_DISK_PAGE, 0x16, 0, 0x10, 0, 64, 0, 0, 0, 0, 0, 0, 0, 200, 0xff, 0xff, 0xff, 0, 0, 0, 0x15, 0x18, 0, 0 },
[GPMODE_UNK_VENDOR_PAGE ] = { 0xB0, 0x16, '8', '6', 'B', 'o', 'x', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }
} };
static const mode_sense_pages_t scsi_disk_mode_sense_pages_changeable =
{ { [GPMODE_FORMAT_DEVICE_PAGE] = { GPMODE_FORMAT_DEVICE_PAGE, 0x16, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0 },
[GPMODE_RIGID_DISK_PAGE ] = { GPMODE_RIGID_DISK_PAGE, 0x16, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0 },
{ { [GPMODE_FORMAT_DEVICE_PAGE] = { GPMODE_FORMAT_DEVICE_PAGE, 0x16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
[GPMODE_RIGID_DISK_PAGE ] = { GPMODE_RIGID_DISK_PAGE, 0x16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
[GPMODE_UNK_VENDOR_PAGE ] = { 0xB0, 0x16, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
} };
@@ -151,8 +151,8 @@ scsi_disk_mode_sense_load(scsi_disk_t *dev)
memset(&dev->ms_pages_saved, 0, sizeof(mode_sense_pages_t));
memcpy(&dev->ms_pages_saved, &scsi_disk_mode_sense_pages_default, sizeof(mode_sense_pages_t));
swprintf(file_name, 512, L"scsi_disk_%02i_mode_sense.bin", dev->id);
memset(file_name, 0, 512 * sizeof(wchar_t));
swprintf(file_name, 512, L"scsi_disk_%02i_mode_sense.bin", dev->id);
f = plat_fopen(nvr_path(file_name), L"rb");
if (f) {
fread(dev->ms_pages_saved.pages[0x30], 1, 0x18, f);
@@ -166,6 +166,7 @@ scsi_disk_mode_sense_save(scsi_disk_t *dev)
{
FILE *f;
wchar_t file_name[512];
memset(file_name, 0, 512 * sizeof(wchar_t));
swprintf(file_name, 512, L"scsi_disk_%02i_mode_sense.bin", dev->id);
f = plat_fopen(nvr_path(file_name), L"wb");
@@ -180,17 +181,58 @@ scsi_disk_mode_sense_save(scsi_disk_t *dev)
uint8_t
scsi_disk_mode_sense_read(scsi_disk_t *dev, uint8_t page_control, uint8_t page, uint8_t pos)
{
switch (page_control) {
if (page_control == 1)
return scsi_disk_mode_sense_pages_changeable.pages[page][pos];
if (page == GPMODE_RIGID_DISK_PAGE) switch (page_control) {
/* Rigid disk geometry page. */
case 0:
case 2:
case 3:
switch(pos) {
case 0:
case 1:
default:
return scsi_disk_mode_sense_pages_default.pages[page][pos];
case 2:
case 6:
case 9:
return (dev->drv->tracks >> 16) & 0xff;
case 3:
case 7:
case 10:
return (dev->drv->tracks >> 8) & 0xff;
case 4:
case 8:
case 11:
return dev->drv->tracks & 0xff;
case 5:
return dev->drv->hpc & 0xff;
}
break;
} else if (page == GPMODE_FORMAT_DEVICE_PAGE) switch (page_control) {
/* Format device page. */
case 0:
case 2:
case 3:
switch(pos) {
case 0:
case 1:
default:
return scsi_disk_mode_sense_pages_default.pages[page][pos];
/* Actual sectors + the 1 "alternate sector" we report. */
case 10:
return ((dev->drv->spt + 1) >> 8) & 0xff;
case 11:
return (dev->drv->spt + 1) & 0xff;
}
break;
} else switch (page_control) {
case 0:
case 3:
return dev->ms_pages_saved.pages[page][pos];
break;
case 1:
return scsi_disk_mode_sense_pages_changeable.pages[page][pos];
break;
case 2:
return scsi_disk_mode_sense_pages_default.pages[page][pos];
break;
}
return 0;
@@ -243,9 +285,9 @@ scsi_disk_command_common(scsi_disk_t *dev)
dev->status = BUSY_STAT;
dev->phase = 1;
if (dev->packet_status == PHASE_COMPLETE)
dev->callback = 0LL;
dev->callback = 0.0;
else
dev->callback = -1LL; /* Speed depends on SCSI controller */
dev->callback = -1.0; /* Speed depends on SCSI controller */
}
@@ -320,7 +362,7 @@ scsi_disk_cmd_error(scsi_disk_t *dev)
dev->status = READY_STAT | ERR_STAT;
dev->phase = 3;
dev->packet_status = PHASE_ERROR;
dev->callback = 50 * SCSI_TIME;
dev->callback = 50.0 * SCSI_TIME;
scsi_disk_log("SCSI HD %i: ERROR: %02X/%02X/%02X\n", dev->id, scsi_disk_sense_key, scsi_disk_asc, scsi_disk_ascq);
}
@@ -441,7 +483,7 @@ scsi_disk_reset(scsi_common_t *sc)
scsi_disk_rezero(dev);
dev->status = 0;
dev->callback = 0;
dev->callback = 0.0;
dev->packet_status = PHASE_NONE;
}
@@ -517,9 +559,6 @@ static void
scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
{
scsi_disk_t *dev = (scsi_disk_t *) sc;
#ifdef ENABLE_SCSI_DISK_LOG
uint8_t *hdbufferb;
#endif
int32_t *BufLen;
int32_t len, max_len, alloc_length;
int pos = 0;
@@ -530,9 +569,6 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
char device_identify_ex[15] = { '8', '6', 'B', '_', 'H', 'D', '0', '0', ' ', 'v', '1', '.', '0', '0', 0 };
int block_desc = 0;
#ifdef ENABLE_SCSI_DISK_LOG
hdbufferb = scsi_devices[dev->drv->scsi_id].cmd_buffer;
#endif
BufLen = &scsi_devices[dev->drv->scsi_id].buffer_length;
last_sector = hdd_image_get_last_sector(dev->id);
@@ -597,7 +633,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
if (!len) {
scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
dev->packet_status = PHASE_COMPLETE;
dev->callback = 20 * SCSI_TIME;
dev->callback = 20.0 * SCSI_TIME;
break;
}
@@ -633,6 +669,8 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
switch(cdb[0]) {
case GPCMD_READ_6:
dev->sector_len = cdb[4];
if (dev->sector_len == 0)
dev->sector_len = 256; /* For READ (6) and WRITE (6), a length of 0 indicates a transfer of 256 sector. */
dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) | (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
break;
case GPCMD_READ_10:
@@ -645,7 +683,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
break;
}
if ((dev->sector_pos > last_sector) || ((dev->sector_pos + dev->sector_len - 1) > last_sector)) {
if ((dev->sector_pos > last_sector)/* || ((dev->sector_pos + dev->sector_len - 1) > last_sector)*/) {
scsi_disk_lba_out_of_range(dev);
return;
}
@@ -654,7 +692,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
scsi_disk_log("SCSI HD %i: All done - callback set\n", dev);
dev->packet_status = PHASE_COMPLETE;
dev->callback = 20 * SCSI_TIME;
dev->callback = 20.0 * SCSI_TIME;
break;
}
@@ -697,6 +735,8 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
case GPCMD_VERIFY_6:
case GPCMD_WRITE_6:
dev->sector_len = cdb[4];
if (dev->sector_len == 0)
dev->sector_len = 256; /* For READ (6) and WRITE (6), a length of 0 indicates a transfer of 256 sector. */
dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) | (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
scsi_disk_log("SCSI HD %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len, dev->sector_pos);
break;
@@ -715,8 +755,8 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
break;
}
if ((dev->sector_pos > last_sector) ||
((dev->sector_pos + dev->sector_len - 1) > last_sector)) {
if ((dev->sector_pos > last_sector)/* ||
((dev->sector_pos + dev->sector_len - 1) > last_sector)*/) {
scsi_disk_lba_out_of_range(dev);
return;
}
@@ -725,7 +765,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
scsi_disk_log("SCSI HD %i: All done - callback set\n", dev->id);
dev->packet_status = PHASE_COMPLETE;
dev->callback = 20 * SCSI_TIME;
dev->callback = 20.0 * SCSI_TIME;
break;
}
@@ -756,8 +796,8 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
dev->sector_len = (cdb[7] << 8) | cdb[8];
dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
if ((dev->sector_pos > last_sector) ||
((dev->sector_pos + dev->sector_len - 1) > last_sector)) {
if ((dev->sector_pos > last_sector)/* ||
((dev->sector_pos + dev->sector_len - 1) > last_sector)*/) {
scsi_disk_lba_out_of_range(dev);
return;
}
@@ -766,7 +806,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
scsi_disk_log("SCSI HD %i: All done - callback set\n", dev->id);
dev->packet_status = PHASE_COMPLETE;
dev->callback = 20 * SCSI_TIME;
dev->callback = 20.0 * SCSI_TIME;
break;
}
@@ -857,7 +897,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
/* scsi_disk_log("SCSI HD %i: All done - callback set\n", dev->id); */
dev->packet_status = PHASE_COMPLETE;
dev->callback = 20 * SCSI_TIME;
dev->callback = 20.0 * SCSI_TIME;
break;
}
@@ -939,8 +979,6 @@ atapi_out:
dev->temp_buffer[size_idx] = idx - preamble_len;
len=idx;
scsi_disk_log("scsi_disk_command(): Inquiry (%08X, %08X)\n", hdbufferb, dev->temp_buffer);
if (len > max_len)
len = max_len;