linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiunn Chang <c0d1n61at3@gmail.com>
To: linux-media@vger.kernel.org,
	linux-kernel-mentees@lists.linuxfoundation.org
Cc: hverkuil@xs4all.nl
Subject: [PATCH v2 1/2] cec-follower: add tuner step increment/decrement
Date: Tue, 24 Sep 2019 14:24:44 -0500	[thread overview]
Message-ID: <20190924192445.93575-2-c0d1n61at3@gmail.com> (raw)
In-Reply-To: <20190924141752.5508-1-c0d1n61at3@gmail.com>

Tuner step increment/decrement will select the next highest or next
lowest service frequency.  There are a total of three possible
frequencies from analog_freqs_khz given a broadcast type and system.

Opcodes implemented:
  - <Tuner Step Increment>
  - <Tuner Step Decrement>

Signed-off-by: Jiunn Chang <c0d1n61at3@gmail.com>
---
 utils/cec-follower/cec-tuner.cpp | 47 ++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/utils/cec-follower/cec-tuner.cpp b/utils/cec-follower/cec-tuner.cpp
index acc3fd00..1a9b9d90 100644
--- a/utils/cec-follower/cec-tuner.cpp
+++ b/utils/cec-follower/cec-tuner.cpp
@@ -135,6 +135,22 @@ static bool analog_set_tuner_dev_info(struct node *node, struct cec_msg *msg)
 	return false;
 }
 
+static int analog_find_freq_index(struct cec_op_tuner_device_info *info)
+{
+	if (info->analog.ana_freq == 0)
+		return -1;
+
+	int ana_freq_khz = (info->analog.ana_freq * 625) / 10;
+
+	for (int i = 0; i < NUM_ANALOG_FREQS; i++) {
+		int freq = analog_freqs_khz[info->analog.ana_bcast_type][info->analog.bcast_system][i];
+
+		if (ana_freq_khz == freq)
+			return i;
+	}
+	return -1;
+}
+
 void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, unsigned me)
 {
 	bool is_bcast = cec_msg_is_broadcast(&msg);
@@ -178,12 +194,37 @@ void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, uns
 		return;
 
 	case CEC_MSG_SELECT_DIGITAL_SERVICE:
-	case CEC_MSG_TUNER_STEP_DECREMENT:
-	case CEC_MSG_TUNER_STEP_INCREMENT:
-		if (!cec_has_tuner(1 << me))
+	case CEC_MSG_TUNER_STEP_DECREMENT: {
+		if (!cec_has_tuner(1 << me) && !cec_has_tv(1 << me))
 			break;
+
+		struct cec_op_tuner_device_info *info = &node->state.tuner_dev_info;
+		int freq_idx = analog_find_freq_index(info);
+		int idx = (freq_idx == 0) ? NUM_ANALOG_FREQS : freq_idx;
+
+		if (info->is_analog) {
+			int freq = analog_freqs_khz[info->analog.ana_bcast_type][info->analog.bcast_system][--idx];
+
+			info->analog.ana_freq = (freq * 10) / 625;
+		}
 		return;
+	}
+
+	case CEC_MSG_TUNER_STEP_INCREMENT: {
+		if (!cec_has_tuner(1 << me) && !cec_has_tv(1 << me))
+			break;
 
+		struct cec_op_tuner_device_info *info = &node->state.tuner_dev_info;
+		int freq_idx = analog_find_freq_index(info);
+		int idx = (freq_idx == NUM_ANALOG_FREQS - 1) ? -1 : freq_idx;
+
+		if (info->is_analog) {
+			int freq = analog_freqs_khz[info->analog.ana_bcast_type][info->analog.bcast_system][++idx];
+
+			info->analog.ana_freq = (freq * 10) / 625;
+		}
+		return;
+	}
 
 		/*
 		  One Touch Record
-- 
2.23.0


  parent reply	other threads:[~2019-09-24 19:24 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-24 14:17 [PATCH 0/2] cec-compliance: tuner control Jiunn Chang
2019-09-24 14:17 ` [PATCH 1/2] cec-follower: add tuner step increment/decrement Jiunn Chang
2019-09-24 15:20   ` Hans Verkuil
2019-09-24 14:17 ` [PATCH 2/2] cec-compliance: add/refactor tuner control tests Jiunn Chang
2019-09-24 19:24 ` [PATCH v2 0/2] cec-compliance: tuner control Jiunn Chang
2019-09-30  4:30   ` [PATCH v3 0/3] " Jiunn Chang
2019-10-01  3:18     ` [PATCH v4 " Jiunn Chang
2019-10-03  3:18       ` [PATCH v5 0/2] " Jiunn Chang
2019-10-04  4:05         ` [PATCH v6 0/1] " Jiunn Chang
2019-10-04  4:05         ` [PATCH v6 1/1] Add test for new features in cec-follower Jiunn Chang
2019-10-03  3:18       ` [PATCH v5 1/2] cec-follower: add tuner step increment/decrement Jiunn Chang
2019-10-03  3:18       ` [PATCH v5 2/2] Add test for new features in cec-follower Jiunn Chang
2019-10-03  6:51         ` Hans Verkuil
2019-10-01  3:18     ` [PATCH v4 1/3] cec-follower: fix bugs for tuner emulation Jiunn Chang
2019-10-01  3:18     ` [PATCH v4 2/3] cec-follower: add tuner step increment/decrement Jiunn Chang
2019-10-01  7:12       ` Hans Verkuil
2019-10-01  3:18     ` [PATCH v4 3/3] cec-compliance: add tuner control test Jiunn Chang
2019-10-01  7:51       ` Hans Verkuil
2019-09-30  4:30   ` [PATCH v3 1/3] cec-follower: fix bugs for tuner emulation Jiunn Chang
2019-09-30  9:12     ` Hans Verkuil
2019-09-30  4:30   ` [PATCH v3 2/3] cec-follower: add tuner step increment/decrement Jiunn Chang
2019-09-30  9:35     ` Hans Verkuil
2019-09-30  4:30   ` [PATCH v3 3/3] cec-compliance: refactor tuner control tests Jiunn Chang
2019-09-30  9:43     ` Hans Verkuil
2019-09-24 19:24 ` Jiunn Chang [this message]
2019-09-24 19:31   ` [Linux-kernel-mentees] [PATCH v2 1/2] cec-follower: add tuner step increment/decrement Shuah Khan
2019-09-25  6:54   ` Hans Verkuil
2019-09-25  7:12     ` Hans Verkuil
2019-09-24 19:24 ` [PATCH v2 2/2] cec-compliance: add/refactor tuner control tests Jiunn Chang
2019-09-24 19:44   ` [Linux-kernel-mentees] " Shuah Khan
2019-09-25  7:22   ` Hans Verkuil

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190924192445.93575-2-c0d1n61at3@gmail.com \
    --to=c0d1n61at3@gmail.com \
    --cc=hverkuil@xs4all.nl \
    --cc=linux-kernel-mentees@lists.linuxfoundation.org \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).