Module Name: src Committed By: skrll Date: Tue Feb 4 07:41:01 UTC 2020
Modified Files: src/sys/arch/newsmips/apbus: if_sn.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/newsmips/apbus/if_sn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/newsmips/apbus/if_sn.c diff -u src/sys/arch/newsmips/apbus/if_sn.c:1.47 src/sys/arch/newsmips/apbus/if_sn.c:1.48 --- src/sys/arch/newsmips/apbus/if_sn.c:1.47 Tue Feb 4 07:36:42 2020 +++ src/sys/arch/newsmips/apbus/if_sn.c Tue Feb 4 07:41:01 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_sn.c,v 1.47 2020/02/04 07:36:42 skrll Exp $ */ +/* $NetBSD: if_sn.c,v 1.48 2020/02/04 07:41:01 skrll Exp $ */ /* * National Semiconductor DP8393X SONIC Driver @@ -16,7 +16,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.47 2020/02/04 07:36:42 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.48 2020/02/04 07:41:01 skrll Exp $"); #include "opt_inet.h" @@ -365,7 +365,7 @@ snreset(struct sn_softc *sc) sninit(sc); } -static int +static int sninit(struct sn_softc *sc) { u_long s_rcr; @@ -443,7 +443,7 @@ sninit(struct sn_softc *sc) * Called on final close of device, or if sninit() fails * part way through. */ -static int +static int snstop(struct sn_softc *sc) { struct mtd *mtd; @@ -589,7 +589,7 @@ sonicput(struct sn_softc *sc, struct mbu /* * CAM support */ -static void +static void caminitialise(struct sn_softc *sc) { void *p_cda = sc->p_cda; @@ -606,7 +606,7 @@ caminitialise(struct sn_softc *sc) SWO(bitmode, p_cda, CDA_ENABLE, 0); } -static void +static void camentry(struct sn_softc *sc, int entry, const u_char *ea) { void *p_cda = sc->p_cda; @@ -616,11 +616,11 @@ camentry(struct sn_softc *sc, int entry, SWO(bitmode, p_cda, camoffset + CDA_CAMAP2, (ea[5] << 8) | ea[4]); SWO(bitmode, p_cda, camoffset + CDA_CAMAP1, (ea[3] << 8) | ea[2]); SWO(bitmode, p_cda, camoffset + CDA_CAMAP0, (ea[1] << 8) | ea[0]); - SWO(bitmode, p_cda, CDA_ENABLE, + SWO(bitmode, p_cda, CDA_ENABLE, (SRO(bitmode, p_cda, CDA_ENABLE) | (1 << entry))); } -static void +static void camprogram(struct sn_softc *sc) { struct ethercom *ec = &sc->sc_ethercom; @@ -696,7 +696,7 @@ camprogram(struct sn_softc *sc) } #ifdef SNDEBUG -static void +static void camdump(struct sn_softc *sc) { int i; @@ -721,7 +721,7 @@ camdump(struct sn_softc *sc) } #endif -static void +static void initialise_tda(struct sn_softc *sc) { struct mtd *mtd; @@ -868,7 +868,7 @@ snintr(void *arg) /* * Transmit interrupt routine */ -static void +static void sonictxint(struct sn_softc *sc) { struct mtd *mtd; @@ -943,7 +943,7 @@ sonictxint(struct sn_softc *sc) /* * Receive interrupt routine */ -static void +static void sonicrxint(struct sn_softc *sc) { void * rda; @@ -1032,7 +1032,7 @@ sonicrxint(struct sn_softc *sc) * sonic_read -- pull packet off interface and forward to * appropriate protocol handler */ -static inline int +static inline int sonic_read(struct sn_softc *sc, void *pkt, int len) { struct ifnet *ifp = &sc->sc_if; @@ -1102,10 +1102,10 @@ sonic_get(struct sn_softc *sc, void *pkt if (mp == &top) { char *newdata = (char *) - ALIGN((char *)m->m_data + + ALIGN((char *)m->m_data + sizeof(struct ether_header)) - sizeof(struct ether_header); - len -= newdata - m->m_data; + len -= newdata - m->m_data; m->m_data = newdata; }