Module Name: src
Committed By: cliff
Date: Tue Aug 2 20:44:10 UTC 2011
Modified Files:
src/sys/dev/nor: nor.c nor.h
Log Message:
add JEDEC Mfgr ID for Macronix
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nor/nor.c src/sys/dev/nor/nor.h
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/nor/nor.c
diff -u src/sys/dev/nor/nor.c:1.3 src/sys/dev/nor/nor.c:1.4
--- src/sys/dev/nor/nor.c:1.3 Wed Jul 20 03:42:55 2011
+++ src/sys/dev/nor/nor.c Tue Aug 2 20:44:09 2011
@@ -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" }
};
Index: src/sys/dev/nor/nor.h
diff -u src/sys/dev/nor/nor.h:1.3 src/sys/dev/nor/nor.h:1.4
--- src/sys/dev/nor/nor.h:1.3 Sun Jul 17 00:52:42 2011
+++ src/sys/dev/nor/nor.h Tue Aug 2 20:44:09 2011
@@ -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 {
