Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/audio/common inline the contents of auconv.c into au...
details: https://anonhg.NetBSD.org/src/rev/f433f1c7b2c5
branches: trunk
changeset: 538152:f433f1c7b2c5
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Oct 13 00:59:45 2002 +0000
description:
inline the contents of auconv.c into auconv.h. this makes audiorecord(1)
slightly smaller (about 200 bytes on x86) and i would guess slightly faster.
diffstat:
usr.bin/audio/common/Makefile | 4 +-
usr.bin/audio/common/auconv.c | 199 ------------------------------------------
usr.bin/audio/common/auconv.h | 191 ++++++++++++++++++++++++++++++++++++---
3 files changed, 177 insertions(+), 217 deletions(-)
diffs (truncated from 423 to 300 lines):
diff -r 4e71eed2a7e8 -r f433f1c7b2c5 usr.bin/audio/common/Makefile
--- a/usr.bin/audio/common/Makefile Sun Oct 13 00:56:44 2002 +0000
+++ b/usr.bin/audio/common/Makefile Sun Oct 13 00:59:45 2002 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2002/09/18 14:00:33 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/13 00:59:45 mrg Exp $
NOPROFILE= # defined
NOPIC= # defined
LIB= audio
-SRCS= audio.c wav.c sun.c auconv.c
+SRCS= audio.c wav.c sun.c
# only needed during build
libinstall::
diff -r 4e71eed2a7e8 -r f433f1c7b2c5 usr.bin/audio/common/auconv.c
--- a/usr.bin/audio/common/auconv.c Sun Oct 13 00:56:44 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-/* $NetBSD: auconv.c,v 1.1 2002/01/15 17:02:51 mrg Exp $ */
-
-/*
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * 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 product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory 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.
- *
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.1 2002/01/15 17:02:51 mrg Exp $");
-
-#include <sys/types.h>
-#include <sys/audioio.h>
-
-#include "auconv.h"
-
-void
-change_sign8(u_char *p, size_t cc)
-{
- while (--cc > 0) {
- *p ^= 0x80;
- ++p;
- }
-}
-
-void
-change_sign16_le(u_char *p, size_t cc)
-{
- while ((cc -= 2) > 0) {
- p[1] ^= 0x80;
- p += 2;
- }
-}
-
-void
-change_sign16_be(u_char *p, size_t cc)
-{
- while ((cc -= 2) > 0) {
- p[0] ^= 0x80;
- p += 2;
- }
-}
-
-void
-change_sign32_le(u_char *p, size_t cc)
-{
- while ((cc -= 4) > 0) {
- p[3] ^= 0x80;
- p += 4;
- }
-}
-
-void
-change_sign32_be(u_char *p, size_t cc)
-{
- while ((cc -= 4) > 0) {
- p[0] ^= 0x80;
- p += 4;
- }
-}
-
-void
-swap_bytes(u_char *p, size_t cc)
-{
- u_char t;
-
- while ((cc -= 2) > 0) {
- t = p[0];
- p[0] = p[1];
- p[1] = t;
- p += 2;
- }
-}
-
-void
-swap_bytes32(u_char *p, size_t cc)
-{
- u_char t;
-
- while ((cc -= 4) > 0) {
- t = p[0];
- p[0] = p[3];
- p[3] = t;
- t = p[1];
- p[1] = p[2];
- p[2] = t;
- p += 4;
- }
-}
-
-void
-swap_bytes_change_sign16_le(u_char *p, size_t cc)
-{
- u_char t;
-
- while ((cc -= 2) > 0) {
- t = p[1];
- p[1] = p[0] ^ 0x80;
- p[0] = t;
- p += 2;
- }
-}
-
-void
-swap_bytes_change_sign16_be(u_char *p, size_t cc)
-{
- u_char t;
-
- while ((cc -= 2) > 0) {
- t = p[0];
- p[0] = p[1] ^ 0x80;
- p[1] = t;
- p += 2;
- }
-}
-
-void
-change_sign16_swap_bytes_le(u_char *p, size_t cc)
-{
- swap_bytes_change_sign16_be(p, cc);
-}
-
-void
-change_sign16_swap_bytes_be(u_char *p, size_t cc)
-{
- swap_bytes_change_sign16_le(p, cc);
-}
-
-void
-swap_bytes_change_sign32_le(u_char *p, size_t cc)
-{
- u_char t;
-
- while ((cc -= 4) > 0) {
- t = p[3];
- p[3] = p[0] ^ 0x80;
- p[0] = t;
- t = p[1];
- p[1] = p[2];
- p[2] = t;
- p += 4;
- }
-}
-
-void
-swap_bytes_change_sign32_be(u_char *p, size_t cc)
-{
- u_char t;
-
- while ((cc -= 4) > 0) {
- t = p[0];
- p[0] = p[3] ^ 0x80;
- p[3] = t;
- t = p[1];
- p[1] = p[2];
- p[2] = t;
- p += 4;
- }
-}
-
-void
-change_sign32_swap_bytes_le(u_char *p, size_t cc)
-{
- swap_bytes_change_sign32_be(p, cc);
-}
-
-void
-change_sign32_swap_bytes_be(u_char *p, size_t cc)
-{
- swap_bytes_change_sign32_le(p, cc);
-}
diff -r 4e71eed2a7e8 -r f433f1c7b2c5 usr.bin/audio/common/auconv.h
--- a/usr.bin/audio/common/auconv.h Sun Oct 13 00:56:44 2002 +0000
+++ b/usr.bin/audio/common/auconv.h Sun Oct 13 00:59:45 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.h,v 1.1 2002/01/15 17:02:51 mrg Exp $ */
+/* $NetBSD: auconv.h,v 1.2 2002/10/13 00:59:45 mrg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -36,20 +36,179 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/types.h>
+#include <sys/audioio.h>
+
/* Convert between signed and unsigned. */
-extern void change_sign8(u_char *, size_t);
-extern void change_sign16_le(u_char *, size_t);
-extern void change_sign16_be(u_char *, size_t);
-extern void change_sign32_le(u_char *, size_t);
-extern void change_sign32_be(u_char *, size_t);
+static __inline__ void change_sign8(u_char *, size_t);
+static __inline__ void change_sign16_le(u_char *, size_t);
+static __inline__ void change_sign16_be(u_char *, size_t);
+static __inline__ void change_sign32_le(u_char *, size_t);
+static __inline__ void change_sign32_be(u_char *, size_t);
/* Convert between little and big endian. */
-extern void swap_bytes(u_char *, size_t);
-extern void swap_bytes32(u_char *, size_t);
-extern void swap_bytes_change_sign16_le(u_char *, size_t);
-extern void swap_bytes_change_sign16_be(u_char *, size_t);
-extern void change_sign16_swap_bytes_le(u_char *, size_t);
-extern void change_sign16_swap_bytes_be(u_char *, size_t);
-extern void swap_bytes_change_sign32_le(u_char *, size_t);
-extern void swap_bytes_change_sign32_be(u_char *, size_t);
-extern void change_sign32_swap_bytes_le(u_char *, size_t);
-extern void change_sign32_swap_bytes_be(u_char *, size_t);
+static __inline__ void swap_bytes(u_char *, size_t);
+static __inline__ void swap_bytes32(u_char *, size_t);
+static __inline__ void swap_bytes_change_sign16_le(u_char *, size_t);
+static __inline__ void swap_bytes_change_sign16_be(u_char *, size_t);
+static __inline__ void change_sign16_swap_bytes_le(u_char *, size_t);
+static __inline__ void change_sign16_swap_bytes_be(u_char *, size_t);
+static __inline__ void swap_bytes_change_sign32_le(u_char *, size_t);
+static __inline__ void swap_bytes_change_sign32_be(u_char *, size_t);
+static __inline__ void change_sign32_swap_bytes_le(u_char *, size_t);
+static __inline__ void change_sign32_swap_bytes_be(u_char *, size_t);
+
+static __inline__ void
+change_sign8(u_char *p, size_t cc)
+{
+ while (--cc > 0) {
+ *p ^= 0x80;
+ ++p;
+ }
+}
+
+static __inline__ void
+change_sign16_le(u_char *p, size_t cc)
+{
+ while ((cc -= 2) > 0) {
+ p[1] ^= 0x80;
+ p += 2;
+ }
+}
+
+static __inline__ void
+change_sign16_be(u_char *p, size_t cc)
+{
+ while ((cc -= 2) > 0) {
+ p[0] ^= 0x80;
+ p += 2;
+ }
+}
+
+static __inline__ void
+change_sign32_le(u_char *p, size_t cc)
+{
+ while ((cc -= 4) > 0) {
+ p[3] ^= 0x80;
Home |
Main Index |
Thread Index |
Old Index