r54 - in trunk/filo-0.5: i386 main

Author: stepan
Date: 2008-08-25 02:06:20 +0200 (Mon, 25 Aug 2008)
New Revision: 54

Modified:
   trunk/filo-0.5/i386/linux_load.c
   trunk/filo-0.5/main/elfload.c
Log:
oops. this got left out in a copy and paste error.

Modified: trunk/filo-0.5/i386/linux_load.c
===================================================================
--- trunk/filo-0.5/i386/linux_load.c	2008-08-19 11:12:03 UTC (rev 53)
+++ trunk/filo-0.5/i386/linux_load.c	2008-08-25 00:06:20 UTC (rev 54)
@@ -615,7 +615,7 @@
     params->orig_y = cursor_y;
 #endif
 #ifdef PCMCIA_CF
-    cf_bar = phys_to_virt(pci_read32(PCI_ADDR(0, 0xa, 1)));
+    cf_bar = phys_to_virt(pci_read32(PCI_ADDR(0, 0xa, 1), 0x10));
     for( i = 0x836 ; i < 0x840 ; i++){
         *(unsigned char *)(cf_bar+i) = 0;
     }

Modified: trunk/filo-0.5/main/elfload.c
===================================================================
--- trunk/filo-0.5/main/elfload.c	2008-08-19 11:12:03 UTC (rev 53)
+++ trunk/filo-0.5/main/elfload.c	2008-08-25 00:06:20 UTC (rev 54)
@@ -350,7 +350,7 @@
     boot_notes = build_boot_notes(info, cmdline);

#if PCMCIA_CF
-    cf_bar = phys_to_virt(pci_read32(PCI_ADDR(0, 0xa, 1)));
+    cf_bar = phys_to_virt(pci_read32(PCI_ADDR(0, 0xa, 1), 0x10));
     for( i = 0x836 ; i < 0x840 ; i++){
         *(unsigned char *)(cf_bar+i) = 0;
     }