mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-26 04:13:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ide: Replace IDEState members is_cdrom, is_cf by drive_kind

Browse Source 
The two aren't independent variables.  Make that obvious.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2010-05-28 13:32:45 +02:00 committed by Kevin Wolf
parent f597627ff5
commit cd8722bb22
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/ide/core.c
View File

@ -292,7 +292,7 @@ static void ide_set_signature(IDEState *s)
/* put signature */ /* put signature */
s->nsector = 1; s->nsector = 1;
s->sector = 1; s->sector = 1;
if (s->is_cdrom) { if (s->drive_kind == IDE_CD) {
s->lcyl = 0x14; s->lcyl = 0x14;
s->hcyl = 0xeb; s->hcyl = 0xeb;
} else if (s->bs) { } else if (s->bs) {
@ -1827,15 +1827,15 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
switch(val) { switch(val) {
case WIN_IDENTIFY: case WIN_IDENTIFY:
if (s->bs && !s->is_cdrom) { if (s->bs && s->drive_kind != IDE_CD) {
if (!s->is_cf) if (s->drive_kind != IDE_CFATA)
ide_identify(s); ide_identify(s);
else else
ide_cfata_identify(s); ide_cfata_identify(s);
s->status = READY_STAT | SEEK_STAT; s->status = READY_STAT | SEEK_STAT;
ide_transfer_start(s, s->io_buffer, 512, ide_transfer_stop); ide_transfer_start(s, s->io_buffer, 512, ide_transfer_stop);
} else { } else {
if (s->is_cdrom) { if (s->drive_kind == IDE_CD) {
ide_set_signature(s); ide_set_signature(s);
} }
ide_abort_command(s); ide_abort_command(s);
@ -1849,7 +1849,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
ide_set_irq(s->bus); ide_set_irq(s->bus);
break; break;
case WIN_SETMULT: case WIN_SETMULT:
if (s->is_cf && s->nsector == 0) { if (s->drive_kind == IDE_CFATA && s->nsector == 0) {
/* Disable Read and Write Multiple */ /* Disable Read and Write Multiple */
s->mult_sectors = 0; s->mult_sectors = 0;
s->status = READY_STAT | SEEK_STAT; s->status = READY_STAT | SEEK_STAT;
@ -2033,7 +2033,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
ide_set_irq(s->bus); ide_set_irq(s->bus);
break; break;
case WIN_SEEK: case WIN_SEEK:
if(s->is_cdrom) if(s->drive_kind == IDE_CD)
goto abort_cmd; goto abort_cmd;
/* XXX: Check that seek is within bounds */ /* XXX: Check that seek is within bounds */
s->status = READY_STAT | SEEK_STAT; s->status = READY_STAT | SEEK_STAT;
@ -2041,7 +2041,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
break; break;
/* ATAPI commands */ /* ATAPI commands */
case WIN_PIDENTIFY: case WIN_PIDENTIFY:
if (s->is_cdrom) { if (s->drive_kind == IDE_CD) {
ide_atapi_identify(s); ide_atapi_identify(s);
s->status = READY_STAT | SEEK_STAT; s->status = READY_STAT | SEEK_STAT;
ide_transfer_start(s, s->io_buffer, 512, ide_transfer_stop); ide_transfer_start(s, s->io_buffer, 512, ide_transfer_stop);
@ -2052,7 +2052,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
break; break;
case WIN_DIAGNOSE: case WIN_DIAGNOSE:
ide_set_signature(s); ide_set_signature(s);
if (s->is_cdrom) if (s->drive_kind == IDE_CD)
s->status = 0; /* ATAPI spec (v6) section 9.10 defines packet s->status = 0; /* ATAPI spec (v6) section 9.10 defines packet
* devices to return a clear status register * devices to return a clear status register
* with READY_STAT *not* set. */ * with READY_STAT *not* set. */
@ -2064,14 +2064,14 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
ide_set_irq(s->bus); ide_set_irq(s->bus);
break; break;
case WIN_SRST: case WIN_SRST:
if (!s->is_cdrom) if (s->drive_kind != IDE_CD)
goto abort_cmd; goto abort_cmd;
ide_set_signature(s); ide_set_signature(s);
s->status = 0x00; /* NOTE: READY is _not_ set */ s->status = 0x00; /* NOTE: READY is _not_ set */
s->error = 0x01; s->error = 0x01;
break; break;
case WIN_PACKETCMD: case WIN_PACKETCMD:
if (!s->is_cdrom) if (s->drive_kind != IDE_CD)
goto abort_cmd; goto abort_cmd;
/* overlapping commands not supported */ /* overlapping commands not supported */
if (s->feature & 0x02) if (s->feature & 0x02)
@ -2084,7 +2084,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
break; break;
/* CF-ATA commands */ /* CF-ATA commands */
case CFA_REQ_EXT_ERROR_CODE: case CFA_REQ_EXT_ERROR_CODE:
if (!s->is_cf) if (s->drive_kind != IDE_CFATA)
goto abort_cmd; goto abort_cmd;
s->error = 0x09; /* miscellaneous error */ s->error = 0x09; /* miscellaneous error */
s->status = READY_STAT | SEEK_STAT; s->status = READY_STAT | SEEK_STAT;
@ -2092,7 +2092,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
break; break;
case CFA_ERASE_SECTORS: case CFA_ERASE_SECTORS:
case CFA_WEAR_LEVEL: case CFA_WEAR_LEVEL:
if (!s->is_cf) if (s->drive_kind != IDE_CFATA)
goto abort_cmd; goto abort_cmd;
if (val == CFA_WEAR_LEVEL) if (val == CFA_WEAR_LEVEL)
s->nsector = 0; s->nsector = 0;
@ -2103,7 +2103,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
ide_set_irq(s->bus); ide_set_irq(s->bus);
break; break;
case CFA_TRANSLATE_SECTOR: case CFA_TRANSLATE_SECTOR:
if (!s->is_cf) if (s->drive_kind != IDE_CFATA)
goto abort_cmd; goto abort_cmd;
s->error = 0x00; s->error = 0x00;
s->status = READY_STAT | SEEK_STAT; s->status = READY_STAT | SEEK_STAT;
@ -2123,7 +2123,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
ide_set_irq(s->bus); ide_set_irq(s->bus);
break; break;
case CFA_ACCESS_METADATA_STORAGE: case CFA_ACCESS_METADATA_STORAGE:
if (!s->is_cf) if (s->drive_kind != IDE_CFATA)
goto abort_cmd; goto abort_cmd;
switch (s->feature) { switch (s->feature) {
case 0x02: /* Inquiry Metadata Storage */ case 0x02: /* Inquiry Metadata Storage */
@ -2143,7 +2143,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
ide_set_irq(s->bus); ide_set_irq(s->bus);
break; break;
case IBM_SENSE_CONDITION: case IBM_SENSE_CONDITION:
if (!s->is_cf) if (s->drive_kind != IDE_CFATA)
goto abort_cmd; goto abort_cmd;
switch (s->feature) { switch (s->feature) {
case 0x01: /* sense temperature in device */ case 0x01: /* sense temperature in device */
@ -2157,7 +2157,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
break; break;
case WIN_SMART: case WIN_SMART:
if (s->is_cdrom) if (s->drive_kind == IDE_CD)
goto abort_cmd; goto abort_cmd;
if (s->hcyl != 0xc2 || s->lcyl != 0x4f) if (s->hcyl != 0xc2 || s->lcyl != 0x4f)
goto abort_cmd; goto abort_cmd;
@ -2438,7 +2438,7 @@ void ide_cmd_write(void *opaque, uint32_t addr, uint32_t val)
/* high to low */ /* high to low */
for(i = 0;i < 2; i++) { for(i = 0;i < 2; i++) {
s = &bus->ifs[i]; s = &bus->ifs[i];
if (s->is_cdrom) if (s->drive_kind == IDE_CD)
s->status = 0x00; /* NOTE: READY is _not_ set */ s->status = 0x00; /* NOTE: READY is _not_ set */
else else
s->status = READY_STAT | SEEK_STAT; s->status = READY_STAT | SEEK_STAT;
@ -2540,7 +2540,7 @@ static void ide_reset(IDEState *s)
#ifdef DEBUG_IDE #ifdef DEBUG_IDE
printf("ide: reset\n"); printf("ide: reset\n");
#endif #endif
if (s->is_cf) if (s->drive_kind == IDE_CFATA)
s->mult_sectors = 0; s->mult_sectors = 0;
else else
s->mult_sectors = MAX_MULT_SECTORS; s->mult_sectors = MAX_MULT_SECTORS;
@ -2614,7 +2614,7 @@ void ide_init_drive(IDEState *s, BlockDriverState *bs,
s->smart_errors = 0; s->smart_errors = 0;
s->smart_selftest_count = 0; s->smart_selftest_count = 0;
if (bdrv_get_type_hint(bs) == BDRV_TYPE_CDROM) { if (bdrv_get_type_hint(bs) == BDRV_TYPE_CDROM) {
s->is_cdrom = 1; s->drive_kind = IDE_CD;
bdrv_set_change_cb(bs, cdrom_change_cb, s); bdrv_set_change_cb(bs, cdrom_change_cb, s);
} }
if (serial) { if (serial) {
@ -2629,7 +2629,7 @@ void ide_init_drive(IDEState *s, BlockDriverState *bs,
pstrcpy(s->version, sizeof(s->version), QEMU_VERSION); pstrcpy(s->version, sizeof(s->version), QEMU_VERSION);
} }
ide_reset(s); ide_reset(s);
bdrv_set_removable(bs, s->is_cdrom); bdrv_set_removable(bs, s->drive_kind == IDE_CD);
} }
static void ide_init1(IDEBus *bus, int unit) static void ide_init1(IDEBus *bus, int unit)

5
hw/ide/internal.h
View File

@ -362,6 +362,8 @@ typedef struct BMDMAState BMDMAState;
#define SMART_DISABLE 0xd9 #define SMART_DISABLE 0xd9
#define SMART_STATUS 0xda #define SMART_STATUS 0xda
typedef enum { IDE_HD, IDE_CD, IDE_CFATA } IDEDriveKind;
typedef void EndTransferFunc(IDEState *); typedef void EndTransferFunc(IDEState *);
/* NOTE: IDEState represents in fact one drive */ /* NOTE: IDEState represents in fact one drive */
@ -369,8 +371,7 @@ struct IDEState {
IDEBus *bus; IDEBus *bus;
uint8_t unit; uint8_t unit;
/* ide config */ /* ide config */
int is_cdrom; IDEDriveKind drive_kind;
int is_cf;
int cylinders, heads, sectors; int cylinders, heads, sectors;
int64_t nb_sectors; int64_t nb_sectors;
int mult_sectors; int mult_sectors;

2
hw/ide/macio.c
View File

@ -162,7 +162,7 @@ static void pmac_ide_transfer(DBDMA_io *io)
IDEState *s = idebus_active_if(&m->bus); IDEState *s = idebus_active_if(&m->bus);
s->io_buffer_size = 0; s->io_buffer_size = 0;
if (s->is_cdrom) { if (s->drive_kind == IDE_CD) {
pmac_ide_atapi_transfer_cb(io, 0); pmac_ide_atapi_transfer_cb(io, 0);
return; return;
} }

2
hw/ide/microdrive.c
View File

@ -541,7 +541,7 @@ PCMCIACardState *dscm1xxxx_init(DriveInfo *bdrv)
ide_init2_with_non_qdev_drives(&md->bus, bdrv, NULL, ide_init2_with_non_qdev_drives(&md->bus, bdrv, NULL,
qemu_allocate_irqs(md_set_irq, md, 1)[0]); qemu_allocate_irqs(md_set_irq, md, 1)[0]);
md->bus.ifs[0].is_cf = 1; md->bus.ifs[0].drive_kind = IDE_CFATA;
md->bus.ifs[0].mdata_size = METADATA_SIZE; md->bus.ifs[0].mdata_size = METADATA_SIZE;
md->bus.ifs[0].mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE); md->bus.ifs[0].mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE);