[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Wed Dec 5 10:22:10 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/f6f590e9da4d
changeset: 539:f6f590e9da4d
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Wed Dec 05 12:22:45 2012 +0200
description:
Fix page size for Winbond flashes

diffstat:

 head/sys/dev/flash/mx25l.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r d49f6df4160d -r f6f590e9da4d head/sys/dev/flash/mx25l.c

--- a/head/sys/dev/flash/mx25l.c	Tue Oct 16 13:36:10 2012 +0300
+++ b/head/sys/dev/flash/mx25l.c	Wed Dec 05 12:22:45 2012 +0200
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/flash/mx25l.c 229464 2012-01-04 04:17:03Z adrian $");
+__FBSDID("$FreeBSD: head/sys/dev/flash/mx25l.c 239794 2012-08-28 22:17:22Z adrian $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,7 +137,9 @@
 	{ "at25128",        0,      0,        64, 256,  64, FL_NONE },
 	{ "at25256",        0,      0,        64, 512,  64, FL_NONE },
 	{ "w25q64", 	 0xef, 0x4017, 64 * 1024, 128, 256, FL_ERASE_4K },
-	{ "w25q64bv",  0xef, 0x4017, 64 * 1024, 128, FL_ERASE_4K },
+	{ "w25q64bv",    0xef, 0x4017, 64 * 1024, 128, 256, FL_ERASE_4K },
+	{ "SST25VF032B", 0xbf, 0x254a, 64 * 1024,  64, 256, FL_ERASE_4K | FL_ERASE_32K },
+	{ "w25x32",      0xef, 0x3016, 64 * 1024,  64, 256, FL_ERASE_4K },
 };
 
 #define MX25L_IDENT_SIZE (sizeof(flash_devices)/sizeof(struct mx25l_flash_ident))
@@ -429,6 +431,8 @@
 	cmd.tx_data_sz = 0;
 
 	err = SPIBUS_TRANSFER(pdev, dev, &cmd);
+	if (!err)
+		hexdump(data, count, NULL, 0);
 
 	return (err);
 }
