[src/trunk]: src/sys/dev/nor add JEDEC Mfgr ID for Macronix

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

details:   https://anonhg.NetBSD.org/src/rev/fc994d22ae59
branches:  trunk
changeset: 767901:fc994d22ae59
user:      cliff <cliff%NetBSD.org@localhost>
date:      Tue Aug 02 20:44:09 2011 +0000

description:
add JEDEC Mfgr ID for Macronix

diffstat:

 sys/dev/nor/nor.c |   5 +++--
 sys/dev/nor/nor.h |  23 ++++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diffs (63 lines):

diff -r a175ae21aa54 -r fc994d22ae59 sys/dev/nor/nor.c
--- a/sys/dev/nor/nor.c Tue Aug 02 20:42:42 2011 +0000
+++ b/sys/dev/nor/nor.c Tue Aug 02 20:44:09 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nor.c,v 1.3 2011/07/20 03:42:55 cliff Exp $    */
+/*     $NetBSD: nor.c,v 1.4 2011/08/02 20:44:09 cliff Exp $    */
 
 /*-
  * Copyright (c) 2011 Department of Software Engineering,
@@ -34,7 +34,7 @@
 /* Common driver for NOR chips implementing the ONFI CFI specification */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nor.c,v 1.3 2011/07/20 03:42:55 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nor.c,v 1.4 2011/08/02 20:44:09 cliff Exp $");
 
 #include "locators.h"
 #include "opt_nor.h"
@@ -107,6 +107,7 @@
        { NOR_MFR_NATIONAL,     "National" },
        { NOR_MFR_TOSHIBA,      "Toshiba" },
        { NOR_MFR_HYNIX,        "Hynix" },
+       { NOR_MFGR_MACRONIX,    "Macronix" },
        { NOR_MFR_SAMSUNG,      "Samsung" },
        { NOR_MFR_UNKNOWN,      "Unknown" }
 };
diff -r a175ae21aa54 -r fc994d22ae59 sys/dev/nor/nor.h
--- a/sys/dev/nor/nor.h Tue Aug 02 20:42:42 2011 +0000
+++ b/sys/dev/nor/nor.h Tue Aug 02 20:44:09 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nor.h,v 1.3 2011/07/17 00:52:42 dyoung Exp $   */
+/*     $NetBSD: nor.h,v 1.4 2011/08/02 20:44:09 cliff Exp $    */
 
 /*-
  * Copyright (c) 2011 Department of Software Engineering,
@@ -344,16 +344,17 @@
 
 /* Manufacturer IDs defined by JEDEC */
 enum {
-       NOR_MFR_UNKNOWN = 0x00,
-       NOR_MFR_AMD     = 0x01,
-       NOR_MFR_FUJITSU = 0x04,
-       NOR_MFR_RENESAS = 0x07,
-       NOR_MFR_STMICRO = 0x20,
-       NOR_MFR_MICRON  = 0x2c,
-       NOR_MFR_NATIONAL= 0x8f,
-       NOR_MFR_TOSHIBA = 0x98,
-       NOR_MFR_HYNIX   = 0xad,
-       NOR_MFR_SAMSUNG = 0xec
+       NOR_MFR_UNKNOWN         = 0x00,
+       NOR_MFR_AMD             = 0x01,
+       NOR_MFR_FUJITSU         = 0x04,
+       NOR_MFR_RENESAS         = 0x07,
+       NOR_MFR_STMICRO         = 0x20,
+       NOR_MFR_MICRON          = 0x2c,
+       NOR_MFR_NATIONAL        = 0x8f,
+       NOR_MFR_TOSHIBA         = 0x98,
+       NOR_MFR_HYNIX           = 0xad,
+       NOR_MFGR_MACRONIX       = 0xc2,
+       NOR_MFR_SAMSUNG         = 0xec
 };
 
 struct nor_manufacturer {