Module Name: src
Committed By: christos
Date: Wed Apr 3 14:40:41 UTC 2013
Modified Files:
src/sys/dev/ic: aic79xx_inline.h aic79xx_osm.h
Log Message:
undo previous commit of unrelated debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/aic79xx_inline.h
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ic/aic79xx_osm.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/ic/aic79xx_inline.h
diff -u src/sys/dev/ic/aic79xx_inline.h:1.20 src/sys/dev/ic/aic79xx_inline.h:1.21
--- src/sys/dev/ic/aic79xx_inline.h:1.20 Wed Apr 3 10:20:02 2013
+++ src/sys/dev/ic/aic79xx_inline.h Wed Apr 3 10:40:41 2013
@@ -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 @@ ahd_check_cmdcmpltqueues(struct ahd_soft
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]
Index: src/sys/dev/ic/aic79xx_osm.h
diff -u src/sys/dev/ic/aic79xx_osm.h:1.22 src/sys/dev/ic/aic79xx_osm.h:1.23
--- src/sys/dev/ic/aic79xx_osm.h:1.22 Wed Apr 3 10:20:02 2013
+++ src/sys/dev/ic/aic79xx_osm.h Wed Apr 3 10:40:41 2013
@@ -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 @@ typedef pcireg_t ahd_dev_softc_t;
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 **************************/
/*
