diff options
author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-24 16:10:43 +0000 |
---|---|---|
committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-24 16:10:43 +0000 |
commit | 985a03b0ce38275c2ea355bf29b6d6b5779dbb56 (patch) | |
tree | 22eac188d157768555e44f33f2eca5be2508c10b /hw/lsi53c895a.c | |
parent | 1b0889958e875df85c7b2353498ed2cac16415ce (diff) |
Real SCSI device passthrough (v4), by Laurent Vivier.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3851 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/lsi53c895a.c')
-rw-r--r-- | hw/lsi53c895a.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 3a4ddf7f63..a08cfd9e3e 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -1236,6 +1236,8 @@ static uint8_t lsi_reg_readb(LSIState *s, int offset) return s->sdid; case 0x07: /* GPREG0 */ return 0x7f; + case 0x08: /* Revision ID */ + return 0x00; case 0xa: /* SSID */ return s->ssid; case 0xb: /* SBCL */ @@ -1281,6 +1283,8 @@ static uint8_t lsi_reg_readb(LSIState *s, int offset) return s->ctest4; case 0x22: /* CTEST5 */ return s->ctest5; + case 0x23: /* CTEST6 */ + return 0; case 0x24: /* DBC[0:7] */ return s->dbc & 0xff; case 0x25: /* DBC[8:15] */ @@ -1838,7 +1842,9 @@ void lsi_scsi_attach(void *opaque, BlockDriverState *bd, int id) s->scsi_dev[id]->destroy(s->scsi_dev[id]); } DPRINTF("Attaching block device %d\n", id); - s->scsi_dev[id] = scsi_disk_init(bd, 1, lsi_command_complete, s); + s->scsi_dev[id] = scsi_generic_init(bd, 1, lsi_command_complete, s); + if (s->scsi_dev[id] == NULL) + s->scsi_dev[id] = scsi_disk_init(bd, 1, lsi_command_complete, s); } void *lsi_scsi_init(PCIBus *bus, int devfn) |