Module Name: src
Committed By: ahoka
Date: Fri Jul 1 16:46:13 UTC 2011
Modified Files:
src/sys/dev/nand: nand.c nand.h
Log Message:
Make this actually compile by adding a wrapper function which calls
flash_io_submit.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/nand/nand.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/nand/nand.h
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.c
diff -u src/sys/dev/nand/nand.c:1.13 src/sys/dev/nand/nand.c:1.14
--- src/sys/dev/nand/nand.c:1.13 Tue Jun 28 18:14:11 2011
+++ src/sys/dev/nand/nand.c Fri Jul 1 16:46:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nand.c,v 1.13 2011/06/28 18:14:11 ahoka Exp $ */
+/* $NetBSD: nand.c,v 1.14 2011/07/01 16:46:13 ahoka Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -34,7 +34,7 @@
/* Common driver for NAND chips implementing the ONFI 2.2 specification */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.13 2011/06/28 18:14:11 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.14 2011/07/01 16:46:13 ahoka Exp $");
#include "locators.h"
@@ -84,7 +84,7 @@
.block_isbad = nand_flash_isbad,
.block_markbad = nand_flash_markbad,
- .submit = nand_io_submit
+ .submit = nand_flash_submit
};
#ifdef NAND_VERBOSE
@@ -228,7 +228,7 @@
return error;
}
- nand_sync_thread_stop(self);
+ flash_sync_thread_destroy(&sc->sc_flash_io);
#ifdef NAND_BBT
nand_bbt_detach(self);
#endif
@@ -1036,6 +1036,14 @@
/* implementation of the block device API */
+int
+nand_flash_submit(device_t self, struct buf *bp)
+{
+ struct nand_softc *sc = device_private(self);
+
+ return flash_io_submit(&sc->sc_flash_io, bp);
+}
+
/*
* handle (page) unaligned write to nand
*/
Index: src/sys/dev/nand/nand.h
diff -u src/sys/dev/nand/nand.h:1.11 src/sys/dev/nand/nand.h:1.12
--- src/sys/dev/nand/nand.h:1.11 Tue Jun 28 18:14:11 2011
+++ src/sys/dev/nand/nand.h Fri Jul 1 16:46:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nand.h,v 1.11 2011/06/28 18:14:11 ahoka Exp $ */
+/* $NetBSD: nand.h,v 1.12 2011/07/01 16:46:13 ahoka Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -452,15 +452,11 @@
int nand_flash_write(device_t, flash_off_t, size_t, size_t *, const u_char *);
int nand_flash_read(device_t, flash_off_t, size_t, size_t *, uint8_t *);
int nand_flash_erase(device_t, struct flash_erase_instruction *);
+int nand_flash_submit(device_t, struct buf *);
/* nand specific functions */
int nand_erase_block(device_t, size_t);
-int nand_io_submit(device_t, struct buf *);
-void nand_sync_thread(void *);
-int nand_sync_thread_start(device_t);
-void nand_sync_thread_stop(device_t);
-
bool nand_isfactorybad(device_t, flash_off_t);
bool nand_iswornoutbad(device_t, flash_off_t);
bool nand_isbad(device_t, flash_off_t);
