OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

libqos/ahci: ATAPI identify 

We need to say "hello!" to our ATAPI friends
in a slightly different manner.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1452282920-21550-4-git-send-email-jsnow@redhat.com
This commit is contained in:
John Snow 2016-01-11 14:10:42 -05:00
parent 54d268b26a
commit d0b282a58c
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/ahci-test.c
View File

@ -215,6 +215,7 @@ static AHCIQState *ahci_boot_and_enable(const char *cli, ...)
va_list ap;
uint16_t buff[256];
uint8_t port;
uint8_t hello;
if (cli) {
va_start(ap, cli);
@ -229,7 +230,12 @@ static AHCIQState *ahci_boot_and_enable(const char *cli, ...)
/* Initialize test device */
port = ahci_port_select(ahci);
ahci_port_clear(ahci, port);
ahci_io(ahci, port, CMD_IDENTIFY, &buff, sizeof(buff), 0);
if (is_atapi(ahci, port)) {
hello = CMD_PACKET_ID;
} else {
hello = CMD_IDENTIFY;
}
ahci_io(ahci, port, hello, &buff, sizeof(buff), 0);
return ahci;
}

5
tests/libqos/ahci.c
View File

@ -114,6 +114,11 @@ void ahci_free(AHCIQState *ahci, uint64_t addr)
qfree(ahci->parent, addr);
}
bool is_atapi(AHCIQState *ahci, uint8_t port)
{
return ahci_px_rreg(ahci, port, AHCI_PX_SIG) == AHCI_SIGNATURE_CDROM;
}
/**
* Locate, verify, and return a handle to the AHCI device.
*/

1
tests/libqos/ahci.h
View File

@ -596,5 +596,6 @@ void ahci_command_adjust(AHCICommand *cmd, uint64_t lba_sect, uint64_t gbuffer,
/* Command Misc */
uint8_t ahci_command_slot(AHCICommand *cmd);
bool is_atapi(AHCIQState *ahci, uint8_t port);
#endif