 @@ -1,14 +1,14 @@
-/*	$NetBSD: nand.c,v 1.21 2012/11/03 12:12:48 ahoka Exp $	*/
+/*	$NetBSD: nand.c,v 1.22 2012/11/03 12:45:28 ahoka Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (c) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -24,27 +24,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /* Common driver for NAND chips implementing the ONFI 2.2 specification */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.21 2012/11/03 12:12:48 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.22 2012/11/03 12:45:28 ahoka Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/atomic.h>
 #include <dev/flash/flash.h>
 #include <dev/flash/flash_io.h>
 #include <dev/nand/nand.h>
 #include <dev/nand/onfi.h>
 @@ -540,53 +540,49 @@ nand_fill_chip_structure(device_t self,
 		return 1;
+	}
 	/* strip manufacturer and model string */
 	strlcpy(vendor, params.param_manufacturer, sizeof(vendor));
 	for (i = 11; i > 0 && vendor[i] == ' '; i--)
 		vendor[i] = 0;
 	strlcpy(model, params.param_model, sizeof(model));
 	for (i = 19; i > 0 && model[i] == ' '; i--)
 		model[i] = 0;
 	aprint_normal_dev(self, "vendor: %s, model: %s\n", vendor, model);
-	/* XXX TODO multiple LUNs */
+	chip->nc_page_size = le32toh(params.param_pagesize);
-	if (params.param_numluns != 1) {
+	chip->nc_block_size =
-		aprint_error_dev(self,
+	    le32toh(params.param_blocksize) * chip->nc_page_size;
-		    "more than one LUNs are not supported yet!\n");
+	chip->nc_spare_size = le16toh(params.param_sparesize);
 	chip->nc_lun_blocks = le32toh(params.param_lunsize);
 		return 1;
 	chip->nc_size = params.param_pagesize * params.param_blocksize *
 	    params.param_lunsize * params.param_numluns;
 	chip->nc_page_size = params.param_pagesize;
 	chip->nc_block_size = params.param_blocksize * params.param_pagesize;
 	chip->nc_spare_size = params.param_sparesize;
 	chip->nc_lun_blocks = params.param_lunsize;
 	chip->nc_num_luns = params.param_numluns;
 	chip->nc_size =
 	    chip->nc_block_size * chip->nc_lun_blocks * chip->nc_num_luns;
 	/* the lower 4 bits contain the row address cycles */
 	chip->nc_addr_cycles_row = params.param_addr_cycles & 0x07;
 	/* the upper 4 bits contain the column address cycles */
 	chip->nc_addr_cycles_column = (params.param_addr_cycles & ~0x07) >> 4;
-	if (params.param_features & ONFI_FEATURE_16BIT)
+	uint16_t features = le16toh(params.param_features);
 	if (features & ONFI_FEATURE_16BIT) {
 		chip->nc_flags |= NC_BUSWIDTH_16;
+	}
-	if (params.param_features & ONFI_FEATURE_EXTENDED_PARAM)
+	if (features & ONFI_FEATURE_EXTENDED_PARAM) {
 		chip->nc_flags |= NC_EXTENDED_PARAM;
+	}
 	return 0;
+}
 /* ARGSUSED */
 bool
 nand_shutdown(device_t self, int howto)
+{
 	return true;
+}
 static void
 nand_address_column(device_t self, size_t row, size_t column)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nandemulator.c,v 1.5 2011/06/28 10:32:45 ahoka Exp $	*/
+/*	$NetBSD: nandemulator.c,v 1.6 2012/11/03 12:45:28 ahoka Exp $	*/
 /*-
  * Copyright (c) 2011 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (c) 2011 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.5 2011/06/28 10:32:45 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.6 2012/11/03 12:45:28 ahoka Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include "nandemulator.h"
 #include <dev/nand/nand.h>
 #include <dev/nand/onfi.h>
 #include <dev/nand/nand_crc.h>
 @@ -225,40 +225,41 @@ nandemulator_attach(device_t parent, dev
 	sc->sc_backend = kmem_alloc(sc->sc_backend_size, KM_SLEEP);
 	memset(sc->sc_backend, 0xff, sc->sc_backend_size);
 	sc->sc_parameter_page =
 	    kmem_zalloc(sizeof(struct onfi_parameter_page) * 4, KM_SLEEP);
 	struct onfi_parameter_page *opp;
 	uint8_t sig[4] = { 'O', 'N', 'F', 'I' };
 	for (i = 0; i < 4; i++) {
 		opp = &sc->sc_parameter_page[i];
-		opp->param_signature = *(uint32_t *)sig;
+		opp->param_signature = htole32(*(uint32_t *)sig);
-		opp->param_pagesize = sc->sc_page_size;
+		opp->param_pagesize = htole32(sc->sc_page_size);
-		opp->param_blocksize = sc->sc_block_size;
+		opp->param_blocksize = htole32(sc->sc_block_size);
-		opp->param_sparesize = sc->sc_spare_size;
+		opp->param_sparesize = htole16(sc->sc_spare_size);
-		opp->param_lunsize = sc->sc_lun_size;
+		opp->param_lunsize = htole32(sc->sc_lun_size);
 		opp->param_numluns = 1;
 		opp->param_manufacturer_id = 0x00;
 		memcpy(opp->param_manufacturer,
 		    "NETBSD", strlen("NETBSD"));
 		memcpy(opp->param_model,
 		    "NANDEMULATOR", strlen("NANDEMULATOR"));
-		opp->param_features = ONFI_FEATURE_16BIT;
+		uint16_t features = ONFI_FEATURE_16BIT;
 		opp->param_features = htole16(features);
 		/* the lower 4 bits contain the row address cycles
 		 * the upper 4 bits contain the column address cycles
 		 */
 		opp->param_addr_cycles = sc->sc_row_cycles;
 		opp->param_addr_cycles |= (sc->sc_column_cycles << 4);
 		opp->param_integrity_crc = nand_crc16((uint8_t *)opp, 254);
+	}
 	sc->sc_ids[0] = 0x00;
 	sc->sc_ids[1] = 0x00;