From owner-svn-src-all@FreeBSD.ORG  Mon May 27 06:24:32 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4A293752;
 Mon, 27 May 2013 06:24:32 +0000 (UTC)
 (envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3D0335DF;
 Mon, 27 May 2013 06:24:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4R6OWUt061035;
 Mon, 27 May 2013 06:24:32 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4R6OVmS061031;
 Mon, 27 May 2013 06:24:31 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201305270624.r4R6OVmS061031@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Mon, 27 May 2013 06:24:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251022 - head/sys/dev/nand
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 06:24:32 -0000

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@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");