devpccard, pci: fix pccard support and handle pci expansion roms

[plan9front.git] / sys / src / 9 / pc / pcipc.c

diff --git a/sys/src/9/pc/pcipc.c b/sys/src/9/pc/pcipc.c
index 3355e7b0ceaea56542efb2fb09c70c4b7098e84a..f5bb530bb614b77e2161a9e4863159c493a333ed 100644 (file)
--- a/sys/src/9/pc/pcipc.c
+++ b/sys/src/9/pc/pcipc.c
@@ -557,6 +557,10 @@ pcireserve(void)
                                upaalloc(pa, p->mem[i].size, 0);
                        }
                }
+               if(p->rom.size && (p->rom.bar & 1) != 0){
+                       pa = p->rom.bar & ~0x7FFULL;
+                       upaalloc(pa, p->rom.size, 0);
+               }
        }
 
        /*
@@ -688,7 +692,7 @@ pcicfginit(void)
        list = &pciroot;
        for(bno = 0; bno <= pcimaxbno; bno++) {
                int sbno = bno;
-               bno = pciscan(bno, list);
+               bno = pciscan(bno, list, nil);
 
                while(*list)
                        list = &(*list)->link;