[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/17] ide: Convert CHECK POWER MDOE to ide_cmd_tabl
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/17] ide: Convert CHECK POWER MDOE to ide_cmd_table handler |
Date: |
Tue, 18 Jun 2013 10:26:04 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/ide/core.c | 17 ++++++++---------
1 file 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;
--
1.8.1.4
- [Qemu-devel] [PATCH 00/17] ide: Use ide_cmd_table function pointers for command execution, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 01/17] ide: Add handler to ide_cmd_table, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 03/17] ide: Convert WIN_IDENTIFY to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 02/17] ide: Convert WIN_DSM to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 05/17] ide: Convert verify commands to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 04/17] ide: Convert cmd_nop commands to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 06/17] ide: Convert read/write multiple commands to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 08/17] ide: Convert DMA read/write commands to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 07/17] ide: Convert PIO read/write commands to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 10/17] ide: Convert CHECK POWER MDOE to ide_cmd_table handler,
Kevin Wolf <=
- [Qemu-devel] [PATCH 09/17] ide: Convert READ NATIVE MAX ADDRESS to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 11/17] ide: Convert SET FEATURES to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 12/17] ide: Convert FLUSH CACHE to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 13/17] ide: Convert SEEK to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 14/17] ide: Convert ATAPI commands to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 15/17] ide: Convert CF-ATA commands to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 16/17] ide: Convert SMART commands to ide_cmd_table handler, Kevin Wolf, 2013/06/18
- [Qemu-devel] [PATCH 17/17] ide: Clean up ide_exec_cmd(), Kevin Wolf, 2013/06/18
- Re: [Qemu-devel] [PATCH 00/17] ide: Use ide_cmd_table function pointers for command execution, Stefan Hajnoczi, 2013/06/19