svn commit: r194952 - projects/clangbsd/sys/dev/cas
Ed Schouten
ed at FreeBSD.org
Thu Jun 25 12:21:50 UTC 2009
Author: ed
Date: Thu Jun 25 12:21:49 2009
New Revision: 194952
URL: http://svn.freebsd.org/changeset/base/194952
Log:
Make the cas(4) driver build with Clang.
We shouldn't use the preprocessor while inside function-like macro
invocations. I'll discuss it with Marius one of these days.
Modified:
projects/clangbsd/sys/dev/cas/if_cas.c
Modified: projects/clangbsd/sys/dev/cas/if_cas.c
==============================================================================
--- projects/clangbsd/sys/dev/cas/if_cas.c Thu Jun 25 11:52:33 2009 (r194951)
+++ projects/clangbsd/sys/dev/cas/if_cas.c Thu Jun 25 12:21:49 2009 (r194952)
@@ -1674,14 +1674,17 @@ cas_rint(struct cas_softc *sc)
refcount_acquire(&rxds->rxds_refcount);
bus_dmamap_sync(sc->sc_rdmatag,
rxds->rxds_dmamap, BUS_DMASYNC_POSTREAD);
+#if __FreeBSD_version < 800016
MEXTADD(m, (caddr_t)rxds->rxds_buf +
off * 256 + ETHER_ALIGN, len, cas_free,
-#if __FreeBSD_version < 800016
rxds,
+ M_RDONLY, EXT_NET_DRV);
#else
+ MEXTADD(m, (caddr_t)rxds->rxds_buf +
+ off * 256 + ETHER_ALIGN, len, cas_free,
sc, (void *)(uintptr_t)idx,
-#endif
M_RDONLY, EXT_NET_DRV);
+#endif
if ((m->m_flags & M_EXT) == 0) {
m_freem(m);
m = NULL;
@@ -1719,14 +1722,17 @@ cas_rint(struct cas_softc *sc)
m->m_len = min(CAS_PAGE_SIZE - off, len);
bus_dmamap_sync(sc->sc_rdmatag,
rxds->rxds_dmamap, BUS_DMASYNC_POSTREAD);
+#if __FreeBSD_version < 800016
MEXTADD(m, (caddr_t)rxds->rxds_buf + off,
m->m_len, cas_free,
-#if __FreeBSD_version < 800016
rxds,
+ M_RDONLY, EXT_NET_DRV);
#else
+ MEXTADD(m, (caddr_t)rxds->rxds_buf + off,
+ m->m_len, cas_free,
sc, (void *)(uintptr_t)idx,
-#endif
M_RDONLY, EXT_NET_DRV);
+#endif
if ((m->m_flags & M_EXT) == 0) {
m_freem(m);
m = NULL;
@@ -1753,14 +1759,17 @@ cas_rint(struct cas_softc *sc)
bus_dmamap_sync(sc->sc_rdmatag,
rxds2->rxds_dmamap,
BUS_DMASYNC_POSTREAD);
+#if __FreeBSD_version < 800016
MEXTADD(m2, (caddr_t)rxds2->rxds_buf,
m2->m_len, cas_free,
-#if __FreeBSD_version < 800016
rxds2,
+ M_RDONLY, EXT_NET_DRV);
#else
+ MEXTADD(m2, (caddr_t)rxds2->rxds_buf,
+ m2->m_len, cas_free,
sc, (void *)(uintptr_t)idx2,
-#endif
M_RDONLY, EXT_NET_DRV);
+#endif
if ((m2->m_flags & M_EXT) == 0) {
m_freem(m2);
m2 = NULL;
More information about the svn-src-projects
mailing list