CVS commit: src/sys/dev/nand

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Tue Oct 30 22:43:36 UTC 2012

Modified Files:
        src/sys/dev/nand: nand_samsung.c

Log Message:
Make this compile.  (Still untested)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nand/nand_samsung.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/dev/nand/nand_samsung.c
diff -u src/sys/dev/nand/nand_samsung.c:1.1 src/sys/dev/nand/nand_samsung.c:1.2
--- src/sys/dev/nand/nand_samsung.c:1.1	Tue Oct 30 22:03:00 2012
+++ src/sys/dev/nand/nand_samsung.c	Tue Oct 30 22:43:36 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: nand_samsung.c,v 1.1 2012/10/30 22:03:00 ahoka Exp $	*/
+/*	$NetBSD: nand_samsung.c,v 1.2 2012/10/30 22:43:36 riz Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nand_samsung.c,v 1.1 2012/10/30 22:03:00 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand_samsung.c,v 1.2 2012/10/30 22:43:36 riz Exp $");
 
 #include "nand.h"
 #include "onfi.h"
@@ -47,9 +47,9 @@ nand_read_parameters_samsung(device_t se
 {
 	uint8_t mfgrid;
 	uint8_t devid;
-	uint8_t dontcare1;
-	uint8_t dontcare2;
+	uint8_t params1;
 	uint8_t params2;
+	uint8_t params3;
 
 	/* Only for Samsung devices, obviously */
 	if (chip->nc_manf_id != NAND_MFR_SAMSUNG) {
@@ -94,13 +94,13 @@ nand_read_parameters_samsung(device_t se
 		case 0x0:
 			chip->nc_block_size = 64 * 1024;
 			break;
-		case 0x0:
+		case 0x1:
 			chip->nc_block_size = 128 * 1024;
 			break;
-		case 0x0:
+		case 0x2:
 			chip->nc_block_size = 256 * 1024;
 			break;
-		case 0x0:
+		case 0x3:
 			chip->nc_block_size = 512 * 1024;
 			break;
 		}