diff options
-rw-r--r-- | Documentation/video4linux/si470x.txt | 11 | ||||
-rw-r--r-- | drivers/media/radio/radio-si470x.c | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/Documentation/video4linux/si470x.txt b/Documentation/video4linux/si470x.txt index 49679e6aaa76..3a7823e01b4d 100644 --- a/Documentation/video4linux/si470x.txt +++ b/Documentation/video4linux/si470x.txt | |||
@@ -1,6 +1,6 @@ | |||
1 | Driver for USB radios for the Silicon Labs Si470x FM Radio Receivers | 1 | Driver for USB radios for the Silicon Labs Si470x FM Radio Receivers |
2 | 2 | ||
3 | Copyright (c) 2008 Tobias Lorenz <tobias.lorenz@gmx.net> | 3 | Copyright (c) 2009 Tobias Lorenz <tobias.lorenz@gmx.net> |
4 | 4 | ||
5 | 5 | ||
6 | Information from Silicon Labs | 6 | Information from Silicon Labs |
@@ -41,7 +41,7 @@ chips are known to work: | |||
41 | - 10c4:818a: Silicon Labs USB FM Radio Reference Design | 41 | - 10c4:818a: Silicon Labs USB FM Radio Reference Design |
42 | - 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF) | 42 | - 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF) |
43 | - 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700) | 43 | - 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700) |
44 | - 10c5:819a: DealExtreme USB Radio | 44 | - 10c5:819a: Sanei Electric, Inc. FM USB Radio (sold as DealExtreme.com PCear) |
45 | 45 | ||
46 | 46 | ||
47 | Software | 47 | Software |
@@ -52,6 +52,7 @@ Testing is usually done with most application under Debian/testing: | |||
52 | - gradio - GTK FM radio tuner | 52 | - gradio - GTK FM radio tuner |
53 | - kradio - Comfortable Radio Application for KDE | 53 | - kradio - Comfortable Radio Application for KDE |
54 | - radio - ncurses-based radio application | 54 | - radio - ncurses-based radio application |
55 | - mplayer - The Ultimate Movie Player For Linux | ||
55 | 56 | ||
56 | There is also a library libv4l, which can be used. It's going to have a function | 57 | There is also a library libv4l, which can be used. It's going to have a function |
57 | for frequency seeking, either by using hardware functionality as in radio-si470x | 58 | for frequency seeking, either by using hardware functionality as in radio-si470x |
@@ -69,7 +70,7 @@ Audio Listing | |||
69 | USB Audio is provided by the ALSA snd_usb_audio module. It is recommended to | 70 | USB Audio is provided by the ALSA snd_usb_audio module. It is recommended to |
70 | also select SND_USB_AUDIO, as this is required to get sound from the radio. For | 71 | also select SND_USB_AUDIO, as this is required to get sound from the radio. For |
71 | listing you have to redirect the sound, for example using one of the following | 72 | listing you have to redirect the sound, for example using one of the following |
72 | commands. | 73 | commands. Please adjust the audio devices to your needs (/dev/dsp* and hw:x,x). |
73 | 74 | ||
74 | If you just want to test audio (very poor quality): | 75 | If you just want to test audio (very poor quality): |
75 | cat /dev/dsp1 > /dev/dsp | 76 | cat /dev/dsp1 > /dev/dsp |
@@ -80,6 +81,10 @@ sox -2 --endian little -r 96000 -t oss /dev/dsp1 -t oss /dev/dsp | |||
80 | If you use arts try: | 81 | If you use arts try: |
81 | arecord -D hw:1,0 -r96000 -c2 -f S16_LE | artsdsp aplay -B - | 82 | arecord -D hw:1,0 -r96000 -c2 -f S16_LE | artsdsp aplay -B - |
82 | 83 | ||
84 | If you use mplayer try: | ||
85 | mplayer -radio adevice=hw=1.0:arate=96000 \ | ||
86 | -rawaudio rate=96000 \ | ||
87 | radio://<frequency>/capture | ||
83 | 88 | ||
84 | Module Parameters | 89 | Module Parameters |
85 | ================= | 90 | ================= |
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c index dc72803ad209..8743a521e4af 100644 --- a/drivers/media/radio/radio-si470x.c +++ b/drivers/media/radio/radio-si470x.c | |||
@@ -5,8 +5,9 @@ | |||
5 | * - Silicon Labs USB FM Radio Reference Design | 5 | * - Silicon Labs USB FM Radio Reference Design |
6 | * - ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF) | 6 | * - ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF) |
7 | * - KWorld USB FM Radio SnapMusic Mobile 700 (FM700) | 7 | * - KWorld USB FM Radio SnapMusic Mobile 700 (FM700) |
8 | * - Sanei Electric, Inc. FM USB Radio (sold as DealExtreme.com PCear) | ||
8 | * | 9 | * |
9 | * Copyright (c) 2008 Tobias Lorenz <tobias.lorenz@gmx.net> | 10 | * Copyright (c) 2009 Tobias Lorenz <tobias.lorenz@gmx.net> |
10 | * | 11 | * |
11 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
12 | * it under the terms of the GNU General Public License as published by | 13 | * it under the terms of the GNU General Public License as published by |
@@ -29,7 +30,7 @@ | |||
29 | * 2008-01-12 Tobias Lorenz <tobias.lorenz@gmx.net> | 30 | * 2008-01-12 Tobias Lorenz <tobias.lorenz@gmx.net> |
30 | * Version 1.0.0 | 31 | * Version 1.0.0 |
31 | * - First working version | 32 | * - First working version |
32 | * 2008-01-13 Tobias Lorenz <tobias.lorenz@gmx.net> | 33 | * 2008-01-13 Tobias Lorenz <tobias.lorenz@gmx.net> |
33 | * Version 1.0.1 | 34 | * Version 1.0.1 |
34 | * - Improved error handling, every function now returns errno | 35 | * - Improved error handling, every function now returns errno |
35 | * - Improved multi user access (start/mute/stop) | 36 | * - Improved multi user access (start/mute/stop) |
@@ -145,7 +146,7 @@ static struct usb_device_id si470x_usb_driver_id_table[] = { | |||
145 | { USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) }, | 146 | { USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) }, |
146 | /* KWorld USB FM Radio SnapMusic Mobile 700 (FM700) */ | 147 | /* KWorld USB FM Radio SnapMusic Mobile 700 (FM700) */ |
147 | { USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) }, | 148 | { USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) }, |
148 | /* DealExtreme USB Radio */ | 149 | /* Sanei Electric, Inc. FM USB Radio (sold as DealExtreme.com PCear) */ |
149 | { USB_DEVICE_AND_INTERFACE_INFO(0x10c5, 0x819a, USB_CLASS_HID, 0, 0) }, | 150 | { USB_DEVICE_AND_INTERFACE_INFO(0x10c5, 0x819a, USB_CLASS_HID, 0, 0) }, |
150 | /* Terminating entry */ | 151 | /* Terminating entry */ |
151 | { } | 152 | { } |
@@ -345,7 +346,7 @@ MODULE_PARM_DESC(rds_poll_time, "RDS poll time (ms): *40*"); | |||
345 | 346 | ||
346 | /* Report 19: stream */ | 347 | /* Report 19: stream */ |
347 | #define STREAM_REPORT_SIZE 3 | 348 | #define STREAM_REPORT_SIZE 3 |
348 | #define STREAM_REPORT 19 | 349 | #define STREAM_REPORT 19 |
349 | 350 | ||
350 | /* Report 20: scratch */ | 351 | /* Report 20: scratch */ |
351 | #define SCRATCH_PAGE_SIZE 63 | 352 | #define SCRATCH_PAGE_SIZE 63 |
@@ -414,7 +415,7 @@ MODULE_PARM_DESC(rds_poll_time, "RDS poll time (ms): *40*"); | |||
414 | 415 | ||
415 | /* bootloader commands */ | 416 | /* bootloader commands */ |
416 | #define GET_SW_VERSION_COMMAND 0x00 | 417 | #define GET_SW_VERSION_COMMAND 0x00 |
417 | #define SET_PAGE_COMMAND 0x01 | 418 | #define SET_PAGE_COMMAND 0x01 |
418 | #define ERASE_PAGE_COMMAND 0x02 | 419 | #define ERASE_PAGE_COMMAND 0x02 |
419 | #define WRITE_PAGE_COMMAND 0x03 | 420 | #define WRITE_PAGE_COMMAND 0x03 |
420 | #define CRC_ON_PAGE_COMMAND 0x04 | 421 | #define CRC_ON_PAGE_COMMAND 0x04 |