Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ATAPI sector accesses can not be split over multiple transfers. Fixes Windows XP installer.

Browse source
This commit is contained in:
SarahW 2018-03-03 21:32:24 +00:00
commit c07b76dc8e
7 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ide.c
View file

@ -277,12 +277,12 @@ void resetide(void)
if (cdrom_channel == d)
{
ide_drives[d].type = IDE_CDROM;
scsi_bus_atapi_init(&ide_drives[d].atapi.bus, &scsi_cd, d);
scsi_bus_atapi_init(&ide_drives[d].atapi.bus, &scsi_cd, d, &ide_drives[d].atapi);
}
else if (zip_channel == d)
{
ide_drives[d].type = IDE_CDROM;
scsi_bus_atapi_init(&ide_drives[d].atapi.bus, &scsi_zip, d);
scsi_bus_atapi_init(&ide_drives[d].atapi.bus, &scsi_zip, d, &ide_drives[d].atapi);
}
else
{

6
src/ide_atapi.c
View file

@ -134,6 +134,12 @@ uint8_t atapi_read_drq(atapi_device_t *atapi_dev)
return atapi_dev->bus_state & BUS_REQ;
}
void atapi_set_transfer_granularity(atapi_device_t *atapi_dev, int size)
{
if (atapi_dev->max_transfer_len > size)
atapi_dev->max_transfer_len -= (atapi_dev->max_transfer_len % size);
}
void atapi_process_packet(atapi_device_t *atapi_dev)
{
// pclog("atapi_process_packet: state=%i\n", atapi_dev->state);

1
src/ide_atapi.h
View file

@ -61,5 +61,6 @@ void atapi_command_start(atapi_device_t *atapi);
uint8_t atapi_read_iir(atapi_device_t *atapi_dev);
uint8_t atapi_read_drq(atapi_device_t *atapi_dev);
void atapi_process_packet(atapi_device_t *atapi_dev);
void atapi_set_transfer_granularity(atapi_device_t *atapi_dev, int size);
#endif

5
src/scsi.c
View file

@ -1,5 +1,6 @@
#include "ibm.h"
#include "ide.h"
#include "ide_atapi.h"
#include "scsi.h"
#include "scsi_cd.h"
#include "scsi_hd.h"
@ -323,13 +324,13 @@ void scsi_bus_kick(scsi_bus_t *bus)
scsi_bus_update(bus, 0);
}
void scsi_bus_atapi_init(scsi_bus_t *bus, scsi_device_t *device, int id)
void scsi_bus_atapi_init(scsi_bus_t *bus, scsi_device_t *device, int id, atapi_device_t *atapi_dev)
{
memset(bus->devices, 0, sizeof(bus->devices));
memset(bus->device_data, 0, sizeof(bus->device_data));
bus->devices[0] = device;
bus->device_data[0] = bus->devices[0]->atapi_init(bus, id);
bus->device_data[0] = bus->devices[0]->atapi_init(bus, id, atapi_dev);
if (!bus->device_data[0])
bus->devices[0] = NULL;

6
src/scsi.h
View file

@ -2,11 +2,12 @@
#define _SCSI_H_
struct scsi_bus_t;
struct atapi_device_t;
typedef struct scsi_device_t
{
void *(*init)(struct scsi_bus_t *bus, int id);
void *(*atapi_init)(struct scsi_bus_t *bus, int id);
void *(*atapi_init)(struct scsi_bus_t *bus, int id, struct atapi_device_t *atapi_dev);
void (*close)(void *p);
void (*start_command)(void *p);
@ -104,7 +105,8 @@ int scsi_bus_match(scsi_bus_t *bus, int bus_assert);
void scsi_bus_kick(scsi_bus_t *bus);
void scsi_bus_init(scsi_bus_t *bus);
void scsi_bus_close(scsi_bus_t *bus);
void scsi_bus_atapi_init(scsi_bus_t *bus, scsi_device_t *device, int id);
void scsi_bus_atapi_init(scsi_bus_t *bus, scsi_device_t *device, int id, struct atapi_device_t *atapi_dev);
#define KEY_NONE 0
#define KEY_NOT_READY 2

9
src/scsi_cd.c
View file

@ -193,6 +193,7 @@ typedef struct scsi_cd_data_t
uint8_t page_current;
int is_atapi;
atapi_device_t *atapi_dev;
} scsi_cd_data_t;
static void scsi_add_data(scsi_cd_data_t *data, uint8_t val)
@ -283,11 +284,12 @@ static void *scsi_cd_init(scsi_bus_t *bus, int id)
return data;
}
static void *scsi_cd_atapi_init(scsi_bus_t *bus, int id)
static void *scsi_cd_atapi_init(scsi_bus_t *bus, int id, atapi_device_t *atapi_dev)
{
scsi_cd_data_t *data = scsi_cd_init(bus, id);
data->is_atapi = 1;
data->atapi_dev = atapi_dev;
return data;
}
@ -625,6 +627,10 @@ static int scsi_cd_command(uint8_t *cdb, void *p)
data->cmd_pos = CMD_POS_TRANSFER;
data->bytes_expected = data->cdlen * ((rcdmode == 0x10) ? 2048 : 2352);
if (rcdmode == 0x10)
atapi_set_transfer_granularity(data->atapi_dev, 2048);
else
atapi_set_transfer_granularity(data->atapi_dev, 2352);
}
if (!data->cdlen)
{
@ -689,6 +695,7 @@ static int scsi_cd_command(uint8_t *cdb, void *p)
data->cmd_pos = CMD_POS_TRANSFER;
data->bytes_expected = data->cdlen * 2048;
atapi_set_transfer_granularity(data->atapi_dev, 2048);
}
if (!data->cdlen)

