Date: Tue, 30 Apr 2002 20:34:02 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10562 for review Message-ID: <200205010334.g413Y2M55171@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10562 Change 10562 by peter@peter_daintree on 2002/04/30 20:33:52 IFC @10561 (use makeobjops.awk) Affected files ... ... //depot/projects/ia64/sys/conf/kern.post.mk#10 integrate ... //depot/projects/ia64/sys/conf/kern.pre.mk#6 integrate ... //depot/projects/ia64/sys/conf/kmod.mk#7 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/ia64/sys/tools/makeobjops.awk#1 branch Differences ... ==== //depot/projects/ia64/sys/conf/kern.post.mk#10 (text+ko) ==== @@ -1,4 +1,3 @@ - # Part of unified Makefile for building kenrels. This includes all # the definitions that need to be included after all the % directives, # except %RULES and things that act like they are part of %RULES @@ -7,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.16 2002/04/24 11:26:19 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.17 2002/05/01 03:28:14 obrien Exp $ # # XXX why are only some phony targets marked phony? @@ -43,7 +42,7 @@ .for mfile in ${MFILES} ${mfile:T:S/.m$/.h/}: ${mfile} - perl5 $S/kern/makeobjops.pl -h ${mfile} + ${AWK} -f $S/tools/makeobjops.awk ${mfile} -h .endfor kernel-clean: ==== //depot/projects/ia64/sys/conf/kern.pre.mk#6 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.10 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.11 2002/05/01 03:28:14 obrien Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -73,7 +73,7 @@ PROFILE_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC} NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC} -NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \ +NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk $< -c ; \ ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c GEN_CFILES= $S/$M/$M/genassym.c ==== //depot/projects/ia64/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.121 2002/05/01 01:32:28 peter Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.122 2002/05/01 03:28:14 obrien Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -312,9 +312,9 @@ ${_src}: @ .endif .if exists(@) -${_src}: @/kern/makeobjops.pl @/${_srcsrc} +${_src}: @/tools/makeobjops.awk @/${_srcsrc} .endif - perl @/kern/makeobjops.pl -${_ext} @/${_srcsrc} + ${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext} .endif .endfor # _src .endfor # _ext ==== //depot/projects/ia64/sys/dev/sound/pcm/ac97_if.m#2 (text+ko) ==== @@ -1,61 +1,60 @@ -# KOBJ -# -# Copyright (c) 2000 Cameron Grant <cg@freebsd.org> -# 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. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -# -# $FreeBSD: src/sys/dev/sound/pcm/ac97_if.m,v 1.2 2001/03/05 16:42:06 cg Exp $ -# - -#include <dev/sound/pcm/sound.h> - -INTERFACE ac97; - -CODE { - - static u_int32_t - ac97_noinit(kobj_t obj, void *devinfo) - { - return 1; - } - -}; - -METHOD u_int32_t init { - kobj_t obj; - void *devinfo; -} DEFAULT ac97_noinit; - -METHOD int read { - kobj_t obj; - void *devinfo; - int regno; -}; - -METHOD int write { - kobj_t obj; - void *devinfo; - int regno; - u_int32_t data; -}; - +# KOBJ +# +# Copyright (c) 2000 Cameron Grant <cg@freebsd.org> +# 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. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. +# +# $FreeBSD: src/sys/dev/sound/pcm/ac97_if.m,v 1.3 2002/05/01 03:07:40 obrien Exp $ +# + +#include <dev/sound/pcm/sound.h> + +INTERFACE ac97; + +CODE { + + static u_int32_t + ac97_noinit(kobj_t obj, void *devinfo) + { + return 1; + } + +}; + +METHOD u_int32_t init { + kobj_t obj; + void *devinfo; +} DEFAULT ac97_noinit; + +METHOD int read { + kobj_t obj; + void *devinfo; + int regno; +}; + +METHOD int write { + kobj_t obj; + void *devinfo; + int regno; + u_int32_t data; +}; ==== //depot/projects/ia64/sys/dev/sound/pcm/feeder_if.m#2 (text+ko) ==== @@ -1,89 +1,87 @@ -# KOBJ -# -# Copyright (c) 2000 Cameron Grant <cg@freebsd.org> -# 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. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -# -# $FreeBSD: src/sys/dev/sound/pcm/feeder_if.m,v 1.4 2001/05/27 14:49:14 cg Exp $ -# - -#include <dev/sound/pcm/sound.h> - -INTERFACE feeder; - -CODE { - - static int - feeder_noinit(struct pcm_feeder* feeder) - { - return 0; - } - - static int - feeder_nofree(struct pcm_feeder* feeder) - { - return 0; - } - - static int - feeder_noset(struct pcm_feeder* feeder, int what, int value) - { - return -1; - } - - static int - feeder_noget(struct pcm_feeder* feeder, int what) - { - return -1; - } - -}; - -METHOD int init { - struct pcm_feeder* feeder; -} DEFAULT feeder_noinit; - -METHOD int free { - struct pcm_feeder* feeder; -} DEFAULT feeder_nofree; - -METHOD int set { - struct pcm_feeder* feeder; - int what; - int value; -} DEFAULT feeder_noset; - -METHOD int get { - struct pcm_feeder* feeder; - int what; -} DEFAULT feeder_noget; - -METHOD int feed { - struct pcm_feeder* feeder; - struct pcm_channel* c; - u_int8_t* buffer; - u_int32_t count; - void* source; -}; - - +# KOBJ +# +# Copyright (c) 2000 Cameron Grant <cg@freebsd.org> +# 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. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. +# +# $FreeBSD: src/sys/dev/sound/pcm/feeder_if.m,v 1.5 2002/05/01 03:07:40 obrien Exp $ +# + +#include <dev/sound/pcm/sound.h> + +INTERFACE feeder; + +CODE { + + static int + feeder_noinit(struct pcm_feeder* feeder) + { + return 0; + } + + static int + feeder_nofree(struct pcm_feeder* feeder) + { + return 0; + } + + static int + feeder_noset(struct pcm_feeder* feeder, int what, int value) + { + return -1; + } + + static int + feeder_noget(struct pcm_feeder* feeder, int what) + { + return -1; + } + +}; + +METHOD int init { + struct pcm_feeder* feeder; +} DEFAULT feeder_noinit; + +METHOD int free { + struct pcm_feeder* feeder; +} DEFAULT feeder_nofree; + +METHOD int set { + struct pcm_feeder* feeder; + int what; + int value; +} DEFAULT feeder_noset; + +METHOD int get { + struct pcm_feeder* feeder; + int what; +} DEFAULT feeder_noget; + +METHOD int feed { + struct pcm_feeder* feeder; + struct pcm_channel* c; + u_int8_t* buffer; + u_int32_t count; + void* source; +}; ==== //depot/projects/ia64/sys/dev/sound/pcm/mixer_if.m#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.3 2001/03/24 23:10:29 cg Exp $ +# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.4 2002/05/01 03:07:40 obrien Exp $ # #include <dev/sound/pcm/sound.h> @@ -64,6 +64,3 @@ struct snd_mixer *m; u_int32_t src }; - - - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205010334.g413Y2M55171>