[coreboot] [FILO] r117 - in trunk/filo: fs include

[repository service]

Author: stepan
Date: Fri Mar 26 13:03:48 2010
New Revision: 117
URL: http://tracker.coreboot.org/trac/filo/changeset/117

Log:
filo cbfs filesystem driver cosmetics
Signed-off-by: Stefan Reinauer

Modified:
   trunk/filo/fs/cbfs.c
   trunk/filo/include/cbfs.h

Modified: trunk/filo/fs/cbfs.c
==============================================================================
--- trunk/filo/fs/cbfs.c	Fri Mar 26 13:01:39 2010	(r116)
+++ trunk/filo/fs/cbfs.c	Fri Mar 26 13:03:48 2010	(r117)
@@ -85,7 +85,7 @@

if (header == NULL)
    	return NULL;
-	offset = phys_to_virt(0 - ntohl(header->romsize) + ntohl(header->offset));
+	offset = (unsigned long) phys_to_virt(0 - ntohl(header->romsize) + ntohl(header->offset));

int align= ntohl(header->align);

@@ -105,7 +105,7 @@
    	printk_spew("%p\n", (void *)offset);
    	if (virt_to_phys(offset) <= virt_to_phys(oldoffset)) return NULL;

-		if (offset < phys_to_virt(0xFFFFFFFF - ntohl(header->romsize)))
+		if (offset < (unsigned long)phys_to_virt(0xFFFFFFFF - ntohl(header->romsize)))
    		return NULL;
    }
 }

Modified: trunk/filo/include/cbfs.h
==============================================================================
--- trunk/filo/include/cbfs.h	Fri Mar 26 13:01:39 2010	(r116)
+++ trunk/filo/include/cbfs.h	Fri Mar 26 13:03:48 2010	(r117)
@@ -157,7 +157,6 @@
 #define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
 #define CBFS_SUBHEADER(_p) ( (void *) ((((u8 *) (_p)) + ntohl((_p)->offset))) )

-void * cbfs_load_payload(struct lb_memory *lb_mem, const char *name);
 void * cbfs_load_stage(const char *name);
 int cbfs_execute_stage(const char *name);
 void * cbfs_get_file(const char *name);