@@ -24,7 +24,7 @@
#include "sysbus.h"
#include "scsi-disk.h"
-#include "scsi.h"
+#include "esp.h"
/* debug ESP card */
//#define DEBUG_ESP
new file mode 100644
@@ -0,0 +1,7 @@
+/* esp.c */
+#define ESP_MAX_DEVS 7
+typedef void (*espdma_memory_read_write)(void *opaque, uint8_t *buf, int len);
+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,
+ void *dma_opaque, qemu_irq irq, qemu_irq *reset);
@@ -14,7 +14,6 @@
#include "hw.h"
#include "pci.h"
-#include "scsi.h"
#include "scsi-disk.h"
#include "block_int.h"
@@ -31,7 +31,7 @@
#include "audio/audio.h"
#include "boards.h"
#include "net.h"
-#include "scsi.h"
+#include "esp.h"
#include "mips-bios.h"
#include "loader.h"
deleted file mode 100644
@@ -1,7 +0,0 @@
-/* esp.c */
-#define ESP_MAX_DEVS 7
-typedef void (*espdma_memory_read_write)(void *opaque, uint8_t *buf, int len);
-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,
- void *dma_opaque, qemu_irq irq, qemu_irq *reset);
@@ -31,7 +31,7 @@
#include "net.h"
#include "boards.h"
#include "firmware_abi.h"
-#include "scsi.h"
+#include "esp.h"
#include "pc.h"
#include "isa.h"
#include "fw_cfg.h"
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/esp.c | 2 +- hw/esp.h | 7 +++++++ hw/lsi53c895a.c | 1 - hw/mips_jazz.c | 2 +- hw/scsi.h | 7 ------- hw/sun4m.c | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 hw/esp.h delete mode 100644 hw/scsi.h