Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/macppc/dev/if_mc.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/macppc/dev/if_mc.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.13.20.1
retrieving revision 1.14
diff -u -p -r1.13.20.1 -r1.14
--- src/sys/arch/macppc/dev/if_mc.c	2009/05/04 08:11:28	1.13.20.1
+++ src/sys/arch/macppc/dev/if_mc.c	2008/10/05 05:01:08	1.14
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mc.c,v 1.13.20.1 2009/05/04 08:11:28 yamt Exp $	*/
+/*	$NetBSD: if_mc.c,v 1.14 2008/10/05 05:01:08 macallan Exp $	*/
 
 /*-
  * Copyright (c) 1997 David Huang <khym@bga.com>
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.13.20.1 2009/05/04 08:11:28 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.14 2008/10/05 05:01:08 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -61,17 +61,17 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.
 
 #define MC_BUFSIZE 0x800
 
-hide int	mc_match(struct device *, struct cfdata *, void *);
-hide void	mc_attach(struct device *, struct device *, void *);
-hide void	mc_init(struct mc_softc *sc);
-hide void	mc_putpacket(struct mc_softc *sc, u_int len);
-hide int	mc_dmaintr(void *arg);
-hide void	mc_reset_rxdma(struct mc_softc *sc);
-hide void	mc_reset_txdma(struct mc_softc *sc);
-hide void	mc_select_utp(struct mc_softc *sc);
-hide void	mc_select_aui(struct mc_softc *sc);
-hide int	mc_mediachange(struct mc_softc *sc);
-hide void	mc_mediastatus(struct mc_softc *sc, struct ifmediareq *);
+hide int	mc_match __P((struct device *, struct cfdata *, void *));
+hide void	mc_attach __P((struct device *, struct device *, void *));
+hide void	mc_init __P((struct mc_softc *sc));
+hide void	mc_putpacket __P((struct mc_softc *sc, u_int len));
+hide int	mc_dmaintr __P((void *arg));
+hide void	mc_reset_rxdma __P((struct mc_softc *sc));
+hide void	mc_reset_txdma __P((struct mc_softc *sc));
+hide void	mc_select_utp __P((struct mc_softc *sc));
+hide void	mc_select_aui __P((struct mc_softc *sc));
+hide int	mc_mediachange __P((struct mc_softc *sc));
+hide void	mc_mediastatus __P((struct mc_softc *sc, struct ifmediareq *));
 
 int mc_supmedia[] = {
 	IFM_ETHER | IFM_10_T,
@@ -85,7 +85,10 @@ CFATTACH_DECL(mc, sizeof(struct mc_softc
     mc_match, mc_attach, NULL, NULL);
 
 hide int
-mc_match(struct device *parent, struct cfdata *cf, void *aux)
+mc_match(parent, cf, aux)
+	struct device *parent;
+	struct cfdata *cf;
+	void *aux;
 {
 	struct confargs *ca = aux;
 
@@ -104,7 +107,9 @@ mc_match(struct device *parent, struct c
 }
 
 hide void
-mc_attach(struct device *parent, struct device *self, void *aux)
+mc_attach(parent, self, aux)
+	struct device *parent, *self;
+	void *aux;
 {
 	struct confargs *ca = aux;
 	struct mc_softc *sc = (struct mc_softc *)self;
@@ -196,14 +201,17 @@ mc_attach(struct device *parent, struct 
 
 /* Bus-specific initialization */
 hide void
-mc_init(struct mc_softc *sc)
+mc_init(sc)
+	struct mc_softc *sc;
 {
 	mc_reset_rxdma(sc);
 	mc_reset_txdma(sc);
 }
 
 hide void
-mc_putpacket(struct mc_softc *sc, u_int len)
+mc_putpacket(sc, len)
+	struct mc_softc *sc;
+	u_int len;
 {
 	dbdma_command_t *cmd = sc->sc_txdmacmd;
 
@@ -217,7 +225,8 @@ mc_putpacket(struct mc_softc *sc, u_int 
  * Interrupt handler for the MACE DMA completion interrupts
  */
 int
-mc_dmaintr(void *arg)
+mc_dmaintr(arg)
+	void *arg;
 {
 	struct mc_softc *sc = arg;
 	int status, offset, statoff;
@@ -287,7 +296,8 @@ next:
 }
 
 hide void
-mc_reset_rxdma(struct mc_softc *sc)
+mc_reset_rxdma(sc)
+	struct mc_softc *sc;
 {
 	dbdma_command_t *cmd = sc->sc_rxdmacmd;
 	dbdma_regmap_t *dmareg = sc->sc_rxdma;
@@ -321,7 +331,8 @@ mc_reset_rxdma(struct mc_softc *sc)
 }
 
 hide void
-mc_reset_txdma(struct mc_softc *sc)
+mc_reset_txdma(sc)
+	struct mc_softc *sc;
 {
 	dbdma_command_t *cmd = sc->sc_txdmacmd;
 	dbdma_regmap_t *dmareg = sc->sc_txdma;
@@ -347,19 +358,22 @@ mc_reset_txdma(struct mc_softc *sc)
 }
 
 void
-mc_select_utp(struct mc_softc *sc)
+mc_select_utp(sc)
+	struct mc_softc *sc;
 {
 	sc->sc_plscc = PORTSEL_GPSI | ENPLSIO;
 }
 
 void
-mc_select_aui(struct mc_softc *sc)
+mc_select_aui(sc)
+	struct mc_softc *sc;
 {
 	sc->sc_plscc = PORTSEL_AUI;
 }
 
 int
-mc_mediachange(struct mc_softc *sc)
+mc_mediachange(sc)
+	struct mc_softc *sc;
 {
 	struct ifmedia *ifm = &sc->sc_media;
 
@@ -384,7 +398,9 @@ mc_mediachange(struct mc_softc *sc)
 }
 
 void
-mc_mediastatus(struct mc_softc *sc, struct ifmediareq *ifmr)
+mc_mediastatus(sc, ifmr)
+	struct mc_softc *sc;
+	struct ifmediareq *ifmr;
 {
 	if (sc->sc_plscc == PORTSEL_AUI)
 		ifmr->ifm_active = IFM_ETHER | IFM_10_5;