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

Added BusLogic BT-542B BIOS support (patch from TheCollector1995);

Browse Source 
Brought the Adaptec AHA-1540B BIOS support to an essentially work state;
Fixed some warnings in CPU/808x.c.
This commit is contained in:
OBattler
2017-08-15 19:49:25 +02:00
parent 3b66776601
commit c5da4c74e9
7 changed files with 1190 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/scsi_disk.c
View File

@@ -14,6 +14,7 @@
#include <malloc.h>
#include <stdint.h>
#include <stdio.h>
#include <stdarg.h>
#include "86box.h"
#include "cdrom.h"
@@ -115,11 +116,12 @@ uint8_t scsi_hd_command_flags[0x100] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
/* #define ENABLE_SCSI_HD_LOG 0 */
int scsi_hd_do_log = 0;
void scsi_hd_log(const char *format, ...)
{
#ifdef ENABLE_scsi_hd_LOG
#ifdef ENABLE_SCSI_HD_LOG
if (scsi_hd_do_log)
{
va_list ap;
@@ -291,7 +293,13 @@ int scsi_hd_read_capacity(uint8_t id, uint8_t *cdb, uint8_t *buffer, uint32_t *l
buffer[3] = size & 0xff;
buffer[6] = 2; /* 512 = 0x0200 */
*len = 8;
pclog("Read Capacity\n");
pclog("buffer[0]=%x\n", buffer[0]);
pclog("buffer[1]=%x\n", buffer[1]);
pclog("buffer[2]=%x\n", buffer[2]);
pclog("buffer[3]=%x\n", buffer[3]);
return 1;
}
@@ -353,7 +361,7 @@ static void scsi_hd_command_common(uint8_t id)
}
}
static void scsi_hd_command_complete(uint8_t id)
void scsi_hd_command_complete(uint8_t id)
{
shdc[id].packet_status = CDROM_PHASE_COMPLETE;
scsi_hd_command_common(id);
@@ -372,7 +380,7 @@ static void scsi_hd_command_write_dma(uint8_t id)
scsi_hd_command_common(id);
}
static void scsi_hd_data_command_finish(uint8_t id, int len, int block_len, int alloc_len, int direction)
void scsi_hd_data_command_finish(uint8_t id, int len, int block_len, int alloc_len, int direction)
{
scsi_hd_log("SCSI HD %i: Finishing command (%02X): %i, %i, %i, %i, %i\n", id, shdc[id].current_cdb[0], len, block_len, alloc_len, direction, shdc[id].request_length);
shdc[id].pos=0;
@@ -470,7 +478,7 @@ static void scsi_hd_illegal_opcode(uint8_t id)
scsi_hd_cmd_error(id);
}
static void scsi_hd_lba_out_of_range(uint8_t id)
void scsi_hd_lba_out_of_range(uint8_t id)
{
scsi_hd_sense_key = SENSE_ILLEGAL_REQUEST;
scsi_hd_asc = ASC_LBA_OUT_OF_RANGE;
@@ -792,7 +800,6 @@ void scsi_hd_command(uint8_t id, uint8_t *cdb)
case GPCMD_READ_10:
shdc[id].sector_len = (cdb[7] << 8) | cdb[8];
shdc[id].sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
scsi_hd_log("SCSI HD %i: Length: %i, LBA: %i\n", id, shdc[id].sector_len, shdc[id].sector_pos);
break;
case GPCMD_READ_12:
shdc[id].sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) | (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);