summary refs log tree commit diff stats
path: root/include/hw/isa/isa.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-03-28 00:27:04 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-03-28 00:27:04 +0000
commit5acad5bf480321f178866dc28e38eeda5a3f19bb (patch)
treeac1e2a40a98c53796e1edc5544580f3a135c3fef /include/hw/isa/isa.h
parent127fe8643340c330cbc0a4194ea56e3d522dbb71 (diff)
parentcbf4c9ac9c000f7caf1bfee031041b62d2b000c8 (diff)
downloadfocaccia-qemu-5acad5bf480321f178866dc28e38eeda5a3f19bb.tar.gz
focaccia-qemu-5acad5bf480321f178866dc28e38eeda5a3f19bb.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
Pull request

# gpg: Signature made Fri 27 Mar 2020 20:14:10 GMT
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  cmd646-ide: use qdev gpio rather than qemu_allocate_irqs()
  via-ide: use qdev gpio rather than qemu_allocate_irqs()
  via-ide: don't use PCI level for legacy IRQs
  hw/ide/sii3112: Use qdev gpio rather than qemu_allocate_irqs()
  fdc/i8257: implement verify transfer mode

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/isa/isa.h')
-rw-r--r--include/hw/isa/isa.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index e9ac1f1205..59a4d4b50a 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -56,7 +56,6 @@ typedef int (*IsaDmaTransferHandler)(void *opaque, int nchan, int pos,
 typedef struct IsaDmaClass {
     InterfaceClass parent;
 
-    IsaDmaTransferMode (*get_transfer_mode)(IsaDma *obj, int nchan);
     bool (*has_autoinitialization)(IsaDma *obj, int nchan);
     int (*read_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len);
     int (*write_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len);