svn commit: r251022 - head/sys/dev/nand

[Grzegorz Bernacki]

Author: gber
Date: Mon May 27 06:24:31 2013
New Revision: 251022
URL: http://svnweb.freebsd.org/changeset/base/251022

Log:
  Fix ONFI chip detection.
  
  Submitted by:	Alexander Fedorov <alexander.fedorov at rtlservice.com>

Modified:
  head/sys/dev/nand/nand.h
  head/sys/dev/nand/nandbus.c

Modified: head/sys/dev/nand/nand.h
==============================================================================
--- head/sys/dev/nand/nand.h	Mon May 27 03:09:26 2013	(r251021)
+++ head/sys/dev/nand/nand.h	Mon May 27 06:24:31 2013	(r251022)
@@ -219,7 +219,7 @@ struct onfi_params {
 	uint16_t	vendor_rev;
 	uint8_t		vendor_spec[8];
 	uint16_t	crc;
-};
+}__attribute__((packed));
 
 struct nand_ecc_data {
 	int	eccsize;		/* Number of data bytes per ECC step */

Modified: head/sys/dev/nand/nandbus.c
==============================================================================
--- head/sys/dev/nand/nandbus.c	Mon May 27 03:09:26 2013	(r251021)
+++ head/sys/dev/nand/nandbus.c	Mon May 27 06:24:31 2013	(r251022)
@@ -331,7 +331,7 @@ static int
 nand_probe_onfi(device_t bus, uint8_t *onfi_compliant)
 {
 	device_t nfc;
-	char onfi_id[] = {'o', 'n', 'f', 'i', '\0'};
+	char onfi_id[] = {'O', 'N', 'F', 'I', '\0'};
 	int i;
 
 	nand_debug(NDBG_BUS,"probing ONFI");