The following changes since commit 87574621b18f86eab295a2c207e0b42c77b5dfa0:
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160203-1' into staging (2016-02-03 12:23:48 +0000) are available in the git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to ba0a71022ca704eadcad4bffa92678d7c723729d: dma: remove now useless DMA_* functions (2016-02-03 11:28:58 -0500) ---------------------------------------------------------------- ---------------------------------------------------------------- Hervé Poussineau (19): i82374: device only existed as ISA device, so simplify device i8257: pass ISA bus to DMA_init() function i8257: rename struct dma_cont to I8257State i8257: rename struct dma_regs to I8257Regs i8257: rename functions to start with i8257_ prefix i8257: make the DMA running method per controller i8257: add missing const i8257: QOM'ify i8257: move state definition to new independent header isa: add an ISA DMA interface, and store it within the ISA bus i8257: implement the IsaDma interface magnum: disable floppy DMA for now sparc: disable floppy DMA sparc64: disable floppy DMA fdc: use IsaDma interface instead of global DMA_* functions cs4231a: use IsaDma interface instead of global DMA_* functions gus: use IsaDma interface instead of global DMA_* functions sb16: use IsaDma interface instead of global DMA_* functions dma: remove now useless DMA_* functions John Snow (1): fdc: fix detection under Linux hw/audio/cs4231a.c | 23 ++- hw/audio/gus.c | 20 ++- hw/audio/sb16.c | 23 ++- hw/block/fdc.c | 81 +++++++--- hw/dma/i82374.c | 58 +++---- hw/dma/i8257.c | 395 ++++++++++++++++++++++++++---------------------- hw/i386/pc.c | 2 +- hw/isa/isa-bus.c | 21 +++ hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_jazz.c | 5 +- hw/mips/mips_malta.c | 2 +- hw/sparc/sun4m.c | 24 +-- hw/sparc64/sun4u.c | 39 ++--- include/hw/isa/i8257.h | 42 +++++ include/hw/isa/isa.h | 51 +++++-- include/qemu/typedefs.h | 1 + 16 files changed, 472 insertions(+), 317 deletions(-) create mode 100644 include/hw/isa/i8257.h -- 2.4.3
