Reverse merge from trunk in pci_BaS_gcc branch

2014-07-10 13:20:14 +00:00
parent 818cb2bcd7
commit b0617246e2
54 changed files with 1006 additions and 3653 deletions
--- a/if/driver_vec.c
+++ b/if/driver_vec.c
@@ -48,8 +48,8 @@ static struct xhdi_driver_interface xhdi_call_interface =
 static struct dma_driver_interface dma_interface =
 {
 	.version = 0x0101,
-	.magic = 0x444d4143, 						/* 'DMAC' */
-	.dma_set_initiator = dma_set_initiator,
+	.magic = 'DMAC',
+	.dma_set_initiator = &dma_set_initiator,
 	.dma_get_initiator = dma_get_initiator,
 	.dma_free_initiator = dma_free_initiator,
 	.dma_set_channel = dma_set_channel,