[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 5/5] atapi: GESN: implement 'media' subcomman
From: |
Jes Sorensen |
Subject: |
Re: [Qemu-devel] [PATCH v4 5/5] atapi: GESN: implement 'media' subcommand |
Date: |
Tue, 12 Apr 2011 17:03:45 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110307 Fedora/3.1.9-0.39.b3pre.fc14 Thunderbird/3.1.9 |
On 04/12/11 16:09, Amit Shah wrote:
> diff --git a/hw/ide/core.c b/hw/ide/core.c
> index dafc049..209d8e6 100644
> --- a/hw/ide/core.c
> +++ b/hw/ide/core.c
> @@ -1084,6 +1084,49 @@ static int ide_dvd_read_structure(IDEState *s, int
> format,
> }
> }
>
> +static unsigned int event_status_media(IDEState *s,
> + uint8_t *buf,
> + unsigned int max_len)
> +{
> + enum media_event_code {
> + no_change = 0, /* Status unchanged */
> + eject_requested, /* received a request from user to eject */
> + new_media, /* new media inserted and ready for access */
> + media_removal, /* only for media changers */
> + media_changed, /* only for media changers */
> + bg_format_completed, /* MRW or DVD+RW b/g format completed */
> + bg_format_restarted, /* MRW or DVD+RW b/g format restarted */
> + };
> + enum media_status {
> + tray_open = 1,
> + media_present = 2,
> + };
Would be nice if you used upper-case with the enums since they are
effectively just defines, to avoid confusing them with variables.
> + uint8_t event_code, media_status;
> +
> + media_status = 0;
> + if (s->bs->tray_open) {
> + media_status = tray_open;
> + } else if (bdrv_is_inserted(s->bs)) {
> + media_status = media_present;
> + }
> +
> + /* Event notification descriptor */
> + event_code = no_change;
> + if (media_status != tray_open && s->events.new_media) {
> + event_code = new_media;
> + s->events.new_media = false;
> + }
> +
> + buf[4] = event_code;
> + buf[5] = media_status;
> +
> + /* These fields are reserved, just clear them. */
> + buf[6] = 0;
> + buf[7] = 0;
> +
> + return 8; /* We wrote to 4 extra bytes from the header */
Shouldn't you verify that you don't exceed max_len in this?
> @@ -1104,6 +1147,26 @@ static void
> handle_get_event_status_notification(IDEState *s,
> uint8_t supported_events;
> } __attribute((packed)) *gesn_event_header;
>
> + enum notification_class_request_type {
> + reserved1 = 1 << 0,
> + operational_change = 1 << 1,
> + power_management = 1 << 2,
> + external_request = 1 << 3,
> + media = 1 << 4,
> + multi_host = 1 << 5,
> + device_busy = 1 << 6,
> + reserved2 = 1 << 7,
> + };
> + enum event_notification_class_field {
> + enc_no_events = 0,
> + enc_operational_change,
> + enc_power_management,
> + enc_external_request,
> + enc_media,
> + enc_multiple_hosts,
> + enc_device_busy,
> + enc_reserved,
> + };
More lower-case enums :(
Otherwise the series looks good.
Jes
- [Qemu-devel] [PATCH v4 1/5] atapi: Allow GET_EVENT_STATUS_NOTIFICATION after media change, (continued)
- [Qemu-devel] [PATCH v4 1/5] atapi: Allow GET_EVENT_STATUS_NOTIFICATION after media change, Amit Shah, 2011/04/12
- [Qemu-devel] [PATCH v4 2/5] atapi: Move GET_EVENT_STATUS_NOTIFICATION command handling to its own function, Amit Shah, 2011/04/12
- [Qemu-devel] [PATCH v4 3/5] atapi: GESN: Use structs for commonly-used field types, Amit Shah, 2011/04/12
- [Qemu-devel] [PATCH v4 4/5] atapi: GESN: Standardise event response handling for future additions, Amit Shah, 2011/04/12
- [Qemu-devel] [PATCH v4 5/5] atapi: GESN: implement 'media' subcommand, Amit Shah, 2011/04/12
- Re: [Qemu-devel] [PATCH v4 5/5] atapi: GESN: implement 'media' subcommand,
Jes Sorensen <=