Module Name:    src
Committed By:   riz
Date:           Tue Dec 21 22:20:12 UTC 2010

Modified Files:
        src/sys/arch/acorn32/stand/lib [netbsd-5]: riscospart.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1495):
        sys/arch/acorn32/stand/lib/riscospart.c: revision 1.3
Use partition_cyl_high and partition_cyl_low to find the "RiscBSD"
partition.
Makes nbfs somewhat work on my RiscPC.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.76.1 src/sys/arch/acorn32/stand/lib/riscospart.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn32/stand/lib/riscospart.c
diff -u src/sys/arch/acorn32/stand/lib/riscospart.c:1.2 src/sys/arch/acorn32/stand/lib/riscospart.c:1.2.76.1
--- src/sys/arch/acorn32/stand/lib/riscospart.c:1.2	Sun Jun 25 21:32:41 2006
+++ src/sys/arch/acorn32/stand/lib/riscospart.c	Tue Dec 21 22:20:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: riscospart.c,v 1.2 2006/06/25 21:32:41 christos Exp $	*/
+/*	$NetBSD: riscospart.c,v 1.2.76.1 2010/12/21 22:20:11 riz Exp $	*/
 
 /*-
  * Copyright (c) 2006 Ben Harris
@@ -160,7 +160,7 @@
 	bb = (struct filecore_bootblock *) buf;
 	if (bb->checksum == filecore_checksum((u_char *)bb)) {
 		if (bb->partition_type == PARTITION_FORMAT_RISCBSD)
-			labelsect = (daddr_t)bb->partition_cyl_low *
+			labelsect = ((bb->partition_cyl_high << 8) + bb->partition_cyl_low) *
 			    bb->heads * bb->secspertrack + LABELSECTOR;
 		else {
 			err = EUNLAB;

Reply via email to