aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2011-04-12 21:36:05 +0530
committerKevin Wolf <kwolf@redhat.com>2011-04-13 12:20:36 +0200
commit8f8e834d70216372619b79a10392cdf208bbd3d0 (patch)
tree50ae5980cd7b9386aec4f8ea7095d126d6124c09
parent493accd624149e9dcf4b89dcbbdbc42621cbc231 (diff)
downloadqemu-8f8e834d70216372619b79a10392cdf208bbd3d0.zip
qemu-8f8e834d70216372619b79a10392cdf208bbd3d0.tar.gz
qemu-8f8e834d70216372619b79a10392cdf208bbd3d0.tar.bz2
atapi: GESN: Use structs for commonly-used field types
Instead of using magic numbers, use structs that are more descriptive of the fields being used. Signed-off-by: Amit Shah <amit.shah@redhat.com> Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--hw/ide/core.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 4e4ade2..f976947 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1088,11 +1088,23 @@ static void handle_get_event_status_notification(IDEState *s,
uint8_t *buf,
const uint8_t *packet)
{
+ struct {
+ uint8_t opcode;
+ uint8_t polled; /* lsb bit is polled; others are reserved */
+ uint8_t reserved2[2];
+ uint8_t class;
+ uint8_t reserved3[2];
+ uint16_t len;
+ uint8_t control;
+ } __attribute__((packed)) *gesn_cdb;
+
unsigned int max_len;
- max_len = ube16_to_cpu(packet + 7);
+ gesn_cdb = (void *)packet;
+ max_len = be16_to_cpu(gesn_cdb->len);
- if (!(packet[1] & 0x01)) { /* asynchronous mode */
+ /* It is fine by the MMC spec to not support async mode operations */
+ if (!(gesn_cdb->polled & 0x01)) { /* asynchronous mode */
/* Only polling is supported, asynchronous mode is not. */
ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST,
ASC_INV_FIELD_IN_CMD_PACKET);