Module Name: src
Committed By: htodd
Date: Tue Oct 22 01:01:27 UTC 2013
Modified Files:
src/sys/dev/nand: nand_bbt.c
Log Message:
Fix build for missing chip.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/nand/nand_bbt.c
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/nand/nand_bbt.c
diff -u src/sys/dev/nand/nand_bbt.c:1.6 src/sys/dev/nand/nand_bbt.c:1.7
--- src/sys/dev/nand/nand_bbt.c:1.6 Mon Oct 21 17:47:28 2013
+++ src/sys/dev/nand/nand_bbt.c Tue Oct 22 01:01:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nand_bbt.c,v 1.6 2013/10/21 17:47:28 mbalmer Exp $ */
+/* $NetBSD: nand_bbt.c,v 1.7 2013/10/22 01:01:27 htodd Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nand_bbt.c,v 1.6 2013/10/21 17:47:28 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand_bbt.c,v 1.7 2013/10/22 01:01:27 htodd Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -201,9 +201,11 @@ void
nand_bbt_block_mark(device_t self, flash_off_t block, uint8_t marker)
{
struct nand_softc *sc = device_private(self);
+ struct nand_chip *chip = &sc->sc_chip;
struct nand_bbt *bbt = &sc->sc_bbt;
uint8_t clean;
+ __USE(chip);
KASSERT(block < chip->nc_size / chip->nc_block_size);
clean = (~0x03 << ((block % 4) * 2));
@@ -218,10 +220,12 @@ bool
nand_bbt_block_isbad(device_t self, flash_off_t block)
{
struct nand_softc *sc = device_private(self);
+ struct nand_chip *chip = &sc->sc_chip;
struct nand_bbt *bbt = &sc->sc_bbt;
uint8_t byte, marker;
bool result;
+ __USE(chip);
KASSERT(block < chip->nc_size / chip->nc_block_size);
/* get byte containing the 2 bit marker for this block */
