mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some work on the USB disk/cdrom emulation.

Browse Source 
- More accurate seek emulation for read commands.
- Moved status indicator code to the SCSI layer.
- Fixed dump size for async packets.
TODO: Seek emulation for disk write commands.
This commit is contained in:
Volker Ruppert 2015-10-03 07:19:48 +00:00
parent 12f6857968
commit b754d72ab2
4 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bochs/iodev/usb/scsi_device.cc
View File

@ -95,6 +95,7 @@ scsi_device_t::scsi_device_t(device_image_t *_hdimage, int _tcq,
sprintf(drive_serial_str, "%d", serial_number++);
seek_timer_index =
DEV_register_timer(this, seek_timer_handler, 1000, 0, 0, "USB HD seek");
statusbar_id = bx_gui->register_statusitem("USB-HD", 1);
put("SCSIHD");
}
@ -118,6 +119,7 @@ scsi_device_t::scsi_device_t(cdrom_base_c *_cdrom, int _tcq,
sprintf(drive_serial_str, "%d", serial_number++);
seek_timer_index =
DEV_register_timer(this, seek_timer_handler, 1000, 0, 0, "USB CD seek");
statusbar_id = bx_gui->register_statusitem("USB-CD", 1);
put("SCSICD");
}
@ -145,6 +147,7 @@ scsi_device_t::~scsi_device_t(void)
}
free_requests = NULL;
}
bx_gui->unregister_statusitem(statusbar_id);
bx_pc_system.deactivate_timer(seek_timer_index);
bx_pc_system.unregisterTimer(seek_timer_index);
}
@ -337,7 +340,7 @@ void scsi_device_t::restore_requests(const char *path)
} else if (!strcmp(pname, "async_mode")) {
r->async_mode = (bx_bool)value;
} else if (!strcmp(pname, "seek_pending")) {
r->seek_pending = (bx_bool)value;
r->seek_pending = (Bit8u)value;
} else {
BX_ERROR(("restore_requests(): data format error"));
rrq_error = 1;
@ -396,30 +399,29 @@ void scsi_device_t::scsi_read_complete(void *req, int ret)
completion(dev, SCSI_REASON_DATA, r->tag, r->buf_len);
}
bx_bool scsi_device_t::scsi_read_data(Bit32u tag)
void scsi_device_t::scsi_read_data(Bit32u tag)
{
SCSIRequest *r = scsi_find_request(tag);
if (!r) {
BX_ERROR(("bad read tag 0x%x", tag));
return 0;
return;
}
if (r->sector_count == (Bit32u)-1) {
BX_DEBUG(("read buf_len=%d", r->buf_len));
r->sector_count = 0;
completion(dev, SCSI_REASON_DATA, r->tag, r->buf_len);
return 0;
return;
}
BX_DEBUG(("read sector_count=%d", r->sector_count));
if (r->sector_count == 0) {
scsi_command_complete(r, STATUS_GOOD, SENSE_NO_SENSE);
return 0;
return;
}
if ((r->async_mode) && (!r->seek_pending)) {
if ((r->async_mode) && (r->seek_pending == 2)) {
start_seek(r);
} else {
} else if (!r->seek_pending) {
seek_complete(r);
}
return 1;
}
void scsi_device_t::scsi_write_complete(void *req, int ret)
@ -446,7 +448,7 @@ void scsi_device_t::scsi_write_complete(void *req, int ret)
}
}
bx_bool scsi_device_t::scsi_write_data(Bit32u tag)
void scsi_device_t::scsi_write_data(Bit32u tag)
{
SCSIRequest *r;
Bit32u n;
@ -456,11 +458,12 @@ bx_bool scsi_device_t::scsi_write_data(Bit32u tag)
r = scsi_find_request(tag);
if (!r) {
BX_ERROR(("bad write tag 0x%x", tag));
return 0;
return;
}
if (type == SCSIDEV_TYPE_DISK) {
n = r->buf_len / 512;
if (n) {
bx_gui->statusbar_setitem(statusbar_id, 1, 1);
ret = (int)hdimage->lseek(r->sector * 512, SEEK_SET);
if (ret < 0) {
BX_ERROR(("could not lseek() hard drive image file"));
@ -472,20 +475,16 @@ bx_bool scsi_device_t::scsi_write_data(Bit32u tag)
if (ret < r->buf_len) {
BX_ERROR(("could not write() hard drive image file"));
scsi_command_complete(r, STATUS_CHECK_CONDITION, SENSE_HARDWARE_ERROR);
return 0;
} else {
scsi_write_complete((void*)r, 0);
}
} else {
scsi_write_complete(r, 0);
return 0;
}
} else {
BX_ERROR(("CD-ROM: write not supported"));
scsi_command_complete(r, STATUS_CHECK_CONDITION, SENSE_HARDWARE_ERROR);
return 0;
}
return 1;
}
Bit8u* scsi_device_t::scsi_get_buf(Bit32u tag)
@ -839,6 +838,7 @@ Bit32s scsi_device_t::scsi_send_command(Bit32u tag, Bit8u *buf, int lun, bx_bool
goto illegal_lba;
r->sector = lba;
r->sector_count = len;
r->seek_pending = 2;
r->async_mode = async;
break;
case 0x0a:
@ -989,14 +989,14 @@ void scsi_device_t::start_seek(SCSIRequest *r)
max_pos = max_lba;
prev_pos = curr_lba;
new_pos = r->sector + r->sector_count;
new_pos = r->sector;
if (type == SCSIDEV_TYPE_CDROM) {
fSeekBase = 80000.0;
} else {
fSeekBase = 5000.0;
}
fSeekTime = fSeekBase * (double)abs((int)(new_pos - prev_pos + 1)) / (max_pos + 1);
seek_time = (fSeekTime > 10.0) ? (Bit32u)fSeekTime : 10;
seek_time = 4000 + (Bit32u)fSeekTime;
bx_pc_system.activate_timer(seek_timer_index, seek_time, 0);
bx_pc_system.setTimerParam(seek_timer_index, r->tag);
r->seek_pending = 1;
@ -1022,6 +1022,7 @@ void scsi_device_t::seek_complete(SCSIRequest *r)
int ret = 0;
if (!r->write_cmd) {
bx_gui->statusbar_setitem(statusbar_id, 1);
n = r->sector_count;
if (n > (Bit32u)(SCSI_DMA_BUF_SIZE / (512 * cluster_size)))
n = SCSI_DMA_BUF_SIZE / (512 * cluster_size);

7
bochs/iodev/usb/scsi_device.h
View File

@ -63,7 +63,7 @@ typedef struct SCSIRequest {
Bit32u status;
bx_bool write_cmd;
bx_bool async_mode;
bx_bool seek_pending;
Bit8u seek_pending;
struct SCSIRequest *next;
} SCSIRequest;
@ -81,9 +81,9 @@ public:
void scsi_command_complete(SCSIRequest *r, int status, int sense);
void scsi_cancel_io(Bit32u tag);
void scsi_read_complete(void *req, int ret);
bx_bool scsi_read_data(Bit32u tag);
void scsi_read_data(Bit32u tag);
void scsi_write_complete(void *req, int ret);
bx_bool scsi_write_data(Bit32u tag);
void scsi_write_data(Bit32u tag);
Bit8u* scsi_get_buf(Bit32u tag);
const char *get_serial_number() {return drive_serial_str;}
void set_inserted(bx_bool value);
@ -119,6 +119,7 @@ private:
bx_bool inserted;
char drive_serial_str[21];
int seek_timer_index;
int statusbar_id;
};
#endif

21
bochs/iodev/usb/usb_msd.cc
View File

@ -270,7 +270,6 @@ usb_msd_device_c::usb_msd_device_c(usbdev_type type, const char *filename)
}
s.journal[0] = 0;
s.size = 0;
s.statusbar_id = bx_gui->register_statusitem("USB-HD", 1);
} else if (d.type == USB_DEV_TYPE_CDROM) {
strcpy(d.devname, "BOCHS USB CDROM");
s.fname = filename;
@ -297,7 +296,6 @@ usb_msd_device_c::usb_msd_device_c(usbdev_type type, const char *filename)
bx_list_c *usb = (bx_list_c*)SIM->get_param("ports.usb");
usb->add(s.config);
}
s.statusbar_id = bx_gui->register_statusitem("USB-CD", 1);
}
put("usb_msd", "USBMSD");
@ -305,7 +303,6 @@ usb_msd_device_c::usb_msd_device_c(usbdev_type type, const char *filename)
usb_msd_device_c::~usb_msd_device_c(void)
{
bx_gui->unregister_statusitem(s.statusbar_id);
if (s.scsi_dev != NULL)
delete s.scsi_dev;
if (s.hdimage != NULL) {
@ -649,13 +646,9 @@ int usb_msd_device_c::handle_data(USBPacket *p)
s.scsi_dev->scsi_send_command(s.tag, cbw.cmd, cbw.lun, d.async_mode);
if (s.residue == 0) {
if (s.mode == USB_MSDM_DATAIN) {
if (s.scsi_dev->scsi_read_data(s.tag)) {
bx_gui->statusbar_setitem(s.statusbar_id, 1);
}
s.scsi_dev->scsi_read_data(s.tag);
} else if (s.mode == USB_MSDM_DATAOUT) {
if (s.scsi_dev->scsi_write_data(s.tag)) {
bx_gui->statusbar_setitem(s.statusbar_id, 1, 1);
}
s.scsi_dev->scsi_write_data(s.tag);
}
}
ret = len;
@ -787,13 +780,9 @@ void usb_msd_device_c::copy_data()
s.data_len -= len;
if (s.scsi_len == 0) {
if (s.mode == USB_MSDM_DATAIN) {
if (s.scsi_dev->scsi_read_data(s.tag)) {
bx_gui->statusbar_setitem(s.statusbar_id, 1);
}
s.scsi_dev->scsi_read_data(s.tag);
} else if (s.mode == USB_MSDM_DATAOUT) {
if (s.scsi_dev->scsi_write_data(s.tag)) {
bx_gui->statusbar_setitem(s.statusbar_id, 1, 1);
}
s.scsi_dev->scsi_write_data(s.tag);
}
}
}
@ -851,7 +840,7 @@ void usb_msd_device_c::command_complete(int reason, Bit32u tag, Bit32u arg)
s.scsi_buf = s.scsi_dev->scsi_get_buf(tag);
if (p) {
if ((s.scsi_len > 0) && (s.mode == USB_MSDM_DATAIN)) {
usb_dump_packet(s.scsi_buf, s.scsi_len);
usb_dump_packet(s.scsi_buf, p->len);
}
copy_data();
if (s.usb_len == 0) {

1
bochs/iodev/usb/usb_msd.h
View File

@ -78,7 +78,6 @@ private:
char info_txt[BX_PATHNAME_LEN];
char journal[BX_PATHNAME_LEN]; // undoable / volatile disk only
int size; // VVFAT disk only
int statusbar_id;
bx_bool status_changed;
} s;