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

atapi: Move GET_EVENT_STATUS_NOTIFICATION command handling to its own function

Browse Source 
This makes the code more readable.

Also, there's a block like:

if () {
  ...
} else {
  ...
}

Split that into

if () {
  ...
  return;
}
...

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>
This commit is contained in:
Amit Shah 2011-04-12 21:36:04 +05:30 committed by Kevin Wolf
parent 0c370a3549
commit 493accd624
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/ide/core.c
View File

@ -1084,6 +1084,29 @@ static int ide_dvd_read_structure(IDEState *s, int format,
} }
} }
static void handle_get_event_status_notification(IDEState *s,
uint8_t *buf,
const uint8_t *packet)
{
unsigned int max_len;
max_len = ube16_to_cpu(packet + 7);
if (!(packet[1] & 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);
return;
}
/* polling */
/* We don't support any event class (yet). */
cpu_to_ube16(buf, 0x00); /* No event descriptor returned */
buf[2] = 0x80; /* No Event Available (NEA) */
buf[3] = 0x00; /* Empty supported event classes */
ide_atapi_cmd_reply(s, 4, max_len);
}
static void ide_atapi_cmd(IDEState *s) static void ide_atapi_cmd(IDEState *s)
{ {
const uint8_t *packet; const uint8_t *packet;
@ -1529,19 +1552,7 @@ static void ide_atapi_cmd(IDEState *s)
break; break;
} }
case GPCMD_GET_EVENT_STATUS_NOTIFICATION: case GPCMD_GET_EVENT_STATUS_NOTIFICATION:
max_len = ube16_to_cpu(packet + 7); handle_get_event_status_notification(s, buf, packet);
if (packet[1] & 0x01) { /* polling */
/* We don't support any event class (yet). */
cpu_to_ube16(buf, 0x00); /* No event descriptor returned */
buf[2] = 0x80; /* No Event Available (NEA) */
buf[3] = 0x00; /* Empty supported event classes */
ide_atapi_cmd_reply(s, 4, max_len);
} else { /* asynchronous mode */
/* Only polling is supported, asynchronous mode is not. */
ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST,
ASC_INV_FIELD_IN_CMD_PACKET);
}
break; break;
default: default:
ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST, ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST,