diff options
-rw-r--r-- | sys/conf/files | 4 | ||||
-rw-r--r-- | sys/conf/kmod.mk | 4 | ||||
-rw-r--r-- | sys/tools/devlist2h.awk | 147 |
3 files changed, 4 insertions, 151 deletions
diff --git a/sys/conf/files b/sys/conf/files index 74e4ef4..80b06df 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -31,8 +31,8 @@ aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local miidevs.h standard \ - dependency "$S/tools/devlist2h.awk $S/dev/mii/miidevs" \ - compile-with "${AWK} -f $S/tools/devlist2h.awk $S/dev/mii/miidevs" \ + dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ + compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule \ clean "miidevs.h" emu10k1-alsa%diked.h optional pcm pci \ diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index fb123a2..1936d811 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -332,9 +332,9 @@ CLEANFILES+= miidevs.h miidevs.h: @ .endif .if exists(@) -miidevs.h: @/tools/devlist2h.awk @/dev/mii/miidevs +miidevs.h: @/tools/miidevs2h.awk @/dev/mii/miidevs .endif - ${AWK} -f @/tools/devlist2h.awk @/dev/mii/miidevs + ${AWK} -f @/tools/miidevs2h.awk @/dev/mii/miidevs .endif regress: diff --git a/sys/tools/devlist2h.awk b/sys/tools/devlist2h.awk deleted file mode 100644 index 1b0cb81..0000000 --- a/sys/tools/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("/* \$FreeBSD\$ */\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 -} |