From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 9 Jan 2006 17:25:41 +0000 (-0200)
Subject: V4L/DVB (3248): Add selected input to saa7115 VIDIOC_LOG_STATUS output.
X-Git-Tag: v2.6.16-rc1~663^2~54
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=21fa715e67fe57e404d7f5f39b7f18016db9e4b6;p=linux-2.6-omap-h63xx.git

V4L/DVB (3248): Add selected input to saa7115 VIDIOC_LOG_STATUS output.


- Add selected input to VIDIOC_LOG_STATUS output.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---

diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 685ca1780c6..b175389d9f4 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -801,6 +801,11 @@ static void saa7115_log_status(struct i2c_client *client)
 	signalOk = (reg1f & 0xc1) == 0x81 && (reg1e & 0xc0) == 0x80;
 	vcr = !(reg1f & 0x10);
 
+	if (state->input >= 6) {
+		saa7115_info("Input:           S-Video %d\n", state->input - 6);
+	} else {
+		saa7115_info("Input:           Composite %d\n", state->input);
+	}
 	saa7115_info("Video signal:    %s\n", signalOk ? (vcr ? "VCR" : "broadcast/DVD") : "bad");
 	saa7115_info("Frequency:       %s\n", (reg1f & 0x20) ? "60Hz" : "50Hz");