janis/aes67-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added fix to ALSA/RAVENNA driver to restore default number of inputs and outputs to 64.

Browse Source 
These were set back to 8 after merge of ALSA/RAVENNA driver version 1.1.93.
This fixes issue #13
This commit is contained in:
Andrea Bondavalli 2020-06-30 17:27:16 +02:00
parent df927e2224
commit dd0ab49c6c
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
3rdparty/patches/ravenna-alsa-lkm-fixes.patch vendored
View File

@ -1,3 +1,18 @@
diff --git a/common/MergingRAVENNACommon.h b/common/MergingRAVENNACommon.h
index f26368d..a21f4a7 100644
--- a/common/MergingRAVENNACommon.h
+++ b/common/MergingRAVENNACommon.h
@@ -78,8 +78,8 @@
#define DEFAULT_AUDIOMODE MergingRAVENNACommon::AM_PCM
#define DEFAULT_AUDIODATAFORMAT MergingRAVENNACommon::ADF_PCM
#define DEFAULT_ZONE MergingRAVENNACommon::Z_8_HP
-#define DEFAULT_NUMBEROFINPUTS 8
-#define DEFAULT_NUMBEROFOUTPUTS 8
+#define DEFAULT_NUMBEROFINPUTS 64
+#define DEFAULT_NUMBEROFOUTPUTS 64
#define DEFAULT_FOLLOWDOPDETECTION true
#ifdef DSD256_at_705k6
diff --git a/driver/PTP.c b/driver/PTP.c diff --git a/driver/PTP.c b/driver/PTP.c
index 4b2242a..1bf593a 100644 index 4b2242a..1bf593a 100644
--- a/driver/PTP.c --- a/driver/PTP.c
@ -77,5 +92,4 @@ index 3d9debd..0ff2dfc 100644
+ //printk(KERN_WARNING "Channel %d copy ignored because it does not fit the available runtime channels (%d)", channel, runtime->channels); + //printk(KERN_WARNING "Channel %d copy ignored because it does not fit the available runtime channels (%d)", channel, runtime->channels);
return 0; return 0;
} }

17
build.sh
View File

@ -12,18 +12,17 @@ if [ ! -d ravenna-alsa-lkm.git ]; then
git clone https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm.git git clone https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm.git
cd ravenna-alsa-lkm cd ravenna-alsa-lkm
git checkout 35c708f3747474130790cf508c064360a9589ac8 git checkout 35c708f3747474130790cf508c064360a9589ac8
cd driver
echo "Apply patches to ravenna-alsa-lkm module ..." echo "Apply patches to ravenna-alsa-lkm module ..."
git apply ../../patches/ravenna-alsa-lkm-kernel-v5.patch git apply ../patches/ravenna-alsa-lkm-kernel-v5.patch
git apply ../../patches/ravenna-alsa-lkm-enable-loopback.patch git apply ../patches/ravenna-alsa-lkm-enable-loopback.patch
git apply ../../patches/ravenna-alsa-lkm-fixes.patch git apply ../patches/ravenna-alsa-lkm-fixes.patch
git apply ../../patches/ravenna-alsa-lkm-arm-32bit.patch git apply ../patches/ravenna-alsa-lkm-arm-32bit.patch
git apply ../../patches/ravenna-alsa-lkm-add-codec-am824.patch git apply ../patches/ravenna-alsa-lkm-add-codec-am824.patch
git apply ../../patches/ravenna-alsa-lkm-disable-ptp-checksum.patch git apply ../patches/ravenna-alsa-lkm-disable-ptp-checksum.patch
git apply ../../patches/ravenna-alsa-lkm-independent-playback-capture.path git apply ../patches/ravenna-alsa-lkm-independent-playback-capture.path
echo "Building ravenna-alsa-lkm kernel module ..." echo "Building ravenna-alsa-lkm kernel module ..."
make make
cd ../.. cd ..
fi fi
if [ ! -d cpp-httplib.git ]; then if [ ! -d cpp-httplib.git ]; then