Merge remote branch 'mst/for_anthony' into staging

[qemu.git] / hw / esp.c

diff --git a/hw/esp.c b/hw/esp.c
index d43d06c4fd0bab70ccaa97fa8ef132382f115748..0a8cf6e9fdc707cbee9b564ec2fdd10228ac68c3 100644 (file)
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -23,7 +23,7 @@
  */
 
 #include "sysbus.h"
-#include "scsi-disk.h"
+#include "scsi.h"
 #include "esp.h"
 
 /* debug ESP card */
@@ -77,8 +77,8 @@ struct ESPState {
     uint8_t *async_buf;
     uint32_t async_len;
 
-    espdma_memory_read_write dma_memory_read;
-    espdma_memory_read_write dma_memory_write;
+    ESPDMAMemoryReadWriteFunc dma_memory_read;
+    ESPDMAMemoryReadWriteFunc dma_memory_write;
     void *dma_opaque;
 };
 
@@ -154,6 +154,7 @@ static void esp_raise_irq(ESPState *s)
     if (!(s->rregs[ESP_RSTAT] & STAT_INT)) {
         s->rregs[ESP_RSTAT] |= STAT_INT;
         qemu_irq_raise(s->irq);
+        DPRINTF("Raise IRQ\n");
     }
 }
 
@@ -162,6 +163,7 @@ static void esp_lower_irq(ESPState *s)
     if (s->rregs[ESP_RSTAT] & STAT_INT) {
         s->rregs[ESP_RSTAT] &= ~STAT_INT;
         qemu_irq_lower(s->irq);
+        DPRINTF("Lower IRQ\n");
     }
 }
 
@@ -633,8 +635,8 @@ static const VMStateDescription vmstate_esp = {
 };
 
 void esp_init(target_phys_addr_t espaddr, int it_shift,
-              espdma_memory_read_write dma_memory_read,
-              espdma_memory_read_write dma_memory_write,
+              ESPDMAMemoryReadWriteFunc dma_memory_read,
+              ESPDMAMemoryReadWriteFunc dma_memory_write,
               void *dma_opaque, qemu_irq irq, qemu_irq *reset)
 {
     DeviceState *dev;