From c87f5681888863acc433d1e129992cc2d29e0463 Mon Sep 17 00:00:00 2001 From: Mark Farrugia Date: Fri, 1 Mar 2019 17:05:29 +1100 Subject: Update some helper scripts Signed-off-by: Mark Farrugia --- scripts/load.sh | 2 +- scripts/make-agl.sh | 2 +- scripts/test_configfs.sh | 21 --------------------- scripts/test_configfs_cleanup.sh | 6 ++++++ scripts/test_configfs_run.sh | 21 +++++++++++++++++++++ scripts/unload.sh | 4 ++-- sound/avirt.h | 2 +- 7 files changed, 32 insertions(+), 26 deletions(-) delete mode 100755 scripts/test_configfs.sh create mode 100755 scripts/test_configfs_cleanup.sh create mode 100755 scripts/test_configfs_run.sh diff --git a/scripts/load.sh b/scripts/load.sh index 103a63b..e3f21b4 100755 --- a/scripts/load.sh +++ b/scripts/load.sh @@ -8,6 +8,6 @@ insmod dummy/snd-avirt-ap-dummy.ko insmod loopback/snd-avirt-ap-loopback.ko # Run the test script -./scripts/test_configfs.sh +./scripts/test_configfs_run.sh echo "Drivers Loaded!" diff --git a/scripts/make-agl.sh b/scripts/make-agl.sh index 34afff4..f4a6235 100755 --- a/scripts/make-agl.sh +++ b/scripts/make-agl.sh @@ -1,7 +1,7 @@ #!/bin/bash SDK_ROOT=/opt/agl-sdk -SDK_VERSION=6.99.4 +SDK_VERSION=7.0.0 SDK_VAR=aarch64 # Source environment diff --git a/scripts/test_configfs.sh b/scripts/test_configfs.sh deleted file mode 100755 index b6a56f6..0000000 --- a/scripts/test_configfs.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -mkdir -p /config && mount -t configfs none /config - -mkdir /config/snd-avirt/streams/playback_media -echo "2">/config/snd-avirt/streams/playback_media/channels -echo "ap_loopback">/config/snd-avirt/streams/playback_media/map - -mkdir /config/snd-avirt/streams/playback_navigation -echo "1">/config/snd-avirt/streams/playback_navigation/channels -echo "ap_loopback">/config/snd-avirt/streams/playback_navigation/map - -mkdir /config/snd-avirt/streams/playback_emergency -echo "1">/config/snd-avirt/streams/playback_emergency/channels -echo "ap_loopback">/config/snd-avirt/streams/playback_emergency/map - -mkdir /config/snd-avirt/streams/capture_voice -echo "1">/config/snd-avirt/streams/capture_voice/channels -echo "ap_loopback">/config/snd-avirt/streams/capture_voice/map - -echo "1">/config/snd-avirt/streams/sealed diff --git a/scripts/test_configfs_cleanup.sh b/scripts/test_configfs_cleanup.sh new file mode 100755 index 0000000..9697818 --- /dev/null +++ b/scripts/test_configfs_cleanup.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +rmdir /config/snd-avirt/streams/playback_media +rmdir /config/snd-avirt/streams/playback_navigation +rmdir /config/snd-avirt/streams/playback_emergency +rmdir /config/snd-avirt/streams/capture_voice diff --git a/scripts/test_configfs_run.sh b/scripts/test_configfs_run.sh new file mode 100755 index 0000000..b6a56f6 --- /dev/null +++ b/scripts/test_configfs_run.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +mkdir -p /config && mount -t configfs none /config + +mkdir /config/snd-avirt/streams/playback_media +echo "2">/config/snd-avirt/streams/playback_media/channels +echo "ap_loopback">/config/snd-avirt/streams/playback_media/map + +mkdir /config/snd-avirt/streams/playback_navigation +echo "1">/config/snd-avirt/streams/playback_navigation/channels +echo "ap_loopback">/config/snd-avirt/streams/playback_navigation/map + +mkdir /config/snd-avirt/streams/playback_emergency +echo "1">/config/snd-avirt/streams/playback_emergency/channels +echo "ap_loopback">/config/snd-avirt/streams/playback_emergency/map + +mkdir /config/snd-avirt/streams/capture_voice +echo "1">/config/snd-avirt/streams/capture_voice/channels +echo "ap_loopback">/config/snd-avirt/streams/capture_voice/map + +echo "1">/config/snd-avirt/streams/sealed diff --git a/scripts/unload.sh b/scripts/unload.sh index a18e1f5..acce310 100755 --- a/scripts/unload.sh +++ b/scripts/unload.sh @@ -1,7 +1,7 @@ #!/bin/sh -rmdir /config/snd-avirt/streams/playback_* -rmdir /config/snd-avirt/streams/capture_* +# Cleanup the configfs filesystem +./scripts/test_configfs_cleanup.sh rm_module() { lsmod |grep "^$1\>" && rmmod $1 || true diff --git a/sound/avirt.h b/sound/avirt.h index 92bb07d..6f15143 100644 --- a/sound/avirt.h +++ b/sound/avirt.h @@ -3,7 +3,7 @@ * AVIRT - ALSA Virtual Soundcard * * Copyright (c) 2010-2018 Fiberdyne Systems Pty Ltd - * + * * avirt.h - AVIRT system-level header */ -- cgit 1.2.3-korg