[Qemu-devel] [PATCH 1/2] scsi: move scsi.h -> esp.h

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <address@hidden>
---
 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

diff --git a/hw/esp.c b/hw/esp.c
index 0e8d8ae..112e0fe 100644
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -24,7 +24,7 @@
 
 #include "sysbus.h"
 #include "scsi-disk.h"
-#include "scsi.h"
+#include "esp.h"
 
 /* debug ESP card */
 //#define DEBUG_ESP
diff --git a/hw/esp.h b/hw/esp.h
new file mode 100644
index 0000000..369998f
--- /dev/null
+++ b/hw/esp.h
@@ -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);
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 3966f2f..379e118 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -14,7 +14,6 @@
 
 #include "hw.h"
 #include "pci.h"
-#include "scsi.h"
 #include "scsi-disk.h"
 #include "block_int.h"
 
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 281713c..94ebd36 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -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"
 
diff --git a/hw/scsi.h b/hw/scsi.h
deleted file mode 100644
index 369998f..0000000
--- a/hw/scsi.h
+++ /dev/null
@@ -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);
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 424cf6d..5b3e0fd 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -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"
-- 
1.6.2.5