diff options
Diffstat (limited to 'sys')
32 files changed, 53 insertions, 403 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index f39b9c2..06cd62b 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -50,10 +50,19 @@ ${mfile:T:S/.m$/.h/}: ${mfile} ${AWK} -f $S/tools/makeobjops.awk ${mfile} -h .endfor +miidevs.h: $S/tools/devlist2h.awk $S/dev/mii/miidevs + ${AWK} -f $S/tools/devlist2h.awk $S/dev/mii/miidevs + +.if !exists(.depend) +acphy.o amphy.o bmtphy.o brgphy.o dcphy.o e1000phy.o exphy.o if_bge.o if_tx.o \ +inphy.o lxtphy.o nsgphy.o nsphy.o pnaphy.o pnphy.o qsphy.o rlphy.o tdkphy.o \ +tlphy.o xmphy.o: miidevs.h +.endif + kernel-clean: rm -f *.o *.so *.So *.ko *.s eddep errs \ ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags \ - vers.c vnode_if.c vnode_if.h \ + miidevs.h vers.c vnode_if.c vnode_if.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${CLEAN} @@ -98,7 +107,7 @@ GEN_M_CFILES= ${MFILES:T:S/.m$/.c/} # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} \ +_kernel-depend: assym.s vnode_if.h miidevs.h ${BEFORE_DEPEND} \ ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${GEN_M_CFILES} \ ${SFILES} ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi @@ -160,17 +169,17 @@ kernel-install: .endif mkdir -p ${DESTDIR}${KODIR} .if defined(DEBUG) && defined(INSTALL_DEBUG) - ${INSTALL} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} + ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} .else - ${INSTALL} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .endif kernel-reinstall: @-chflags -R noschg ${DESTDIR}${KODIR} .if defined(DEBUG) && defined(INSTALL_DEBUG) - ${INSTALL} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} + ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} .else - ${INSTALL} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .endif .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 0d8a1aa..bc04d11 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -286,6 +286,17 @@ vnode_if.${_ext}: @/tools/vnode_if.awk @/kern/vnode_if.src .endif .endfor +.if ${SRCS:Mmiidevs.h} != "" +CLEANFILES+= miidevs.h +.if !exists(@) +miidevs.h: @ +.endif +.if exists(@) +miidevs.h: @/tools/devlist2h.awk @/dev/mii/miidevs +.endif + ${AWK} -f @/tools/devlist2h.awk @/dev/mii/miidevs +.endif + regress: lint: ${SRCS} diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index f087102..99523c3 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -105,7 +105,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/brgphyreg.h> #include <pci/pcireg.h> diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c index 9081ff2..e0fcca8 100644 --- a/sys/dev/dc/dcphy.c +++ b/sys/dev/dc/dcphy.c @@ -57,7 +57,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <machine/bus_pio.h> #include <machine/bus_memio.h> diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c index 4a38b46..87c0732 100644 --- a/sys/dev/dc/pnphy.c +++ b/sys/dev/dc/pnphy.c @@ -55,7 +55,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <machine/bus_pio.h> #include <machine/bus_memio.h> diff --git a/sys/dev/mii/Makefile.miidevs b/sys/dev/mii/Makefile.miidevs deleted file mode 100644 index 964ecf3..0000000 --- a/sys/dev/mii/Makefile.miidevs +++ /dev/null @@ -1,8 +0,0 @@ -# $NetBSD: Makefile.miidevs,v 1.1 1998/08/10 23:55:17 thorpej Exp $ -# $FreeBSD$ - -AWK= awk - -miidevs.h: miidevs devlist2h.awk - /bin/rm -f miidevs.h - ${AWK} -f devlist2h.awk miidevs diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c index 42834f6..7817722 100644 --- a/sys/dev/mii/acphy.c +++ b/sys/dev/mii/acphy.c @@ -81,7 +81,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/acphyreg.h> diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c index 83d9616..cb5ea55 100644 --- a/sys/dev/mii/amphy.c +++ b/sys/dev/mii/amphy.c @@ -49,7 +49,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/amphyreg.h> diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c index 87f55d9..f6d7e56 100644 --- a/sys/dev/mii/bmtphy.c +++ b/sys/dev/mii/bmtphy.c @@ -85,7 +85,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/bmtphyreg.h> diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index 2d74d49..c90df66 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -50,7 +50,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/brgphyreg.h> diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c index 9081ff2..e0fcca8 100644 --- a/sys/dev/mii/dcphy.c +++ b/sys/dev/mii/dcphy.c @@ -57,7 +57,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <machine/bus_pio.h> #include <machine/bus_memio.h> diff --git a/sys/dev/mii/devlist2h.awk b/sys/dev/mii/devlist2h.awk deleted file mode 100644 index 6c76b17..0000000 --- a/sys/dev/mii/devlist2h.awk +++ /dev/null @@ -1,147 +0,0 @@ -#! /usr/bin/awk -f -# $NetBSD: devlist2h.awk,v 1.2 1998/09/05 14:42:06 christos Exp $ -# -# Copyright (c) 1998 The NetBSD Foundation, Inc. -# All rights reserved. -# -# This code is derived from software contributed to The NetBSD Foundation -# by Christos Zoulas. -# -# 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) 1995, 1996 Christopher G. Demetriou -# All rights reserved. -# -# 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 model includes software developed by Christopher G. Demetriou. -# This model includes software developed by Christos Zoulas -# 4. The name of the author(s) may not be used to endorse or promote models -# derived from this software without specific prior written permission -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -# -# $FreeBSD$ -# -function collectline(f, line) { - oparen = 0 - line = "" - while (f <= NF) { - if ($f == "#") { - line = line "(" - oparen = 1 - f++ - continue - } - if (oparen) { - line = line $f - if (f < NF) - line = line " " - f++ - continue - } - line = line $f - if (f < NF) - line = line " " - f++ - } - if (oparen) - line = line ")" - return line -} -BEGIN { - nmodels = nouis = 0 - hfile="miidevs.h" -} -NR == 1 { - VERSION = $0 - gsub("\\$", "", VERSION) - - printf("/*\t\$FreeBSD\$\t*/\n\n") > hfile - printf("/*\n") > hfile - printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ - > hfile - printf(" *\n") > hfile - printf(" * generated from:\n") > hfile - printf(" *\t%s\n", VERSION) > hfile - printf(" */\n") > hfile - - next -} -$1 == "oui" { - nuios++ - - ouiindex[$2] = nouis; # record index for this name, for later. - - ouis[nouis, 1] = $2; # name - ouis[nouis, 2] = $3; # id - printf("#define\tMII_OUI_%s\t%s\t", ouis[nouis, 1], - ouis[nouis, 2]) > hfile - ouis[nouis, 3] = collectline(4, line) - printf("/* %s */\n", ouis[nouis, 3]) > hfile - next -} -$1 == "model" { - nmodels++ - - models[nmodels, 1] = $2; # oui name - models[nmodels, 2] = $3; # model id - models[nmodels, 3] = $4; # id - - printf("#define\tMII_MODEL_%s_%s\t%s\n", models[nmodels, 1], - models[nmodels, 2], models[nmodels, 3]) > hfile - - models[nmodels, 4] = collectline(5, line) - - printf("#define\tMII_STR_%s_%s\t\"%s\"\n", - models[nmodels, 1], models[nmodels, 2], - models[nmodels, 4]) > hfile - - next -} -{ - print $0 > hfile -} diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c index 8045fc9..5a0d694 100644 --- a/sys/dev/mii/e1000phy.c +++ b/sys/dev/mii/e1000phy.c @@ -47,7 +47,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/e1000phyreg.h> diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index ea2bbdd..5318499 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -82,7 +82,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include "miibus_if.h" diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c index d4bdab2..701b47f 100644 --- a/sys/dev/mii/inphy.c +++ b/sys/dev/mii/inphy.c @@ -44,7 +44,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/inphyreg.h> diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c index 71b97e0..62f5691 100644 --- a/sys/dev/mii/lxtphy.c +++ b/sys/dev/mii/lxtphy.c @@ -85,7 +85,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/lxtphyreg.h> diff --git a/sys/dev/mii/miidevs.h b/sys/dev/mii/miidevs.h deleted file mode 100644 index 6be7500..0000000 --- a/sys/dev/mii/miidevs.h +++ /dev/null @@ -1,215 +0,0 @@ -/* $FreeBSD$ */ - -/* - * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. - * - * generated from: - * FreeBSD: src/sys/dev/mii/miidevs,v 1.22 2003/01/12 21:03:37 obrien Exp - */ -/*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ - -/*- - * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, - * NASA Ames Research Center. - * - * 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. - */ - -/* - * List of known MII OUIs. - * For a complete list see http://standards.ieee.org/regauth/oui/ - * - * XXX Vendors do obviously not agree how OUIs (18 bit) are mapped - * to the 16 bits available in the id registers. The MII_OUI() macro - * in "mii.h" reflects the most obvious way. If a vendor uses a - * different mapping, an "xx" prefixed OUI is defined here which is - * mangled accordingly to compensate. - */ - -#define MII_OUI_ALTIMA 0x0010a9 /* Altima Communications */ -#define MII_OUI_AMD 0x00001a /* Advanced Micro Devices */ -#define MII_OUI_BROADCOM 0x001018 /* Broadcom Corporation */ -#define MII_OUI_DAVICOM 0x00606e /* Davicom Semiconductor */ -#define MII_OUI_ICS 0x00a0be /* Integrated Circuit Systems */ -#define MII_OUI_INTEL 0x00aa00 /* Intel */ -#define MII_OUI_JATO 0x00e083 /* Jato Technologies */ -#define MII_OUI_LEVEL1 0x00207b /* Level 1 */ -#define MII_OUI_NATSEMI 0x080017 /* National Semiconductor */ -#define MII_OUI_QUALSEMI 0x006051 /* Quality Semiconductor */ -#define MII_OUI_REALTEK 0x000020 /* RealTek Semicondctor */ -#define MII_OUI_SEEQ 0x00a07d /* Seeq */ -#define MII_OUI_SIS 0x00e006 /* Silicon Integrated Systems */ -#define MII_OUI_TDK 0x00c039 /* TDK */ -#define MII_OUI_TI 0x080028 /* Texas Instruments */ -#define MII_OUI_XAQTI 0x00e0ae /* XaQti Corp. */ -#define MII_OUI_MARVELL 0x005043 /* Marvell Semiconductor */ -#define MII_OUI_xxMARVELL 0x000ac2 /* Marvell Semiconductor */ - -/* in the 79c873, AMD uses another OUI (which matches Davicom!) */ -#define MII_OUI_xxAMD 0x00606e /* Advanced Micro Devices */ - -/* Intel 82553 A/B steppings */ -#define MII_OUI_xxINTEL 0x00f800 /* Intel */ - -/* some vendors have the bits swapped within bytes - (ie, ordered as on the wire) */ -#define MII_OUI_xxALTIMA 0x000895 /* Altima Communications */ -#define MII_OUI_xxBROADCOM 0x000818 /* Broadcom Corporation */ -#define MII_OUI_xxICS 0x00057d /* Integrated Circuit Systems */ -#define MII_OUI_xxSEEQ 0x0005be /* Seeq */ -#define MII_OUI_xxSIS 0x000760 /* Silicon Integrated Systems */ -#define MII_OUI_xxTI 0x100014 /* Texas Instruments */ -#define MII_OUI_xxXAQTI 0x350700 /* XaQti Corp. */ - -/* Level 1 is completely different - from right to left. - (Two bits get lost in the third OUI byte.) */ -#define MII_OUI_xxLEVEL1 0x1e0400 /* Level 1 */ - -/* Don't know what's going on here. */ -#define MII_OUI_xxDAVICOM 0x006040 /* Davicom Semiconductor */ - - -/* - * List of known models. Grouped by oui. - */ - -/* Altima Communications PHYs */ -#define MII_MODEL_xxALTIMA_AC101 0x0021 -#define MII_STR_xxALTIMA_AC101 "AC101 10/100 media interface" -#define MII_MODEL_xxALTIMA_AC101L 0x0012 -#define MII_STR_xxALTIMA_AC101L "AC101L 10/100 media interface" - -/* Advanced Micro Devices PHYs */ -#define MII_MODEL_xxAMD_79C873 0x0000 -#define MII_STR_xxAMD_79C873 "Am79C873 10/100 media interface" -#define MII_MODEL_AMD_79c973phy 0x0036 -#define MII_STR_AMD_79c973phy "Am79c973 internal PHY" -#define MII_MODEL_AMD_79c978 0x0039 -#define MII_STR_AMD_79c978 "Am79c978 HomePNA PHY" - -/* Broadcom Corp. PHYs. */ -#define MII_MODEL_BROADCOM_3C905B 0x0012 -#define MII_STR_BROADCOM_3C905B "3c905B 10/100 internal PHY" -#define MII_MODEL_BROADCOM_3C905C 0x0017 -#define MII_STR_BROADCOM_3C905C "3c905C 10/100 internal PHY" -#define MII_MODEL_BROADCOM_BCM5201 0x0021 -#define MII_STR_BROADCOM_BCM5201 "BCM5201 10/100baseTX PHY" -#define MII_MODEL_BROADCOM_BCM5221 0x001e -#define MII_STR_BROADCOM_BCM5221 "BCM5221 10/100baseTX PHY" -#define MII_MODEL_xxBROADCOM_BCM5400 0x0004 -#define MII_STR_xxBROADCOM_BCM5400 "Broadcom 1000baseTX PHY" -#define MII_MODEL_xxBROADCOM_BCM5401 0x0005 -#define MII_STR_xxBROADCOM_BCM5401 "BCM5401 10/100/1000baseTX PHY" -#define MII_MODEL_xxBROADCOM_BCM5411 0x0007 -#define MII_STR_xxBROADCOM_BCM5411 "BCM5411 10/100/1000baseTX PHY" -#define MII_MODEL_xxBROADCOM_BCM5701 0x0011 -#define MII_STR_xxBROADCOM_BCM5701 "BCM5701 10/100/1000baseTX PHY" -#define MII_MODEL_xxBROADCOM_BCM5703 0x0016 -#define MII_STR_xxBROADCOM_BCM5703 "BCM5703 10/100/1000baseTX PHY" - -/* Davicom Semiconductor PHYs */ -#define MII_MODEL_xxDAVICOM_DM9101 0x0000 -#define MII_STR_xxDAVICOM_DM9101 "DM9101 10/100 media interface" - -/* Integrated Circuit Systems PHYs */ -#define MII_MODEL_xxICS_1890 0x0002 -#define MII_STR_xxICS_1890 "ICS1890 10/100 media interface" - -/* Intel PHYs */ -#define MII_MODEL_xxINTEL_I82553AB 0x0000 -#define MII_STR_xxINTEL_I82553AB "i83553 10/100 media interface" -#define MII_MODEL_INTEL_I82555 0x0015 -#define MII_STR_INTEL_I82555 "i82555 10/100 media interface" -#define MII_MODEL_INTEL_I82562EM 0x0032 -#define MII_STR_INTEL_I82562EM "i82562EM 10/100 media interface" -#define MII_MODEL_INTEL_I82562ET 0x0033 -#define MII_STR_INTEL_I82562ET "i82562ET 10/100 media interface" -#define MII_MODEL_INTEL_I82553C 0x0035 -#define MII_STR_INTEL_I82553C "i82553 10/100 media interface" - -/* Jato Technologies PHYs */ -#define MII_MODEL_JATO_BASEX 0x0000 -#define MII_STR_JATO_BASEX "Jato 1000baseX media interface" - -/* Level 1 PHYs */ -#define MII_MODEL_xxLEVEL1_LXT970 0x0000 -#define MII_STR_xxLEVEL1_LXT970 "LXT970 10/100 media interface" - -/* National Semiconductor PHYs */ -#define MII_MODEL_NATSEMI_DP83840 0x0000 -#define MII_STR_NATSEMI_DP83840 "DP83840 10/100 media interface" -#define MII_MODEL_NATSEMI_DP83843 0x0001 -#define MII_STR_NATSEMI_DP83843 "DP83843 10/100 media interface" -#define MII_MODEL_NATSEMI_DP83891 0x0005 -#define MII_STR_NATSEMI_DP83891 "DP83891 10/100/1000 media interface" -#define MII_MODEL_NATSEMI_DP83861 0x0006 -#define MII_STR_NATSEMI_DP83861 "DP83861 10/100/1000 media interface" - -/* Quality Semiconductor PHYs */ -#define MII_MODEL_QUALSEMI_QS6612 0x0000 -#define MII_STR_QUALSEMI_QS6612 "QS6612 10/100 media interface" - -/* RealTek Semiconductor PHYs */ -#define MII_MODEL_REALTEK_RTL8201L 0x0020 -#define MII_STR_REALTEK_RTL8201L "RTL8201L 10/100 media interface" - -/* Seeq PHYs */ -#define MII_MODEL_xxSEEQ_80220 0x0003 -#define MII_STR_xxSEEQ_80220 "Seeq 80220 10/100 media interface" -#define MII_MODEL_xxSEEQ_84220 0x0004 -#define MII_STR_xxSEEQ_84220 "Seeq 84220 10/100 media interface" - -/* Silicon Integrated Systems PHYs */ -#define MII_MODEL_xxSIS_900 0x0000 -#define MII_STR_xxSIS_900 "SiS 900 10/100 media interface" - -/* TDK */ -#define MII_MODEL_TDK_78Q2120 0x0014 -#define MII_STR_TDK_78Q2120 "TDK 78Q2120 media interface" - -/* Texas Instruments PHYs */ -#define MII_MODEL_xxTI_TLAN10T 0x0001 -#define MII_STR_xxTI_TLAN10T "ThunderLAN 10baseT media interface" -#define MII_MODEL_xxTI_100VGPMI 0x0002 -#define MII_STR_xxTI_100VGPMI "ThunderLAN 100VG-AnyLan media interface" - -/* XaQti Corp. PHYs. */ -#define MII_MODEL_XAQTI_XMACII 0x0000 -#define MII_STR_XAQTI_XMACII "XaQti Corp. XMAC II gigabit interface" - -/* Marvell Semiconductor PHYs */ -#define MII_MODEL_MARVELL_E1000 0x0000 -#define MII_STR_MARVELL_E1000 "Marvell 88E1000 Gigabit PHY" -#define MII_MODEL_xxMARVELL_E1000 0x0005 -#define MII_STR_xxMARVELL_E1000 "Marvell 88E1000 Gigabit PHY" - diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c index 6964f73..0aff7c9 100644 --- a/sys/dev/mii/nsgphy.c +++ b/sys/dev/mii/nsgphy.c @@ -66,7 +66,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/nsgphyreg.h> diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 02997b4..53bb9f9 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -84,7 +84,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/nsphyreg.h> diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c index 48d7870..e2554b6 100644 --- a/sys/dev/mii/pnaphy.c +++ b/sys/dev/mii/pnaphy.c @@ -56,7 +56,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include "miibus_if.h" diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c index 4a38b46..87c0732 100644 --- a/sys/dev/mii/pnphy.c +++ b/sys/dev/mii/pnphy.c @@ -55,7 +55,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <machine/bus_pio.h> #include <machine/bus_memio.h> diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index f9bc897..c8b29fb 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -85,7 +85,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/qsphyreg.h> diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index 9df26eb..3a74045 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -48,7 +48,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <machine/bus.h> #include <pci/if_rlreg.h> diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c index 8f07419..69b1f0c 100644 --- a/sys/dev/mii/tdkphy.c +++ b/sys/dev/mii/tdkphy.c @@ -57,7 +57,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/tdkphyreg.h> diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c index 2625571..af2cd23 100644 --- a/sys/dev/mii/tlphy.c +++ b/sys/dev/mii/tlphy.c @@ -86,7 +86,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/tlphyreg.h> diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c index 7a2e197..2c6dbfa 100644 --- a/sys/dev/mii/xmphy.c +++ b/sys/dev/mii/xmphy.c @@ -50,7 +50,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/xmphyreg.h> diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index 51690e4..189a69e 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -72,7 +72,7 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> +#include "miidevs.h" #include <dev/mii/lxtphyreg.h> diff --git a/sys/modules/bge/Makefile b/sys/modules/bge/Makefile index 6c51eb2..9a28f3b 100644 --- a/sys/modules/bge/Makefile +++ b/sys/modules/bge/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/bge KMOD= if_bge -SRCS= if_bge.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h +SRCS= if_bge.c miibus_if.h miidevs.h opt_bdg.h device_if.h bus_if.h pci_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile index 1d47ec5..67da740 100644 --- a/sys/modules/mii/Makefile +++ b/sys/modules/mii/Makefile @@ -4,7 +4,7 @@ KMOD= miibus SRCS= mii.c mii_physubr.c ukphy.c ukphy_subr.c bus_if.h pci_if.h -SRCS+= miibus_if.h device_if.h miibus_if.c e1000phy.c exphy.c nsphy.c +SRCS+= miibus_if.h miidevs.h device_if.h miibus_if.c e1000phy.c exphy.c nsphy.c SRCS+= mlphy.c tlphy.c rlphy.c amphy.c dcphy.c pnphy.c inphy.c SRCS+= bmtphy.c brgphy.c xmphy.c pnaphy.c lxtphy.c qsphy.c acphy.c nsgphy.c diff --git a/sys/modules/tx/Makefile b/sys/modules/tx/Makefile index 086ff95..8d4ded9 100644 --- a/sys/modules/tx/Makefile +++ b/sys/modules/tx/Makefile @@ -4,6 +4,6 @@ KMOD= if_tx SRCS= if_tx.c opt_bdg.h device_if.h bus_if.h pci_if.h -SRCS+= miibus_if.h +SRCS+= miibus_if.h miidevs.h .include <bsd.kmod.mk> diff --git a/sys/tools/devlist2h.awk b/sys/tools/devlist2h.awk index 6c76b17..1b0cb81 100644 --- a/sys/tools/devlist2h.awk +++ b/sys/tools/devlist2h.awk @@ -100,7 +100,7 @@ NR == 1 { VERSION = $0 gsub("\\$", "", VERSION) - printf("/*\t\$FreeBSD\$\t*/\n\n") > hfile + printf("/* \$FreeBSD\$ */\n\n") > hfile printf("/*\n") > hfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > hfile diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk index 6c76b17..1b0cb81 100644 --- a/sys/tools/miidevs2h.awk +++ b/sys/tools/miidevs2h.awk @@ -100,7 +100,7 @@ NR == 1 { VERSION = $0 gsub("\\$", "", VERSION) - printf("/*\t\$FreeBSD\$\t*/\n\n") > hfile + printf("/* \$FreeBSD\$ */\n\n") > hfile printf("/*\n") > hfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > hfile |
