Merge branch 'master' into iso-9660

[lunaix-os.git] / lunaix-os / hal / pci.c

diff --git a/lunaix-os/hal/pci.c b/lunaix-os/hal/pci.c
index 893a0bbd00920a833a997e74b319a752f19635f2..04c75752180358108afb4e34f4d8261756df480c 100644 (file)
--- a/lunaix-os/hal/pci.c
+++ b/lunaix-os/hal/pci.c
@@ -73,7 +73,7 @@ pci_probe()
 {
     // 暴力扫描所有PCI设备
     // XXX: 尽管最多会有256条PCI总线，但就目前而言，只考虑bus #0就足够了
 {
     // 暴力扫描所有PCI设备
     // XXX: 尽管最多会有256条PCI总线，但就目前而言，只考虑bus #0就足够了

-    for (int bus = 0; bus < 1; bus++) {
+    for (int bus = 0; bus < 256; bus++) {

         for (int dev = 0; dev < 32; dev++) {
             pci_probe_device(bus, dev, 0);
         }
         for (int dev = 0; dev < 32; dev++) {
             pci_probe_device(bus, dev, 0);
         }


@@ -167,12 +167,12 @@ __pci_bar_read(struct twimap* map)
     }
 
     twimap_printf(
     }
 
     twimap_printf(

-      map, "[%d] base=%p, size=%p, ", bar_index, bar->start, bar->size);
+      map, "[%d] base=%.8p, size=%.8p, ", bar_index, bar->start, bar->size);

 
     if ((bar->type & BAR_TYPE_MMIO)) {
         twimap_printf(map, "mmio");
         if ((bar->type & BAR_TYPE_CACHABLE)) {
 
     if ((bar->type & BAR_TYPE_MMIO)) {
         twimap_printf(map, "mmio");
         if ((bar->type & BAR_TYPE_CACHABLE)) {

-            twimap_printf(map, ", cachable");
+            twimap_printf(map, ", prefetchable");

         }
     } else {
         twimap_printf(map, "io");
         }
     } else {
         twimap_printf(map, "io");