diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/usb/dsbr100.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/usb/dsbr100.c')
| -rw-r--r-- | drivers/usb/dsbr100.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/drivers/usb/dsbr100.c b/drivers/usb/dsbr100.c index 22c21bb33..50bbafb31 100644 --- a/drivers/usb/dsbr100.c +++ b/drivers/usb/dsbr100.c @@ -15,7 +15,7 @@ You might find some interesting stuff about this module at http://unimut.fsk.uni-heidelberg.de/unimut/demi/dsbr - Copyright (c) 2000 Markus Demleitner + Copyright (c) 2000 Markus Demleitner <msdemlei@tucana.harvard.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,9 +33,12 @@ History: + Version 0.22: + Markus: Some (brown bag) cleanup in what VIDIOCSTUNER returns, + thanks to Mike Cox for pointing the problem out. + Version 0.21: - Markus Demleitner <msdemlei@tucana.harvard.edu>: - Minor cleanup, warnings if something goes wrong, lame attempt + Markus: Minor cleanup, warnings if something goes wrong, lame attempt to adhere to Documentation/CodingStyle Version 0.2: @@ -212,13 +215,14 @@ static int usb_dsbr100_ioctl(struct video_device *dev, unsigned int cmd, return -EFAULT; if(v.tuner) /* Only 1 tuner */ return -EINVAL; - v.rangelow=(87*16000); - v.rangehigh=(108*16000); - /*v.flags=VIDEO_TUNER_LOW;*/ - v.mode=VIDEO_MODE_AUTO; - v.signal=radio->stereo; - v.flags|=VIDEO_TUNER_STEREO_ON; - strcpy(v.name, "FM"); + v.rangelow = 87*16; + v.rangehigh = 108*16; + v.flags = VIDEO_TUNER_LOW; + v.mode = VIDEO_MODE_AUTO; + v.signal = radio->stereo*0x7000; + /* Don't know how to get signal strength */ + v.flags |= VIDEO_TUNER_STEREO_ON*radio->stereo; + strcpy(v.name, "DSB R-100"); if(copy_to_user(arg,&v, sizeof(v))) return -EFAULT; return 0; |