From e0b6971cb5e15529396b0c4795058dec2329f97e Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 27 May 2016 15:54:44 +0300
Subject: vsp-lib: Create a function to get subdev from entity name

And use the function in the vsp-runner script instead of duplicating the
same code in multiple locations.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 scripts/vsp-lib.sh    |  4 ++++
 scripts/vsp-runner.sh | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/vsp-lib.sh b/scripts/vsp-lib.sh
index d48108a..0e7fa5a 100755
--- a/scripts/vsp-lib.sh
+++ b/scripts/vsp-lib.sh
@@ -31,6 +31,10 @@ vsp1_count_bru_inputs() {
 	echo $((num_pads-1))
 }
 
+vsp1_entity_subdev() {
+	$mediactl -d $mdev -e "$dev $1"
+}
+
 vsp1_entity_get_size() {
 	entity=$1
 	pad=$2
diff --git a/scripts/vsp-runner.sh b/scripts/vsp-runner.sh
index 6aa72a2..d944e74 100755
--- a/scripts/vsp-runner.sh
+++ b/scripts/vsp-runner.sh
@@ -102,11 +102,10 @@ execute() {
 	case $cmd in
 	hgo)
 		if [ "x$options" = xinfinite ] ; then
-			$yavta -c -n 4 \
-				`$mediactl -d $mdev -e "$dev hgo histo"`
+			$yavta -c -n 4 $(vsp1_entity_subdev "hgo histo")
 		else
 			$yavta -c10 -n 10 --file=histo-#.bin $options \
-				`$mediactl -d $mdev -e "$dev hgo histo"`
+				$(vsp1_entity_subdev "hgo histo")
 		fi
 		;;
 
@@ -119,10 +118,10 @@ execute() {
 
 		if [ "x$options" = xinfinite ] ; then
 			$yavta -c -n 4 -f $infmt -s $size --file=$file $options \
-				`$mediactl -d $mdev -e "$dev $rpf input"`
+				$(vsp1_entity_subdev "$rpf input")
 		else
 			$yavta -c10 -n 4 -f $infmt -s $size --file=$file $options \
-				`$mediactl -d $mdev -e "$dev $rpf input"`
+				$(vsp1_entity_subdev "$rpf input")
 		fi
 
 		rm -f $file
@@ -134,10 +133,10 @@ execute() {
 
 		if [ "x$options" = xinfinite ] ; then
 			$yavta -c -n 4 -f $outfmt -s $size \
-				`$mediactl -d $mdev -e "$dev $wpf output"`
+				$(vsp1_entity_subdev "$wpf output")
 		else
 			$yavta -c10 -n 4 -f $outfmt -s $size --skip 7 -F $options \
-				`$mediactl -d $mdev -e "$dev $wpf output"`
+				$(vsp1_entity_subdev "$wpf output")
 		fi
 		;;
 	esac
-- 
cgit v1.2.3