@@ -1084,14 +1084,24 @@ static int ide_dvd_read_structure(IDEState *s, int format,
}
}
+static unsigned int event_status_nea(uint8_t *buf, unsigned int max_len)
+{
+ cpu_to_ube16(buf, 0x00); /* No event descriptor returned */
+ buf[2] = 0x80; /* No Event Available (NEA) */
+ buf[3] = 0x00; /* Empty supported event classes */
+
+ return 4; /* We wrote to 4 bytes */
+}
+
static void handle_get_event_status_notification(IDEState *s,
uint8_t *buf,
const uint8_t *packet)
{
- unsigned int max_len;
+ unsigned int max_len, used_len;
max_len = ube16_to_cpu(packet + 7);
+ /* It is fine by the MMC spec to not support async mode operations */
if (!(packet[1] & 0x01)) { /* asynchronous mode */
/* Only polling is supported, asynchronous mode is not. */
ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST,
@@ -1099,12 +1109,11 @@ static void handle_get_event_status_notification(IDEState *s,
return;
}
- /* polling */
+ /* polling mode operation */
+
/* 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);
+ used_len = event_status_nea(buf, max_len);
+ ide_atapi_cmd_reply(s, used_len, max_len);
}
static void ide_atapi_cmd(IDEState *s)
Handle GET_EVENT_STATUS_NOTIFICATION's No Event Available status in its own function. Signed-off-by: Amit Shah <amit.shah@redhat.com> --- hw/ide/core.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)