diff options
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 5 | ||||
| -rw-r--r-- | v4l/ChangeLog | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index 9c32000e5..c4e203715 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -729,6 +729,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) ? "60 Hz" : "50 Hz"); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 6604a5b88..267f0a83f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-12-28 14:40 hverkuil + + * linux/drivers/media/video/saa7115.c: (saa7115_log_status): + - Add selected input to VIDIOC_LOG_STATUS output. + + Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> + 2005-12-28 14:38 hverkuil * linux/drivers/media/video/wm8775.c: (wm8775_command): |