[src/trunk]: src/sys/dev/ic undo previous commit of unrelated debugging.

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

details:   https://anonhg.NetBSD.org/src/rev/d7a1ae2dcb1b
branches:  trunk
changeset: 785852:d7a1ae2dcb1b
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Apr 03 14:40:41 2013 +0000

description:
undo previous commit of unrelated debugging.

diffstat:

 sys/dev/ic/aic79xx_inline.h |   4 ++--
 sys/dev/ic/aic79xx_osm.h    |  30 +++++-------------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diffs (70 lines):

diff -r ca74077f31f4 -r d7a1ae2dcb1b sys/dev/ic/aic79xx_inline.h
--- a/sys/dev/ic/aic79xx_inline.h       Wed Apr 03 14:20:18 2013 +0000
+++ b/sys/dev/ic/aic79xx_inline.h       Wed Apr 03 14:40:41 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic79xx_inline.h,v 1.20 2013/04/03 14:20:02 christos Exp $     */
+/*     $NetBSD: aic79xx_inline.h,v 1.21 2013/04/03 14:40:41 christos Exp $     */
 
 /*
  * Inline routines shareable across OS platforms.
@@ -854,7 +854,7 @@
        u_int retval;
 
        retval = 0;
-       ahd_dmamap_sync1(ahd, ahd->parent_dmat /*shared_data_dmat*/, ahd->shared_data_map.dmamap,
+       ahd_dmamap_sync(ahd, ahd->parent_dmat /*shared_data_dmat*/, ahd->shared_data_map.dmamap,
                        /*offset*/ahd->qoutfifonext, /*len*/2,
                        BUS_DMASYNC_POSTREAD);
        if ((ahd->qoutfifo[ahd->qoutfifonext]
diff -r ca74077f31f4 -r d7a1ae2dcb1b sys/dev/ic/aic79xx_osm.h
--- a/sys/dev/ic/aic79xx_osm.h  Wed Apr 03 14:20:18 2013 +0000
+++ b/sys/dev/ic/aic79xx_osm.h  Wed Apr 03 14:40:41 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic79xx_osm.h,v 1.22 2013/04/03 14:20:02 christos Exp $        */
+/*     $NetBSD: aic79xx_osm.h,v 1.23 2013/04/03 14:40:41 christos Exp $        */
 
 /*
  * NetBSD platform specific driver option settings, data structures,
@@ -32,9 +32,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $NetBSD: aic79xx_osm.h,v 1.22 2013/04/03 14:20:02 christos Exp $
+ * $NetBSD: aic79xx_osm.h,v 1.23 2013/04/03 14:40:41 christos Exp $
  *
- * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.22 2013/04/03 14:20:02 christos Exp $
+ * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.23 2013/04/03 14:40:41 christos Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.9 2003/05/26 21:43:29 gibbs Exp $
  */
@@ -129,28 +129,8 @@
        bus_dmamap_unload(tag, map)
 
 /* XXX Need to update Bus DMA for partial map syncs */
-#define ahd_dmamap_sync(ahd, dma_tag, dmamap, offset, len, op)                 \
-       do {                                                            \
-               if (((op) & (BUS_DMASYNC_PREWRITE|BUS_DMASYNC_POSTREAD)) != 0)\
-               if ((offset) >= (dmamap)->dm_mapsize) {                 \
-                       printf("%s, %d: %s: %x >= %x[%x]\n", __FILE__,  \
-                           __LINE__, __func__, (int)(offset),          \
-                           (int)(dmamap)->dm_mapsize, (int)(len));     \
-                       return;                                         \
-               }                                                       \
-               bus_dmamap_sync(dma_tag, dmamap, offset, len, op);      \
-       } while (/*CONSTCOND*/0)
-#define ahd_dmamap_sync1(ahd, dma_tag, dmamap, offset, len, op)                \
-       do {                                                            \
-               if (((op) & (BUS_DMASYNC_PREWRITE|BUS_DMASYNC_POSTREAD)) != 0)\
-               if ((offset) >= (dmamap)->dm_mapsize) {                 \
-                       printf("%s, %d: %s: %x >= %x[%x]\n", __FILE__,  \
-                           __LINE__, __func__, (int)(offset),          \
-                           (int)(dmamap)->dm_mapsize, (int)(len));     \
-                       return 0;                                       \
-               }                                                       \
-               bus_dmamap_sync(dma_tag, dmamap, offset, len, op);      \
-       } while (/*CONSTCOND*/0)
+#define ahd_dmamap_sync(ahd, dma_tag, dmamap, offset, len, op)         \
+       bus_dmamap_sync(dma_tag, dmamap, offset, len, op)
 
 /************************ Tunable Driver Parameters  **************************/
 /*