git: 88eaa1504d12 - main - sound: Dissolve pcm/intpcm.h
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 02 Dec 2024 16:27:23 UTC
The branch main has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=88eaa1504d12c82a36d83c16e9fd6c41175d2e0a
commit 88eaa1504d12c82a36d83c16e9fd6c41175d2e0a
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-12-02 16:26:38 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-12-02 16:26:38 +0000
sound: Dissolve pcm/intpcm.h
Part of a series of patches to cleanup/simplify pcm/.
Sponsored by: The FreeBSD Foundation
MFC after: 2 days
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D47736
---
sys/dev/sound/pcm/feeder.h | 7 ++
sys/dev/sound/pcm/feeder_format.c | 106 ++++++++++++++++++++++++++++--
sys/dev/sound/pcm/g711.h | 11 ----
sys/dev/sound/pcm/intpcm.h | 135 --------------------------------------
sys/dev/sound/pcm/sound.h | 1 +
5 files changed, 109 insertions(+), 151 deletions(-)
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index 60b8280e59ef..bd0d9dcb8f9c 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -161,6 +161,13 @@ int feeder_matrix_setup(struct pcm_feeder *, struct pcmchan_matrix *,
struct pcmchan_matrix *);
int feeder_matrix_compare(struct pcmchan_matrix *, struct pcmchan_matrix *);
+/* feeder_format */
+typedef intpcm_t intpcm_read_t(uint8_t *);
+typedef void intpcm_write_t(uint8_t *, intpcm_t);
+
+intpcm_read_t *feeder_format_read_op(uint32_t);
+intpcm_write_t *feeder_format_write_op(uint32_t);
+
/* 4Front OSS stuffs */
int feeder_matrix_oss_get_channel_order(struct pcmchan_matrix *,
unsigned long long *);
diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c
index 3bdd808df0ee..53c7d3768a32 100644
--- a/sys/dev/sound/pcm/feeder_format.c
+++ b/sys/dev/sound/pcm/feeder_format.c
@@ -36,9 +36,7 @@
#include "opt_snd.h"
#endif
#include <dev/sound/pcm/sound.h>
-#include <dev/sound/pcm/pcm.h>
#include <dev/sound/pcm/g711.h>
-#include <dev/sound/pcm/intpcm.h>
#include "feeder_if.h"
#define SND_USE_FXDIV
@@ -47,8 +45,6 @@
#define FEEDFORMAT_RESERVOIR (SND_CHN_MAX * PCM_32_BPS)
-INTPCM_DECLARE(intpcm_conv_tables)
-
struct feed_format_info {
uint32_t ibps, obps;
uint32_t ialign, oalign, channels;
@@ -57,6 +53,107 @@ struct feed_format_info {
uint8_t reservoir[FEEDFORMAT_RESERVOIR];
};
+#define INTPCM_DECLARE_OP_WRITE(SIGN, BIT, ENDIAN, SHIFT) \
+static __inline void \
+intpcm_write_##SIGN##BIT##ENDIAN(uint8_t *dst, intpcm_t v) \
+{ \
+ \
+ _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, v >> SHIFT); \
+}
+
+#define INTPCM_DECLARE_OP_8(SIGN, ENDIAN) \
+static __inline intpcm_t \
+intpcm_read_##SIGN##8##ENDIAN(uint8_t *src) \
+{ \
+ \
+ return (_PCM_READ_##SIGN##8##_##ENDIAN(src) << 24); \
+} \
+INTPCM_DECLARE_OP_WRITE(SIGN, 8, ENDIAN, 24)
+
+#define INTPCM_DECLARE_OP_16(SIGN, ENDIAN) \
+static __inline intpcm_t \
+intpcm_read_##SIGN##16##ENDIAN(uint8_t *src) \
+{ \
+ \
+ return (_PCM_READ_##SIGN##16##_##ENDIAN(src) << 16); \
+} \
+INTPCM_DECLARE_OP_WRITE(SIGN, 16, ENDIAN, 16)
+
+#define INTPCM_DECLARE_OP_24(SIGN, ENDIAN) \
+static __inline intpcm_t \
+intpcm_read_##SIGN##24##ENDIAN(uint8_t *src) \
+{ \
+ \
+ return (_PCM_READ_##SIGN##24##_##ENDIAN(src) << 8); \
+} \
+INTPCM_DECLARE_OP_WRITE(SIGN, 24, ENDIAN, 8)
+
+#define INTPCM_DECLARE_OP_32(SIGN, ENDIAN) \
+static __inline intpcm_t \
+intpcm_read_##SIGN##32##ENDIAN(uint8_t *src) \
+{ \
+ \
+ return (_PCM_READ_##SIGN##32##_##ENDIAN(src)); \
+} \
+ \
+static __inline void \
+intpcm_write_##SIGN##32##ENDIAN(uint8_t *dst, intpcm_t v) \
+{ \
+ \
+ _PCM_WRITE_##SIGN##32##_##ENDIAN(dst, v); \
+}
+
+INTPCM_DECLARE_OP_8(S, NE)
+INTPCM_DECLARE_OP_16(S, LE)
+INTPCM_DECLARE_OP_16(S, BE)
+INTPCM_DECLARE_OP_24(S, LE)
+INTPCM_DECLARE_OP_24(S, BE)
+INTPCM_DECLARE_OP_32(S, LE)
+INTPCM_DECLARE_OP_32(S, BE)
+INTPCM_DECLARE_OP_8(U, NE)
+INTPCM_DECLARE_OP_16(U, LE)
+INTPCM_DECLARE_OP_16(U, BE)
+INTPCM_DECLARE_OP_24(U, LE)
+INTPCM_DECLARE_OP_24(U, BE)
+INTPCM_DECLARE_OP_32(U, LE)
+INTPCM_DECLARE_OP_32(U, BE)
+
+static const struct {
+ const uint8_t ulaw_to_u8[G711_TABLE_SIZE];
+ const uint8_t alaw_to_u8[G711_TABLE_SIZE];
+ const uint8_t u8_to_ulaw[G711_TABLE_SIZE];
+ const uint8_t u8_to_alaw[G711_TABLE_SIZE];
+} xlaw_conv_tables = {
+ ULAW_TO_U8,
+ ALAW_TO_U8,
+ U8_TO_ULAW,
+ U8_TO_ALAW
+};
+
+static __inline intpcm_t
+intpcm_read_ulaw(uint8_t *src)
+{
+ return (_G711_TO_INTPCM(xlaw_conv_tables.ulaw_to_u8, *src) << 24);
+}
+
+static __inline intpcm_t
+intpcm_read_alaw(uint8_t *src)
+{
+ return (_G711_TO_INTPCM(xlaw_conv_tables.alaw_to_u8, *src) << 24);
+}
+
+static __inline void
+intpcm_write_ulaw(uint8_t *dst, intpcm_t v)
+{
+ *dst = _INTPCM_TO_G711(xlaw_conv_tables.u8_to_ulaw, v >> 24);
+}
+
+static __inline void
+intpcm_write_alaw(uint8_t *dst, intpcm_t v)
+{
+ *dst = _INTPCM_TO_G711(xlaw_conv_tables.u8_to_alaw, v >> 24);
+}
+
/*
* dummy ac3/dts passthrough, etc.
* XXX assume as s16le.
@@ -269,7 +366,6 @@ static kobj_method_t feeder_format_methods[] = {
FEEDER_DECLARE(feeder_format, NULL);
-/* Extern */
intpcm_read_t *
feeder_format_read_op(uint32_t format)
{
diff --git a/sys/dev/sound/pcm/g711.h b/sys/dev/sound/pcm/g711.h
index b7a57dd17a6b..481ef368e144 100644
--- a/sys/dev/sound/pcm/g711.h
+++ b/sys/dev/sound/pcm/g711.h
@@ -176,15 +176,4 @@
#define _INTPCM_TO_G711(t, v) ((t)[(uint8_t)((v) ^ 0x80)])
-#define G711_DECLARE_TABLE(t) \
-static const struct { \
- const uint8_t ulaw_to_u8[G711_TABLE_SIZE]; \
- const uint8_t alaw_to_u8[G711_TABLE_SIZE]; \
- const uint8_t u8_to_ulaw[G711_TABLE_SIZE]; \
- const uint8_t u8_to_alaw[G711_TABLE_SIZE]; \
-} t = { \
- ULAW_TO_U8, ALAW_TO_U8, \
- U8_TO_ULAW, U8_TO_ALAW \
-}
-
#endif /* !_SND_G711_H_ */
diff --git a/sys/dev/sound/pcm/intpcm.h b/sys/dev/sound/pcm/intpcm.h
deleted file mode 100644
index 1e85535feec1..000000000000
--- a/sys/dev/sound/pcm/intpcm.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2008-2009 Ariff Abdullah <ariff@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.
- */
-
-#ifndef _SND_INTPCM_H_
-#define _SND_INTPCM_H_
-
-typedef intpcm_t intpcm_read_t(uint8_t *);
-typedef void intpcm_write_t(uint8_t *, intpcm_t);
-
-extern intpcm_read_t *feeder_format_read_op(uint32_t);
-extern intpcm_write_t *feeder_format_write_op(uint32_t);
-
-#define INTPCM_DECLARE_OP_WRITE(SIGN, BIT, ENDIAN, SHIFT) \
-static __inline void \
-intpcm_write_##SIGN##BIT##ENDIAN(uint8_t *dst, intpcm_t v) \
-{ \
- \
- _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, v >> SHIFT); \
-}
-
-#define INTPCM_DECLARE_OP_8(SIGN, ENDIAN) \
-static __inline intpcm_t \
-intpcm_read_##SIGN##8##ENDIAN(uint8_t *src) \
-{ \
- \
- return (_PCM_READ_##SIGN##8##_##ENDIAN(src) << 24); \
-} \
-INTPCM_DECLARE_OP_WRITE(SIGN, 8, ENDIAN, 24)
-
-#define INTPCM_DECLARE_OP_16(SIGN, ENDIAN) \
-static __inline intpcm_t \
-intpcm_read_##SIGN##16##ENDIAN(uint8_t *src) \
-{ \
- \
- return (_PCM_READ_##SIGN##16##_##ENDIAN(src) << 16); \
-} \
-INTPCM_DECLARE_OP_WRITE(SIGN, 16, ENDIAN, 16)
-
-#define INTPCM_DECLARE_OP_24(SIGN, ENDIAN) \
-static __inline intpcm_t \
-intpcm_read_##SIGN##24##ENDIAN(uint8_t *src) \
-{ \
- \
- return (_PCM_READ_##SIGN##24##_##ENDIAN(src) << 8); \
-} \
-INTPCM_DECLARE_OP_WRITE(SIGN, 24, ENDIAN, 8)
-
-#define INTPCM_DECLARE_OP_32(SIGN, ENDIAN) \
-static __inline intpcm_t \
-intpcm_read_##SIGN##32##ENDIAN(uint8_t *src) \
-{ \
- \
- return (_PCM_READ_##SIGN##32##_##ENDIAN(src)); \
-} \
- \
-static __inline void \
-intpcm_write_##SIGN##32##ENDIAN(uint8_t *dst, intpcm_t v) \
-{ \
- \
- _PCM_WRITE_##SIGN##32##_##ENDIAN(dst, v); \
-}
-
-#define INTPCM_DECLARE(t) \
- \
-G711_DECLARE_TABLE(t); \
- \
-static __inline intpcm_t \
-intpcm_read_ulaw(uint8_t *src) \
-{ \
- \
- return (_G711_TO_INTPCM((t).ulaw_to_u8, *src) << 24); \
-} \
- \
-static __inline intpcm_t \
-intpcm_read_alaw(uint8_t *src) \
-{ \
- \
- return (_G711_TO_INTPCM((t).alaw_to_u8, *src) << 24); \
-} \
- \
-static __inline void \
-intpcm_write_ulaw(uint8_t *dst, intpcm_t v) \
-{ \
- \
- *dst = _INTPCM_TO_G711((t).u8_to_ulaw, v >> 24); \
-} \
- \
-static __inline void \
-intpcm_write_alaw(uint8_t *dst, intpcm_t v) \
-{ \
- \
- *dst = _INTPCM_TO_G711((t).u8_to_alaw, v >> 24); \
-} \
- \
-INTPCM_DECLARE_OP_8(S, NE) \
-INTPCM_DECLARE_OP_16(S, LE) \
-INTPCM_DECLARE_OP_16(S, BE) \
-INTPCM_DECLARE_OP_24(S, LE) \
-INTPCM_DECLARE_OP_24(S, BE) \
-INTPCM_DECLARE_OP_32(S, LE) \
-INTPCM_DECLARE_OP_32(S, BE) \
-INTPCM_DECLARE_OP_8(U, NE) \
-INTPCM_DECLARE_OP_16(U, LE) \
-INTPCM_DECLARE_OP_16(U, BE) \
-INTPCM_DECLARE_OP_24(U, LE) \
-INTPCM_DECLARE_OP_24(U, BE) \
-INTPCM_DECLARE_OP_32(U, LE) \
-INTPCM_DECLARE_OP_32(U, BE)
-
-#endif /* !_SND_INTPCM_H_ */
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index f1d435369d36..ff2b618adff8 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -85,6 +85,7 @@ struct snd_mixer;
#include <dev/sound/pcm/matrix.h>
#include <dev/sound/pcm/matrix_map.h>
#include <dev/sound/pcm/channel.h>
+#include <dev/sound/pcm/pcm.h>
#include <dev/sound/pcm/feeder.h>
#include <dev/sound/pcm/mixer.h>
#include <dev/sound/pcm/dsp.h>