[src/trunk]: src/sys/dev/nand Hook nand_samsung.c into the build, and use it ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/26c50d454171
branches:  trunk
changeset: 782377:26c50d454171
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Oct 31 18:58:08 2012 +0000

description:
Hook nand_samsung.c into the build, and use it if a legacy chip
from Samsung is found.

diffstat:

 sys/dev/nand/files.nand |  3 ++-
 sys/dev/nand/nand.c     |  6 ++++--
 sys/dev/nand/nand.h     |  3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 87878913110e -r 26c50d454171 sys/dev/nand/files.nand
--- a/sys/dev/nand/files.nand   Wed Oct 31 13:48:12 2012 +0000
+++ b/sys/dev/nand/files.nand   Wed Oct 31 18:58:08 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.nand,v 1.4 2011/06/28 18:14:11 ahoka Exp $
+# $NetBSD: files.nand,v 1.5 2012/10/31 18:58:08 riz Exp $
 
 define nandbus { }
 
@@ -9,6 +9,7 @@
 file   dev/nand/nand_bbt.c     nand
 file   dev/nand/nand_crc.c     nand
 file   dev/nand/nand_micron.c  nand
+file   dev/nand/nand_samsung.c nand
 
 defpseudodev   nandemulator: nandbus
 file   dev/nand/nandemulator.c nandemulator
diff -r 87878913110e -r 26c50d454171 sys/dev/nand/nand.c
--- a/sys/dev/nand/nand.c       Wed Oct 31 13:48:12 2012 +0000
+++ b/sys/dev/nand/nand.c       Wed Oct 31 18:58:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nand.c,v 1.17 2012/07/12 03:05:01 matt Exp $   */
+/*     $NetBSD: nand.c,v 1.18 2012/10/31 18:58:08 riz Exp $    */
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -34,7 +34,7 @@
 /* Common driver for NAND chips implementing the ONFI 2.2 specification */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.17 2012/07/12 03:05:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.18 2012/10/31 18:58:08 riz Exp $");
 
 #include "locators.h"
 
@@ -332,6 +332,8 @@
        switch (chip->nc_manf_id) {
        case NAND_MFR_MICRON:
                return nand_read_parameters_micron(self, chip);
+       case NAND_MFR_SAMSUNG:
+               return nand_read_parameters_samsung(self, chip);
        default:
                return 1;
        }
diff -r 87878913110e -r 26c50d454171 sys/dev/nand/nand.h
--- a/sys/dev/nand/nand.h       Wed Oct 31 13:48:12 2012 +0000
+++ b/sys/dev/nand/nand.h       Wed Oct 31 18:58:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nand.h,v 1.13 2011/07/15 19:19:57 cliff Exp $  */
+/*     $NetBSD: nand.h,v 1.14 2012/10/31 18:58:08 riz Exp $    */
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -428,6 +428,7 @@
  * Manufacturer specific parameter functions
  */
 int nand_read_parameters_micron(device_t, struct nand_chip *);
+int nand_read_parameters_samsung(device_t, struct nand_chip *);
 
 /* debug inlines */