aboutsummaryrefslogtreecommitdiff
path: root/hw/sun4m.c
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-03-02 08:48:47 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-03-02 08:48:47 +0000
commit8b17de88e0dbe05a4ed2b6b7c9f402857a584930 (patch)
treecd5de4e95aba04f0c5efba3a68fb1ac559902ef6 /hw/sun4m.c
parente1ffb0f18f01dfedbff344bfeaf85ef9bd2084c4 (diff)
Let ESP SCSI adapter to be usable outside sun4m (Herv�oussineau)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4007 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sun4m.c')
-rw-r--r--hw/sun4m.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c
index e4717c485c..79130c13da 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -31,6 +31,7 @@
#include "net.h"
#include "boards.h"
#include "firmware_abi.h"
+#include "scsi.h"
//#define DEBUG_IRQ
@@ -505,8 +506,9 @@ static void sun4m_hw_init(const struct hwdef *hwdef, int RAM_size,
exit(1);
}
- main_esp = esp_init(hwdef->esp_base, espdma, *espdma_irq,
- esp_reset);
+ main_esp = esp_init(hwdef->esp_base,
+ espdma_memory_read, espdma_memory_write,
+ espdma, *espdma_irq, esp_reset);
for (i = 0; i < ESP_MAX_DEVS; i++) {
index = drive_get_index(IF_SCSI, 0, i);
@@ -653,8 +655,9 @@ static void sun4c_hw_init(const struct hwdef *hwdef, int RAM_size,
exit(1);
}
- main_esp = esp_init(hwdef->esp_base, espdma, *espdma_irq,
- esp_reset);
+ main_esp = esp_init(hwdef->esp_base,
+ espdma_memory_read, espdma_memory_write,
+ espdma, *espdma_irq, esp_reset);
for (i = 0; i < ESP_MAX_DEVS; i++) {
index = drive_get_index(IF_SCSI, 0, i);
@@ -1158,8 +1161,9 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, int RAM_size,
exit(1);
}
- main_esp = esp_init(hwdef->esp_base, espdma, *espdma_irq,
- esp_reset);
+ main_esp = esp_init(hwdef->esp_base,
+ espdma_memory_read, espdma_memory_write,
+ espdma, *espdma_irq, esp_reset);
for (i = 0; i < ESP_MAX_DEVS; i++) {
index = drive_get_index(IF_SCSI, 0, i);