Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ic Also allow SLINEAR_BE on msm6258_linear8_to_adpcm.
details: https://anonhg.NetBSD.org/src/rev/54cfb442ce43
branches: trunk
changeset: 355356:54cfb442ce43
user: isaki <isaki%NetBSD.org@localhost>
date: Thu Jul 27 07:53:54 2017 +0000
description:
Also allow SLINEAR_BE on msm6258_linear8_to_adpcm.
Before merging in-kernel mixing, it was called with SLINEAR_LE even if
big endian arch. But now it seems to be called with SLINEAR_<HostEndian>.
diffstat:
sys/dev/ic/msm6258.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diffs (38 lines):
diff -r adc36ffd0d79 -r 54cfb442ce43 sys/dev/ic/msm6258.c
--- a/sys/dev/ic/msm6258.c Thu Jul 27 07:01:58 2017 +0000
+++ b/sys/dev/ic/msm6258.c Thu Jul 27 07:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msm6258.c,v 1.18 2017/07/15 10:17:09 isaki Exp $ */
+/* $NetBSD: msm6258.c,v 1.19 2017/07/27 07:53:54 isaki Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msm6258.c,v 1.18 2017/07/15 10:17:09 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msm6258.c,v 1.19 2017/07/27 07:53:54 isaki Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -233,7 +233,8 @@
d = dst->inp;
s = this->src->outp;
enc_src = this->src->param.encoding;
- if (enc_src == AUDIO_ENCODING_SLINEAR_LE) {
+ if (enc_src == AUDIO_ENCODING_SLINEAR_LE
+ || enc_src == AUDIO_ENCODING_SLINEAR_BE) {
while (dst->used < m && this->src->used >= 4) {
uint8_t f;
int16_t ss;
@@ -247,7 +248,8 @@
s = audio_stream_add_outp(this->src, s, 1);
}
#if defined(DIAGNOSTIC)
- } else if (enc_src == AUDIO_ENCODING_ULINEAR_LE) {
+ } else if (enc_src == AUDIO_ENCODING_ULINEAR_LE
+ || enc_src == AUDIO_ENCODING_ULINEAR_BE) {
#else
} else {
#endif
Home |
Main Index |
Thread Index |
Old Index