[src/trunk]: src/sys/dev/nand Make this actually compile by adding a wrapper ...

[ahoka <ahoka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ec7ca5e2218c
branches:  trunk
changeset: 766763:ec7ca5e2218c
user:      ahoka <ahoka%NetBSD.org@localhost>
date:      Fri Jul 01 16:46:13 2011 +0000

description:
Make this actually compile by adding a wrapper function which calls
flash_io_submit.

diffstat:

 sys/dev/nand/nand.c |  16 ++++++++++++----
 sys/dev/nand/nand.h |   8 ++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diffs (77 lines):

diff -r 427c0ddc98a8 -r ec7ca5e2218c sys/dev/nand/nand.c
--- a/sys/dev/nand/nand.c       Fri Jul 01 15:46:30 2011 +0000
+++ b/sys/dev/nand/nand.c       Fri Jul 01 16:46:13 2011 +0000
@@ -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
  */
diff -r 427c0ddc98a8 -r ec7ca5e2218c sys/dev/nand/nand.h
--- a/sys/dev/nand/nand.h       Fri Jul 01 15:46:30 2011 +0000
+++ b/sys/dev/nand/nand.h       Fri Jul 01 16:46:13 2011 +0000
@@ -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);