aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-01-09 12:25:41 -0500
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 12:25:41 -0500
commit21fa715e67fe57e404d7f5f39b7f18016db9e4b6 (patch)
treefc04788623f46505d1d5695a5746f9e6a23aa572 /drivers/media
parentfbc46e74fa437f16a3ffe4a5561a97f41680a124 (diff)
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7115.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 685ca1780c66..b175389d9f43 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)
801 signalOk = (reg1f & 0xc1) == 0x81 && (reg1e & 0xc0) == 0x80; 801 signalOk = (reg1f & 0xc1) == 0x81 && (reg1e & 0xc0) == 0x80;
802 vcr = !(reg1f & 0x10); 802 vcr = !(reg1f & 0x10);
803 803
804 if (state->input >= 6) {
805 saa7115_info("Input: S-Video %d\n", state->input - 6);
806 } else {
807 saa7115_info("Input: Composite %d\n", state->input);
808 }
804 saa7115_info("Video signal: %s\n", signalOk ? (vcr ? "VCR" : "broadcast/DVD") : "bad"); 809 saa7115_info("Video signal: %s\n", signalOk ? (vcr ? "VCR" : "broadcast/DVD") : "bad");
805 saa7115_info("Frequency: %s\n", (reg1f & 0x20) ? "60Hz" : "50Hz"); 810 saa7115_info("Frequency: %s\n", (reg1f & 0x20) ? "60Hz" : "50Hz");
806 811