9
src/scsi_zip.c
View file

@ -4,6 +4,7 @@
#include <string.h>
#include "ibm.h"
#include "hdd_file.h"
#include "ide_atapi.h"
#include "scsi.h"
#include "scsi_zip.h"
#include "timer.h"
@ -69,6 +70,7 @@ typedef struct scsi_zip_data
scsi_bus_t *bus;
int is_atapi;
atapi_device_t *atapi_dev;
int read_only;
} scsi_zip_data;
@ -193,11 +195,12 @@ static void *scsi_zip_init(scsi_bus_t *bus, int id)
return data;
}
static void *scsi_zip_atapi_init(scsi_bus_t *bus, int id)
static void *scsi_zip_atapi_init(scsi_bus_t *bus, int id, atapi_device_t *atapi_dev)
{
scsi_zip_data *data = scsi_zip_init(bus, id);
data->is_atapi = 1;
data->atapi_dev = atapi_dev;
return data;
}
@ -686,6 +689,7 @@ static int scsi_zip_command(uint8_t *cdb, void *p)
data->sector_pos = 0;
bus_state = BUS_CD;
atapi_set_transfer_granularity(data->atapi_dev, 512);
break;
}
// else
@ -746,6 +750,7 @@ static int scsi_zip_command(uint8_t *cdb, void *p)
data->sector_pos = 0;
bus_state = BUS_CD;
atapi_set_transfer_granularity(data->atapi_dev, 512);
break;
}
// else
@ -814,6 +819,7 @@ static int scsi_zip_command(uint8_t *cdb, void *p)
data->sector_pos = 0;
bus_state = BUS_CD;
atapi_set_transfer_granularity(data->atapi_dev, 512);
break;
}
if (data->cmd_pos == CMD_POS_TRANSFER && data->bytes_received != data->bytes_required)
@ -881,6 +887,7 @@ static int scsi_zip_command(uint8_t *cdb, void *p)
data->sector_pos = 0;
bus_state = BUS_CD;
atapi_set_transfer_granularity(data->atapi_dev, 512);
break;
}
if (data->cmd_pos == CMD_POS_TRANSFER && data->bytes_received != data->bytes_required)