diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2013-06-18 10:26:04 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-06-24 10:25:16 +0200 |
| commit | 785f63208569a38a4bed5c12bfe2211f3b14d524 (patch) | |
| tree | 926fcf98a96bbfc03c98cb5a67d28a1e1308074b | |
| parent | 63a82e6a7b412f61a09d4a593685d8ca2856b093 (diff) | |
| download | qemu-785f63208569a38a4bed5c12bfe2211f3b14d524.zip qemu-785f63208569a38a4bed5c12bfe2211f3b14d524.tar.gz qemu-785f63208569a38a4bed5c12bfe2211f3b14d524.tar.bz2 | |
ide: Convert CHECK POWER MDOE to ide_cmd_table handler
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/ide/core.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 3064e2e..a7f8445 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1200,6 +1200,12 @@ static bool cmd_read_native_max(IDEState *s, uint8_t cmd) return true; } +static bool cmd_check_power_mode(IDEState *s, uint8_t cmd) +{ + s->nsector = 0xff; /* device active or idle */ + return true; +} + #define HD_OK (1u << IDE_HD) #define CD_OK (1u << IDE_CD) #define CFA_OK (1u << IDE_CFATA) @@ -1244,7 +1250,7 @@ static const struct { [WIN_IDLEIMMEDIATE2] = { cmd_nop, ALL_OK }, [WIN_STANDBY2] = { cmd_nop, ALL_OK }, [WIN_SETIDLE2] = { cmd_nop, ALL_OK }, - [WIN_CHECKPOWERMODE2] = { NULL, ALL_OK }, + [WIN_CHECKPOWERMODE2] = { cmd_check_power_mode, ALL_OK | SET_DSC }, [WIN_SLEEPNOW2] = { cmd_nop, ALL_OK }, [WIN_PACKETCMD] = { NULL, CD_OK }, [WIN_PIDENTIFY] = { NULL, CD_OK }, @@ -1263,7 +1269,7 @@ static const struct { [WIN_IDLEIMMEDIATE] = { cmd_nop, ALL_OK }, [WIN_STANDBY] = { cmd_nop, ALL_OK }, [WIN_SETIDLE1] = { cmd_nop, ALL_OK }, - [WIN_CHECKPOWERMODE1] = { NULL, ALL_OK }, + [WIN_CHECKPOWERMODE1] = { cmd_check_power_mode, ALL_OK | SET_DSC }, [WIN_SLEEPNOW1] = { cmd_nop, ALL_OK }, [WIN_FLUSH_CACHE] = { NULL, ALL_OK }, [WIN_FLUSH_CACHE_EXT] = { NULL, HD_CFA_OK }, @@ -1324,13 +1330,6 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) } switch(val) { - case WIN_CHECKPOWERMODE1: - case WIN_CHECKPOWERMODE2: - s->error = 0; - s->nsector = 0xff; /* device active or idle */ - s->status = READY_STAT | SEEK_STAT; - ide_set_irq(s->bus); - break; case WIN_SETFEATURES: if (!s->bs) goto abort_cmd; |