scsi: move scsi.h -> esp.h

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/esp.c b/hw/esp.c
index 41b8eb8e7bfc922b205fabc603eedba70acc4b53..d43d06c4fd0bab70ccaa97fa8ef132382f115748 100644 (file)
--- 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 (file)
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 3966f2f986309a7e68cefaf05a0e01ed8f8aed43..379e1186fd93232c6c9d737968b0f5b08feca8d4 100644 (file)
--- 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 281713cca5947bb2923763e483c9203887c5cb4c..94ebd36c29bab4bdefc26a64ebfac0c82c5a3896 100644 (file)
--- 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 (file)
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 424cf6d476e597f3180698cd49885a77960932a8..5b3e0fdcf8c5815e8ec9fd86d4958bde8af2e0d2 100644 (file)
--- 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"