Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hp300/dev - merge if_levar.h into if_le.c
details: https://anonhg.NetBSD.org/src/rev/6c666ee1e0ea
branches: trunk
changeset: 538430:6c666ee1e0ea
user: gmcgarry <gmcgarry%NetBSD.org@localhost>
date: Sun Oct 20 05:54:29 2002 +0000
description:
- merge if_levar.h into if_le.c
- de-__P(), ansify
- remove unnecessary headers
diffstat:
sys/arch/hp300/dev/if_le.c | 78 +++++++++++++-----------------------
sys/arch/hp300/dev/if_levar.h | 92 -------------------------------------------
2 files changed, 28 insertions(+), 142 deletions(-)
diffs (281 lines):
diff -r 96228d13b572 -r 6c666ee1e0ea sys/arch/hp300/dev/if_le.c
--- a/sys/arch/hp300/dev/if_le.c Sun Oct 20 05:18:38 2002 +0000
+++ b/sys/arch/hp300/dev/if_le.c Sun Oct 20 05:54:29 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.51 2002/10/02 05:15:52 thorpej Exp $ */
+/* $NetBSD: if_le.c,v 1.52 2002/10/20 05:54:29 gmcgarry Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -75,41 +75,27 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.51 2002/10/02 05:15:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.52 2002/10/20 05:54:29 gmcgarry Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
#include <sys/device.h>
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_inarp.h>
-#endif
-
-#include <machine/autoconf.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-
#include <dev/ic/lancereg.h>
#include <dev/ic/lancevar.h>
-#include <dev/ic/am7990reg.h>
#include <dev/ic/am7990var.h>
#include <hp300/dev/dioreg.h>
#include <hp300/dev/diovar.h>
#include <hp300/dev/diodevs.h>
#include <hp300/dev/if_lereg.h>
-#include <hp300/dev/if_levar.h>
#include "opt_useleds.h"
@@ -117,13 +103,23 @@
#include <hp300/hp300/leds.h>
#endif
-int lematch __P((struct device *, struct cfdata *, void *));
-void leattach __P((struct device *, struct device *, void *));
+struct le_softc {
+ struct am7990_softc sc_am7990; /* glue to MI code */
+
+ bus_space_tag_t sc_bst;
+
+ bus_space_handle_t sc_bsh0; /* DIO registers */
+ bus_space_handle_t sc_bsh1; /* LANCE registers */
+ bus_space_handle_t sc_bsh2; /* buffer area */
+};
+
+int lematch(struct device *, struct cfdata *, void *);
+void leattach(struct device *, struct device *, void *);
CFATTACH_DECL(le, sizeof(struct le_softc),
lematch, leattach, NULL, NULL);
-int leintr __P((void *));
+int leintr(void *);
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -137,20 +133,18 @@
#define hide static
#endif
-hide void le_copytobuf __P((struct lance_softc *, void *, int, int));
-hide void le_copyfrombuf __P((struct lance_softc *, void *, int, int));
-hide void le_zerobuf __P((struct lance_softc *, int, int));
+hide void le_copytobuf(struct lance_softc *, void *, int, int);
+hide void le_copyfrombuf(struct lance_softc *, void *, int, int);
+hide void le_zerobuf(struct lance_softc *, int, int);
/* offsets for: ID, REGS, MEM, NVRAM */
int lestd[] = { 0, 0x4000, 0x8000, 0xC008 };
-hide void lewrcsr __P((struct lance_softc *, u_int16_t, u_int16_t));
-hide u_int16_t lerdcsr __P((struct lance_softc *, u_int16_t));
+hide void lewrcsr(struct lance_softc *, u_int16_t, u_int16_t);
+hide u_int16_t lerdcsr(struct lance_softc *, u_int16_t);
hide void
-lewrcsr(sc, port, val)
- struct lance_softc *sc;
- u_int16_t port, val;
+lewrcsr(struct lance_softc *sc, u_int16_t port, u_int16_t val)
{
struct le_softc *lesc = (struct le_softc *)sc;
bus_space_tag_t bst = lesc->sc_bst;
@@ -166,9 +160,7 @@
}
hide u_int16_t
-lerdcsr(sc, port)
- struct lance_softc *sc;
- u_int16_t port;
+lerdcsr(struct lance_softc *sc, u_int16_t port)
{
struct le_softc *lesc = (struct le_softc *)sc;
bus_space_tag_t bst = lesc->sc_bst;
@@ -187,10 +179,7 @@
}
int
-lematch(parent, match, aux)
- struct device *parent;
- struct cfdata *match;
- void *aux;
+lematch(struct device *parent, struct cfdata *match, void *aux)
{
struct dio_attach_args *da = aux;
@@ -205,9 +194,7 @@
* to accept packets.
*/
void
-leattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+leattach(struct device *parent, struct device *self, void *aux)
{
struct dio_attach_args *da = aux;
struct le_softc *lesc = (struct le_softc *)self;
@@ -282,8 +269,7 @@
}
int
-leintr(arg)
- void *arg;
+leintr(void *arg)
{
struct lance_softc *sc = arg;
#ifdef USELEDS
@@ -305,10 +291,7 @@
}
hide void
-le_copytobuf(sc, from, boff, len)
- struct lance_softc *sc;
- void *from;
- int boff, len;
+le_copytobuf(struct lance_softc *sc, void *from, int boff, int len)
{
struct le_softc *lesc = (struct le_softc *)sc;
@@ -316,10 +299,7 @@
}
hide void
-le_copyfrombuf(sc, to, boff, len)
- struct lance_softc *sc;
- void *to;
- int boff, len;
+le_copyfrombuf(struct lance_softc *sc, void *to, int boff, int len)
{
struct le_softc *lesc = (struct le_softc *)sc;
@@ -327,9 +307,7 @@
}
hide void
-le_zerobuf(sc, boff, len)
- struct lance_softc *sc;
- int boff, len;
+le_zerobuf(struct lance_softc *sc, int boff, int len)
{
struct le_softc *lesc = (struct le_softc *)sc;
diff -r 96228d13b572 -r 6c666ee1e0ea sys/arch/hp300/dev/if_levar.h
--- a/sys/arch/hp300/dev/if_levar.h Sun Oct 20 05:18:38 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/* $NetBSD: if_levar.h,v 1.10 1998/08/15 10:18:15 mycroft Exp $ */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell and Rick Macklem.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)if_le.c 8.2 (Berkeley) 11/16/93
- */
-
-/*
- * Ethernet software status per interface.
- *
- * Each interface is referenced by a network interface structure,
- * ethercom.ec_if, which the routing code uses to locate the interface.
- * This structure contains the output queue for the interface, its address, ...
- */
-struct le_softc {
- struct am7990_softc sc_am7990; /* glue to MI code */
-
- bus_space_tag_t sc_bst;
-
- bus_space_handle_t sc_bsh0; /* DIO registers */
- bus_space_handle_t sc_bsh1; /* LANCE registers */
- bus_space_handle_t sc_bsh2; /* buffer area */
-};
Home |
Main Index |
Thread Index |
Old Index