From 75f0db355c16d349f9e7278fe354dc1cc5e0ee43 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Thu, 21 Jul 2011 01:44:45 +0000
Subject: [PATCH] * Remove a few superfluous spaces * Style fixes as per Axel *
 Reintroduce removed OF_FAIL checks

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42460 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../boot/platform/openfirmware/start.cpp      | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/system/boot/platform/openfirmware/start.cpp b/src/system/boot/platform/openfirmware/start.cpp
index 1a4a14f4d8..e297900d5f 100644
--- a/src/system/boot/platform/openfirmware/start.cpp
+++ b/src/system/boot/platform/openfirmware/start.cpp
@@ -39,10 +39,10 @@ static uint32 sBootOptions;
 
 static void
 call_ctors(void)
-{ 
+{
 	void (**f)(void);
 
-	for (f = &__ctor_list; f < &__ctor_end; f++) {		
+	for (f = &__ctor_list; f < &__ctor_end; f++) {
 		(**f)();
 	}
 }
@@ -55,35 +55,40 @@ clear_bss(void)
 }
 
 
-static void 
+static void
 determine_machine(void)
 {
 	gMachine = MACHINE_UNKNOWN;
 
 	int root = of_finddevice("/");
 	char buffer[64];
+	int length;
 
 	// TODO : Probe other OpenFirmware platforms and set gMachine as needed
 
-	int length = of_getprop(root, "device_type", buffer, sizeof(buffer) - 1);
-	buffer[length] = '\0';
-
-	if (!strcasecmp("chrp", buffer))
-		gMachine = MACHINE_CHRP;
-	else //(bootrom) + QEMU
+	if ((length = of_getprop(root, "device_type", buffer, sizeof(buffer) - 1))
+		!= OF_FAILED) {
+		buffer[length] = '\0';
+		if (!strcasecmp("chrp", buffer))
+			gMachine = MACHINE_CHRP;
+		else if (!strcasecmp("bootrom", buffer))
+			gMachine = MACHINE_MAC;
+	} else
 		gMachine = MACHINE_MAC;
-		
-	length = of_getprop(root, "model", buffer, sizeof(buffer) - 1);
-	buffer[length] = '\0';
 
-	if (!strcasecmp("pegasos", buffer))
-		gMachine |= MACHINE_PEGASOS;
+	if ((length = of_getprop(root, "model", buffer, sizeof(buffer) - 1))
+		!= OF_FAILED) {
+		buffer[length] = '\0';
+		if (!strcasecmp("pegasos", buffer))
+			gMachine |= MACHINE_PEGASOS;
+	}
 
-	length = of_getprop(root, "name", buffer, sizeof(buffer) - 1);
-	buffer[length] = '\0';
-
-	if (!strcasecmp("openbiosteam,openbios", buffer))
-		gMachine |= MACHINE_QEMU;
+	if ((length = of_getprop(root, "name", buffer, sizeof(buffer) - 1))
+		!= OF_FAILED) {
+		buffer[length] = '\0';
+		if (!strcasecmp("openbiosteam,openbios", buffer))
+			gMachine |= MACHINE_QEMU;
+	}
 }
 
 
@@ -97,7 +102,7 @@ platform_start_kernel(void)
 	printf("kernel entry at %p\n", (void*)kernelEntry);
 	printf("kernel stack top: %p\n", (void*)stackTop);
 
-	/* TODO: ? 
+	/* TODO: ?
 	mmu_init_for_kernel();
 	smp_boot_other_cpus();
 	*/
@@ -159,9 +164,9 @@ start(void *openFirmwareEntry)
 	determine_machine();
 	console_init();
 
-	if (gMachine & MACHINE_QEMU)
+	if ((gMachine & MACHINE_QEMU) != 0)
 		dprintf("OpenBIOS (QEMU?) OpenFirmware machine detected\n");
-	else if (gMachine & MACHINE_PEGASOS)
+	else if ((gMachine & MACHINE_PEGASOS) != 0)
 		dprintf("Pegasos PowerPC machine detected\n");
 	else
 		dprintf("Apple PowerPC machine assumed\n");