Skip to contentSkip to conversation

radio-si470x: separate common and usb code

PATCH Superseded Joonyoung Shim 1 participant 1 message Jul 13, 2009 Media (V4L/DVB)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 radio-si470x: separate common and usb code

This patch is a preceding work to add the i2c interface of si470x. The si470x directory includes a common file and usb specific file and header file.
The part unrelated with usb interface and i2c interface exists in radio-si470x-common.c file, and The usb specific part exists in radio-si470x-usb.c file.

---
 linux/drivers/media/radio/Kconfig                  |   26 +-
 linux/drivers/media/radio/Makefile                 |    2 +-
 linux/drivers/media/radio/radio-si470x.c           | 1869 --------------------
 linux/drivers/media/radio/si470x/Kconfig           |   24 +
 linux/drivers/media/radio/si470x/Makefile          |    7 +
 .../media/radio/si470x/radio-si470x-common.c       |  794 +++++++++
 .../drivers/media/radio/si470x/radio-si470x-usb.c  |  958 ++++++++++
 linux/drivers/media/radio/si470x/radio-si470x.h    |  201 +++
 8 files changed, 1989 insertions(+), 1892 deletions(-)
 delete mode 100644 linux/drivers/media/radio/radio-si470x.c
 create mode 100644 linux/drivers/media/radio/si470x/Kconfig
 create mode 100644 linux/drivers/media/radio/si470x/Makefile
 create mode 100644 linux/drivers/media/radio/si470x/radio-si470x-common.c
 create mode 100644 linux/drivers/media/radio/si470x/radio-si470x-usb.c
 create mode 100644 linux/drivers/media/radio/si470x/radio-si470x.h
linux/drivers/media/radio/Kconfig +4 -22
index 3315cac..41bbec6 100644
@@ -351,29 +351,11 @@ config USB_DSBR
 	  To compile this driver as a module, choose M here: the
 	  module will be called dsbr100.
 
-config USB_SI470X
-	tristate "Silicon Labs Si470x FM Radio Receiver support"
-	depends on USB && VIDEO_V4L2
-	---help---
-	  This is a driver for USB devices with the Silicon Labs SI470x
-	  chip. Currently these devices are known to work:
-	  - 10c4:818a: Silicon Labs USB FM Radio Reference Design
-	  - 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music)
-	  - 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700)
-
-	  Sound is provided by the ALSA USB Audio/MIDI driver. Therefore
-	  if you don't want to use the device solely for RDS receiving,
-	  it is recommended to also select SND_USB_AUDIO.
-
-	  Please have a look at the documentation, especially on how
-	  to redirect the audio stream from the radio to your sound device:
-	  Documentation/video4linux/si470x.txt
-
-	  Say Y here if you want to connect this type of radio to your
-	  computer's USB port.
+config RADIO_SI470X
+	bool "Silicon Labs Si470x FM Radio Receiver support"
+	depends on VIDEO_V4L2
 
-	  To compile this driver as a module, choose M here: the
-	  module will be called radio-si470x.
+source "drivers/media/radio/si470x/Kconfig"
 
 config USB_MR800
 	tristate "AverMedia MR 800 USB FM radio support"
linux/drivers/media/radio/Makefile +1 -1
index 0f2b35b..18111e1 100644
@@ -17,7 +17,7 @@ obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o
 obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
 obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
 obj-$(CONFIG_USB_DSBR) += dsbr100.o
-obj-$(CONFIG_USB_SI470X) += radio-si470x.o
+obj-$(CONFIG_RADIO_SI470X) += si470x/
 obj-$(CONFIG_USB_MR800) += radio-mr800.o
 obj-$(CONFIG_RADIO_TEA5764) += radio-tea5764.o
 
linux/drivers/media/radio/radio-si470x.c deleted +0 -1869

1,869 lines not on this page · raw message

linux/drivers/media/radio/si470x/Kconfig new file +24 -0
new file mode 100644
index 0000000..20d05c0
@@ -0,0 +1,24 @@
+config USB_SI470X
+	tristate "Silicon Labs Si470x FM Radio Receiver support with USB"
+	depends on USB && RADIO_SI470X
+	---help---
+	  This is a driver for USB devices with the Silicon Labs SI470x
+	  chip. Currently these devices are known to work:
+	  - 10c4:818a: Silicon Labs USB FM Radio Reference Design
+	  - 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music)
+	  - 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700)
+	  - 10c5:819a: Sanei Electric FM USB Radio (aka DealExtreme.com PCear)
+
+	  Sound is provided by the ALSA USB Audio/MIDI driver. Therefore
+	  if you don't want to use the device solely for RDS receiving,
+	  it is recommended to also select SND_USB_AUDIO.
+
+	  Please have a look at the documentation, especially on how
+	  to redirect the audio stream from the radio to your sound device:
+	  Documentation/video4linux/si470x.txt
+
+	  Say Y here if you want to connect this type of radio to your
+	  computer's USB port.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called radio-usb-si470x.
linux/drivers/media/radio/si470x/Makefile new file +7 -0
new file mode 100644
index 0000000..3cb777f
@@ -0,0 +1,7 @@
+#
+# Makefile for radios with Silicon Labs Si470x FM Radio Receivers
+#
+
+radio-usb-si470x-objs	:= radio-si470x-usb.o radio-si470x-common.o
+
+obj-$(CONFIG_USB_SI470X) += radio-usb-si470x.o
linux/drivers/media/radio/si470x/radio-si470x-common.c new file +794 -0

794 lines not on this page · raw message

linux/drivers/media/radio/si470x/radio-si470x-usb.c new file +958 -0

265 lines not on this page · raw message

linux/drivers/media/radio/si470x/radio-si470x.h new file +201 -0

201 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.0.4

Part of the diff is not shown here. View the raw message.