summaryrefslogtreecommitdiffstats
path: root/hw/ppc_chrp.c
diff options
context:
space:
mode:
authoraurel322009-01-30 21:39:32 +0100
committeraurel322009-01-30 21:39:32 +0100
commit28ce5ce63bf95d637d23460f8455d19064d6e378 (patch)
tree02f3960351777e679a564499c9f0da536c5ea4d3 /hw/ppc_chrp.c
parentpl031: remove unused variable (diff)
downloadqemu-28ce5ce63bf95d637d23460f8455d19064d6e378.tar.gz
qemu-28ce5ce63bf95d637d23460f8455d19064d6e378.tar.xz
qemu-28ce5ce63bf95d637d23460f8455d19064d6e378.zip
PowerPC: mac-io DB-DMA support
This patch adds powermac Descriptor-Based DMA. It is used by mac-io based IDE, ethernet, sounds and serial devices. Signed-off-by: Laurent Vivier <Laurent@lvivier.info> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6488 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_chrp.c')
-rw-r--r--hw/ppc_chrp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c
index 64a613ce34..e28819defd 100644
--- a/hw/ppc_chrp.c
+++ b/hw/ppc_chrp.c
@@ -25,6 +25,7 @@
#include "hw.h"
#include "ppc.h"
#include "ppc_mac.h"
+#include "mac_dbdma.h"
#include "nvram.h"
#include "pc.h"
#include "pci.h"
@@ -86,6 +87,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
int ppc_boot_device;
int index;
BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
+ void *dbdma;
linux_boot = (kernel_filename != NULL);
@@ -280,6 +282,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
else
hd[i] = NULL;
}
+ dbdma = DBDMA_init(&dbdma_mem_index);
#if 1
ide_mem_index[0] = pmac_ide_init(&hd[0], pic[0x13]);
ide_mem_index[1] = pmac_ide_init(&hd[2], pic[0x14]);
@@ -292,7 +295,6 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
adb_kbd_init(&adb_bus);
adb_mouse_init(&adb_bus);
- dbdma_init(&dbdma_mem_index);
macio_init(pci_bus, 0x0022, 0, pic_mem_index, dbdma_mem_index,
cuda_mem_index, NULL, 2, ide_mem_index, escc_mem_index);