Re-enable rumphyper_pci and PCI passthrough libs.

Fixed by adding relevant symbols to minios global namespace. Compile
tested only.

Signed-off-by: Martin Lucina <martin@lucina.net>

diff --git a/Makefile b/Makefile
index 4b7e8df18b79125ac2c02959ee59cbc2d43f53fc..3c9bcbdd07745ddf12cf7a4f7b46211791417061 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,7 @@ ifeq ($(TARGET_ARCH),x86_64)
 CFLAGS += -m64 -mno-red-zone -fno-reorder-blocks -fno-asynchronous-unwind-tables
 endif
 
-# TODO: This was never actually enabled in previous builds(?) and needs more
-# symbols from Mini-OS.
-# RUMP_LIBS_PCI = -lrumpdev_pci -lrumpdev_pci_if_wm -lrumpdev_miiphy
+RUMP_LIBS_PCI = -lrumpdev_pci -lrumpdev_pci_if_wm -lrumpdev_miiphy
 RUMP_LIBS_FS = -lrumpfs_ffs -lrumpfs_cd9660 -lrumpdev_disk -lrumpdev -lrumpvfs
 RUMP_LIBS_NET = -lrumpnet_config -lrumpdev_bpf -lrumpnet_xenif -lrumpnet_netinet
 RUMP_LIBS_NET+= -lrumpnet_net -lrumpxen_xendev -lrumpnet
@@ -45,8 +43,7 @@ rump-src-y += lib/_lwp.c
 
 rump-src-y += rumphyper_base.c
 rump-src-y += rumphyper_net.c
-# TODO: See above.
-# rump-src-y += rumphyper_pci.c
+rump-src-y += rumphyper_pci.c
 rump-src-y += rumphyper_synch.c
 rump-src-y += rumphyper_stubs.c
 

diff --git a/rumphyper_pci.c b/rumphyper_pci.c
index 85a52aadfee50007e05d7f774f76723f26efd85c..68377dc8d9907538e7f0c7eb77c30000a1264660 100644 (file)
--- a/rumphyper_pci.c
+++ b/rumphyper_pci.c
@@ -39,7 +39,7 @@ void *
 rumpcomp_pci_map(unsigned long addr, unsigned long len)
 {
 
-       return ioremap_nocache(addr, len);
+       return minios_ioremap_nocache(addr, len);
 }
 
 int
@@ -123,7 +123,7 @@ rumpcomp_pci_dmalloc(size_t size, size_t align,
        for (i = 0; size >> (i + PAGE_SHIFT); i++)
                continue;
 
-       va = alloc_contig_pages(i, 0); /* XXX: MD interface */
+       va = minios_alloc_contig_pages(i, 0); /* XXX: MD interface */
        *vap = (uintptr_t)va;
        *pap = virt_to_mach(va);