CVS: blob/utils/test load_kernel_test.c,1.4,1.5

[Christopher H. <ch...@us...>]

Update of /cvsroot/blob/blob/utils/test
In directory sc8-pr-cvs1:/tmp/cvs-serv3104

Modified Files:
	load_kernel_test.c 
Log Message:
Look for cramfs/jffs2 filesystems at RAMDISK_FLASH_BASE and for
zImage's at KERNEL_FLASH_BASE.  All loader flavors can co-exist
peacefully now; search order is as before.

This is an interim solution until the new partition code is fully
integrated.


Index: load_kernel_test.c
===================================================================
RCS file: /cvsroot/blob/blob/utils/test/load_kernel_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- load_kernel_test.c	27 Apr 2002 07:32:40 -0000	1.4
+++ load_kernel_test.c	9 Jan 2003 01:41:21 -0000	1.5
@@ -13,6 +13,7 @@
 	char *out;
 	FILE *fp;
 	struct stat st;
+	const struct kernel_loader *loader;
 	struct part_info part;
 	int i;
 	unsigned long size = 0;
@@ -45,15 +46,22 @@
 
 	printf("flash emulation region is 0x%x bytes\n", part.size);
 
-	for (i = 0; loader[i]; i++)
-		if (loader[i]->check_magic(&part))
+	for (i = 0; /**/ ; i++) {
+		loader = hash_defined_part_table[i].loader;
+
+		if (!loader) 
 			break;
-	if (!loader[i]) {
+
+		if (loader->check_magic(&part))
+			break;
+	}
+
+	if (!loader) {
 		printf("unable to find magic\n");
 	} else {
 		printf("loading kernel from ");
-		printf(loader[i]->name);
-		if ((size = loader[i]->load_kernel((u32 *) out, &part, argv[2])) == 0) {
+		printf(loader->name);
+		if ((size = loader->load_kernel((u32 *) out, &part, argv[2])) == 0) {
 			printf(" error loading kernel \"%s\"!\n", argv[2]);
 			return 0;
 		}