[src/trunk]: src/sys/arch/usermode/dev No need for the bounce-buffer anymore ...

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

details:   https://anonhg.NetBSD.org/src/rev/7c46579e8957
branches:  trunk
changeset: 772015:7c46579e8957
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Tue Dec 13 15:50:17 2011 +0000

description:
No need for the bounce-buffer anymore since pmap bahaves like it ought to

diffstat:

 sys/arch/usermode/dev/ld_thunkbus.c |  26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)

diffs (62 lines):

diff -r 49b48eade9d2 -r 7c46579e8957 sys/arch/usermode/dev/ld_thunkbus.c
--- a/sys/arch/usermode/dev/ld_thunkbus.c       Tue Dec 13 15:43:55 2011 +0000
+++ b/sys/arch/usermode/dev/ld_thunkbus.c       Tue Dec 13 15:50:17 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_thunkbus.c,v 1.21 2011/12/13 13:32:15 jmcneill Exp $ */
+/* $NetBSD: ld_thunkbus.c,v 1.22 2011/12/13 15:50:17 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.21 2011/12/13 13:32:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.22 2011/12/13 15:50:17 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -65,8 +65,6 @@
        int             sc_fd;
        void            *sc_ih;
 
-       uint8_t         sc_bbuf[MAXBSIZE];
-
        struct ld_thunkbus_transfer sc_tt;
        bool            busy;
 };
@@ -152,7 +150,6 @@
        struct ld_thunkbus_transfer *tt = &sc->sc_tt;
        struct buf *bp = tt->tt_bp;
        off_t offset = bp->b_rawblkno * ld->sc_secsize;
-       void *bbuf = sc->sc_bbuf;
        size_t ret;
 
        if (!sc->busy)
@@ -170,24 +167,9 @@
 
        /* read/write the request */
        if (bp->b_flags & B_READ) {
-               if (bp->b_flags & B_PHYS) {
-                       /* read to bounce buffer and copy out */
-                       ret = thunk_pread(sc->sc_fd, bbuf, bp->b_bcount, offset);
-                       if (ret > 0)
-                               copyout(bbuf, bp->b_data, ret);
-               } else {
-                       /* just read it */
-                       ret = thunk_pread(sc->sc_fd, bp->b_data, bp->b_bcount, offset);
-               }
+               ret = thunk_pread(sc->sc_fd, bp->b_data, bp->b_bcount, offset);
        } else {
-               if (bp->b_flags & B_PHYS) {
-                       /* copy in to bounce buffer and write it */
-                       copyin(bp->b_data, bbuf, bp->b_bcount);
-                       ret = thunk_pwrite(sc->sc_fd, bbuf, bp->b_bcount, offset);
-               } else {
-                       /* just write it */
-                       ret = thunk_pwrite(sc->sc_fd, bp->b_data, bp->b_bcount, offset);
-               }
+               ret = thunk_pwrite(sc->sc_fd, bp->b_data, bp->b_bcount, offset);
        }
 
        //if (ret == -1)