diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-09-13 14:41:56 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-28 19:25:50 +0200 |
| commit | 67cc61e43077eeffc7c95a1bb25d05a12d051c67 (patch) | |
| tree | a803822fb32290d330eb37df6f7972d2fcdbc876 /hw/scsi-disk.c | |
| parent | 7e218df5181f1c26d52ef525b30a416c60a2160b (diff) | |
atapi/scsi: unify definitions for MMC
The definitions in ide/internal.h are duplicates, since ATAPI commands
actually come from SCSI. Use the ones in scsi-defs.h and move the
missing ones there. Two exceptions:
- MODE_PAGE_WRITE_PARMS conflicts with the "flexible disk geometry"
page in scsi-disk.c. It is unused, so pick the latter.
- GPCMD_* is left in ide/internal.h, at least for now.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/scsi-disk.c')
| -rw-r--r-- | hw/scsi-disk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 9c62569a17..a6ef06005e 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -576,7 +576,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, * The buffer was already menset to zero by the caller of this function. */ switch (page) { - case 4: /* Rigid disk device geometry page. */ + case MODE_PAGE_HD_GEOMETRY: if (s->qdev.type == TYPE_ROM) { return -1; } @@ -611,7 +611,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, p[21] = 5400 & 0xff; break; - case 5: /* Flexible disk device geometry page. */ + case MODE_PAGE_FLEXIBLE_DISK_GEOMETRY: if (s->qdev.type == TYPE_ROM) { return -1; } @@ -653,7 +653,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, p[29] = 5400 & 0xff; break; - case 8: /* Caching page. */ + case MODE_PAGE_CACHING: p[0] = 8; p[1] = 0x12; if (page_control == 1) { /* Changeable Values */ @@ -664,7 +664,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, } break; - case 0x2a: /* CD Capabilities and Mechanical Status page. */ + case MODE_PAGE_CAPABILITIES: if (s->qdev.type != TYPE_ROM) { return -1; } |