Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/broadcom Make an ASSERT more "flexible".



details:   https://anonhg.NetBSD.org/src/rev/687cd568eb73
branches:  trunk
changeset: 782140:687cd568eb73
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Oct 18 02:34:34 2012 +0000

description:
Make an ASSERT more "flexible".

diffstat:

 sys/arch/arm/broadcom/bcm53xx_eth.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 0e1e318031e9 -r 687cd568eb73 sys/arch/arm/broadcom/bcm53xx_eth.c
--- a/sys/arch/arm/broadcom/bcm53xx_eth.c       Wed Oct 17 23:40:42 2012 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_eth.c       Thu Oct 18 02:34:34 2012 +0000
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.11 2012/10/17 20:18:55 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.12 2012/10/18 02:34:34 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -840,7 +840,7 @@
                bcmeth_mapcache_put(sc, sc->sc_rx_mapcache, map);
                return NULL;
        }
-       KASSERT(map->_dm_flags & _BUS_DMAMAP_COHERENT);
+       KASSERT(((map->_dm_flags ^ sc->sc_dmat->_ranges[0].dr_flags) & _BUS_DMAMAP_COHERENT) == 0);
        KASSERT(map->dm_mapsize == MCLBYTES);
        *mtod(m, uint32_t *) = BCMETH_RCVMAGIC;
        bus_dmamap_sync(sc->sc_dmat, map, 0, sizeof(uint32_t),



Home | Main Index | Thread Index | Old Index