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 Remove a KASSERT that is no longer val...
details: https://anonhg.NetBSD.org/src/rev/6bbb1aff8e77
branches: trunk
changeset: 784121:6bbb1aff8e77
user: matt <matt%NetBSD.org@localhost>
date: Sat Jan 19 00:35:24 2013 +0000
description:
Remove a KASSERT that is no longer valid (no restricted to only coherent
memory).
Fix c&p error for a !RCVMAGIC bus_dmamap_sync PREREAD.
diffstat:
sys/arch/arm/broadcom/bcm53xx_eth.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diffs (29 lines):
diff -r e93f3d4944a3 -r 6bbb1aff8e77 sys/arch/arm/broadcom/bcm53xx_eth.c
--- a/sys/arch/arm/broadcom/bcm53xx_eth.c Sat Jan 19 00:27:34 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_eth.c Sat Jan 19 00:35:24 2013 +0000
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.22 2013/01/10 22:07:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.23 2013/01/19 00:35:24 matt Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -896,7 +896,6 @@
bcmeth_mapcache_put(sc, sc->sc_rx_mapcache, map);
return NULL;
}
- KASSERT(((map->_dm_flags ^ sc->sc_dmat->_ranges[0].dr_flags) & _BUS_DMAMAP_COHERENT) == 0);
KASSERT(map->dm_mapsize == MCLBYTES);
#ifdef BCMETH_RCVMAGIC
*mtod(m, uint32_t *) = BCMETH_RCVMAGIC;
@@ -905,7 +904,7 @@
bus_dmamap_sync(sc->sc_dmat, map, sizeof(uint32_t),
map->dm_mapsize - sizeof(uint32_t), BUS_DMASYNC_PREREAD);
#else
- bus_dmamap_sync(sc->sc_dmat, map, 0, sizeof(uint32_t),
+ bus_dmamap_sync(sc->sc_dmat, map, 0, map->dm_mapsize,
BUS_DMASYNC_PREREAD);
#endif
Home |
Main Index |
Thread Index |
Old Index