]> err.no Git - linux-2.6/commitdiff
V4L/DVB (3248): Add selected input to saa7115 VIDIOC_LOG_STATUS output.
authorHans Verkuil <hverkuil@xs4all.nl>
Mon, 9 Jan 2006 17:25:41 +0000 (15:25 -0200)
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>
Mon, 9 Jan 2006 17:25:41 +0000 (15:25 -0200)
- 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>
drivers/media/video/saa7115.c

index 685ca1780c66a73cd3cfed2dd314171b1558db09..b175389d9f43568ef0df147f550c04751686f505 100644 (file)
@@ -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");