Thu Aug 25 19:08:35 2011 UTC ()

When this debug printf is enabled, please also tell WHAT address one is using
for read/write.


(reinoud)

diff -r1.5 -r1.6 src/sys/arch/usermode/dev/ld_thunkbus.c

--- src/sys/arch/usermode/dev/ld_thunkbus.c 2011/08/23 17:12:32	1.5
+++ src/sys/arch/usermode/dev/ld_thunkbus.c 2011/08/25 19:08:35	1.6

 @@ -1,14 +1,14 @@
-/* $NetBSD: ld_thunkbus.c,v 1.5 2011/08/23 17:12:32 jmcneill Exp $ */
+/* $NetBSD: ld_thunkbus.c,v 1.6 2011/08/25 19:08:35 reinoud Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR 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 FOUNDATION OR CONTRIBUTORS
  * 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: ld_thunkbus.c,v 1.5 2011/08/23 17:12:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.6 2011/08/25 19:08:35 reinoud Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/disk.h>
 #include <sys/kmem.h>
 #include <dev/ldvar.h>
 #include <machine/mainbus.h>
 #include <machine/thunk.h>
 @@ -154,53 +154,54 @@ ld_thunkbus_complete(void *arg)
 	struct ld_thunkbus_softc *sc = arg;
 	struct ld_thunkbus_transfer *tt = &sc->sc_tt;
 	struct buf *bp = tt->tt_bp;
 	if (thunk_aio_error(&tt->tt_aio) == 0 &&
 	    thunk_aio_return(&tt->tt_aio) != -1) {
 		bp->b_resid = 0;
 	} else {
 		bp->b_error = errno;
 		bp->b_resid = bp->b_bcount;
+	}
 	if (bp->b_error)
-		printf("errpr!\n");
+		printf("error!\n");
 	lddone(&sc->sc_ld, bp);
+}
 static int
 ld_thunkbus_ldstart(struct ld_softc *ld, struct buf *bp)
+{
 	struct ld_thunkbus_softc *sc = (struct ld_thunkbus_softc *)ld;
 	struct ld_thunkbus_transfer *tt = &sc->sc_tt;
 	int error;
 	tt->tt_sc = sc;
 	tt->tt_bp = bp;
 	memset(&tt->tt_aio, 0, sizeof(tt->tt_aio));
 	tt->tt_aio.aio_fildes = sc->sc_fd;
 	tt->tt_aio.aio_buf = bp->b_data;
 	tt->tt_aio.aio_nbytes = bp->b_bcount;
 	tt->tt_aio.aio_offset = bp->b_rawblkno * ld->sc_secsize;
 	tt->tt_aio.aio_sigevent.sigev_notify = SIGEV_SIGNAL;
 	tt->tt_aio.aio_sigevent.sigev_signo = SIGIO;
 	tt->tt_aio.aio_sigevent.sigev_value.sival_ptr = tt;
 #if 0
-	device_printf(sc->sc_ld.sc_dv, "%s off=%lld count=%lld\n",
+	device_printf(sc->sc_ld.sc_dv, "%s addr %p, off=%lld, count=%lld\n",
 	    (bp->b_flags & B_READ) ? "rd" : "wr",
 	    bp->b_data,
 	    (long long)bp->b_rawblkno,
 	    (long long)bp->b_bcount);
 #endif
 	if (bp->b_flags & B_READ)
 		error = thunk_aio_read(&tt->tt_aio);
 	else
 		error = thunk_aio_write(&tt->tt_aio);
 	return error == -1 ? errno : 0;
+}
 static int