diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-18 16:57:59 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-18 16:57:59 +0100 |
| commit | a53efe9c47c9a441b307c5cec64d08d9647ab6a4 (patch) | |
| tree | c69c3b028a2854fbe4186f1af1556428791111a0 /hw/ide/internal.h | |
| parent | ffa4822c015d5670ef6a2239f3cbd2ff2cec57de (diff) | |
| parent | e47f9eb148fc3b9a67d318951ebceb834205f94c (diff) | |
| download | focaccia-qemu-a53efe9c47c9a441b307c5cec64d08d9647ab6a4.tar.gz focaccia-qemu-a53efe9c47c9a441b307c5cec64d08d9647ab6a4.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri 18 Sep 2015 15:59:02 BST using RSA key ID AAFC390E # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" * remotes/jnsnow/tags/ide-pull-request: ahci: clean up initial d2h semantics ahci: remove cmd_fis argument from write_fis_d2h ahci: fix signature generation ahci: remove dead reset code atapi: abort transfers with 0 byte limits ide: fix ATAPI command permissions ide-test: add cdrom dma test ide-test: add cdrom pio test qtest/ahci: export generate_pattern qtest/ahci: use generate_pattern everywhere ide: unify io_buffer_offset increments Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/internal.h')
| -rw-r--r-- | hw/ide/internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 30fdcbc5fa..05e93ffe3b 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -536,7 +536,9 @@ int64_t ide_get_sector(IDEState *s); void ide_set_sector(IDEState *s, int64_t sector_num); void ide_start_dma(IDEState *s, BlockCompletionFunc *cb); +void dma_buf_commit(IDEState *s, uint32_t tx_bytes); void ide_dma_error(IDEState *s); +void ide_abort_command(IDEState *s); void ide_atapi_cmd_ok(IDEState *s); void ide_atapi_cmd_error(IDEState *s, int sense_key, int asc); |