Re: [RFC PATCH 4/3] remove radio-maestro
At Tue, 22 Mar 2011 15:44:05 -0300, Mauro Carvalho Chehab wrote: > > Hi Takashi, > > Em 19-03-2011 13:23, Ondrej Zary escreveu: > > Remove broken radio-maestro driver as the radio functionality is now > > integrated in the es1968 driver. > > I prefer if you could also add it on your tree, as we want to make sure that > this patch will be applied together with the patches that moved Maestro > support into the es1968 driver. > > I have no means to test if the es1968 changes work with a Maestro radio (as I > don't have this hardware), but I'm OK with this change. So: > > Acked-by: Mauro Carvalho Chehab OK, I removed it in my tree now. Thanks! Takashi -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC PATCH 4/3] remove radio-maestro
On Saturday, March 19, 2011 17:23:47 Ondrej Zary wrote: > Remove broken radio-maestro driver as the radio functionality is now > integrated in the es1968 driver. > > Signed-off-by: Ondrej Zary Acked-by: Hans Verkuil Also for patches 2 & 3 :-) Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC PATCH 4/3] remove radio-maestro
Hi Takashi,
Em 19-03-2011 13:23, Ondrej Zary escreveu:
> Remove broken radio-maestro driver as the radio functionality is now
> integrated in the es1968 driver.
I prefer if you could also add it on your tree, as we want to make sure that
this patch will be applied together with the patches that moved Maestro
support into the es1968 driver.
I have no means to test if the es1968 changes work with a Maestro radio (as I
don't have this hardware), but I'm OK with this change. So:
Acked-by: Mauro Carvalho Chehab
>
> Signed-off-by: Ondrej Zary
>
> diff -urNp linux-2.6.38-rc4-orig/drivers/media/radio/Kconfig
> linux-2.6.38-rc4/drivers/media/radio/Kconfig
> --- linux-2.6.38-rc4-orig/drivers/media/radio/Kconfig 2011-02-08
> 01:03:55.0 +0100
> +++ linux-2.6.38-rc4/drivers/media/radio/Kconfig 2011-03-19
> 17:12:32.0 +0100
> @@ -166,21 +166,6 @@ config RADIO_MAXIRADIO
> To compile this driver as a module, choose M here: the
> module will be called radio-maxiradio.
>
> -config RADIO_MAESTRO
> - tristate "Maestro on board radio"
> - depends on VIDEO_V4L2 && PCI
> - ---help---
> - Say Y here to directly support the on-board radio tuner on the
> - Maestro 2 or 2E sound card.
> -
> - In order to control your radio card, you will need to use programs
> - that are compatible with the Video For Linux API. Information on
> - this API and pointers to "v4l" programs may be found at
> - .
> -
> - To compile this driver as a module, choose M here: the
> - module will be called radio-maestro.
> -
> config RADIO_MIROPCM20
> tristate "miroSOUND PCM20 radio"
> depends on ISA && VIDEO_V4L2 && SND
> diff -urNp linux-2.6.38-rc4-orig/drivers/media/radio/Makefile
> linux-2.6.38-rc4/drivers/media/radio/Makefile
> --- linux-2.6.38-rc4-orig/drivers/media/radio/Makefile2011-02-08
> 01:03:55.0 +0100
> +++ linux-2.6.38-rc4/drivers/media/radio/Makefile 2011-03-19
> 17:12:39.0 +0100
> @@ -16,7 +16,6 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemt
> obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
> obj-$(CONFIG_I2C_SI4713) += si4713-i2c.o
> obj-$(CONFIG_RADIO_SI4713) += radio-si4713.o
> -obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
> obj-$(CONFIG_RADIO_MIROPCM20) += radio-miropcm20.o
> obj-$(CONFIG_USB_DSBR) += dsbr100.o
> obj-$(CONFIG_RADIO_SI470X) += si470x/
> diff -urNp linux-2.6.38-rc4-orig/drivers/media/radio/radio-maestro.c
> linux-2.6.38-rc4/drivers/media/radio/radio-maestro.c
> --- linux-2.6.38-rc4-orig/drivers/media/radio/radio-maestro.c 2011-02-08
> 01:03:55.0 +0100
> +++ linux-2.6.38-rc4/drivers/media/radio/radio-maestro.c 1970-01-01
> 01:00:00.0 +0100
> @@ -1,452 +0,0 @@
> -/* Maestro PCI sound card radio driver for Linux support
> - * (c) 2000 A. Tlalka, at...@pg.gda.pl
> - * Notes on the hardware
> - *
> - * + Frequency control is done digitally
> - * + No volume control - only mute/unmute - you have to use Aux line volume
> - * control on Maestro card to set the volume
> - * + Radio status (tuned/not_tuned and stereo/mono) is valid some time after
> - * frequency setting (>100ms) and only when the radio is unmuted.
> - * version 0.02
> - * + io port is automatically detected - only the first radio is used
> - * version 0.03
> - * + thread access locking additions
> - * version 0.04
> - * + code improvements
> - * + VIDEO_TUNER_LOW is permanent
> - *
> - * Converted to V4L2 API by Mauro Carvalho Chehab
> - */
> -
> -#include
> -#include
> -#include
> -#include
> -#include /* for KERNEL_VERSION MACRO */
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -
> -MODULE_AUTHOR("Adam Tlalka, at...@pg.gda.pl");
> -MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
> -MODULE_LICENSE("GPL");
> -
> -static int radio_nr = -1;
> -module_param(radio_nr, int, 0);
> -
> -#define RADIO_VERSION KERNEL_VERSION(0, 0, 6)
> -#define DRIVER_VERSION "0.06"
> -
> -#define GPIO_DATA0x60 /* port offset from ESS_IO_BASE */
> -
> -#define IO_MASK 4 /* mask register offset from
> GPIO_DATA
> - bits 1=unmask write to given bit */
> -#define IO_DIR 8 /* direction register offset from
> GPIO_DATA
> - bits 0/1=read/write direction */
> -
> -#define GPIO60x0040 /* mask bits for GPIO lines */
> -#define GPIO70x0080
> -#define GPIO80x0100
> -#define GPIO90x0200
> -
> -#define STR_DATA GPIO6 /* radio TEA5757 pins and GPIO bits */
> -#define STR_CLK GPIO7
> -#define STR_WREN GPIO8
> -#define STR_MOST GPIO9
> -
> -#define FREQ_LO 50*16000
> -#define FREQ_HI 150*16000
> -
> -#define FREQ_IF 171200 /* 10.7*16000 */
> -#define FREQ_STEP200/* 12.5*16 */
> -
> -#define FREQ2BI
[RFC PATCH 4/3] remove radio-maestro
Remove broken radio-maestro driver as the radio functionality is now
integrated in the es1968 driver.
Signed-off-by: Ondrej Zary
diff -urNp linux-2.6.38-rc4-orig/drivers/media/radio/Kconfig
linux-2.6.38-rc4/drivers/media/radio/Kconfig
--- linux-2.6.38-rc4-orig/drivers/media/radio/Kconfig 2011-02-08
01:03:55.0 +0100
+++ linux-2.6.38-rc4/drivers/media/radio/Kconfig2011-03-19
17:12:32.0 +0100
@@ -166,21 +166,6 @@ config RADIO_MAXIRADIO
To compile this driver as a module, choose M here: the
module will be called radio-maxiradio.
-config RADIO_MAESTRO
- tristate "Maestro on board radio"
- depends on VIDEO_V4L2 && PCI
- ---help---
- Say Y here to directly support the on-board radio tuner on the
- Maestro 2 or 2E sound card.
-
- In order to control your radio card, you will need to use programs
- that are compatible with the Video For Linux API. Information on
- this API and pointers to "v4l" programs may be found at
- .
-
- To compile this driver as a module, choose M here: the
- module will be called radio-maestro.
-
config RADIO_MIROPCM20
tristate "miroSOUND PCM20 radio"
depends on ISA && VIDEO_V4L2 && SND
diff -urNp linux-2.6.38-rc4-orig/drivers/media/radio/Makefile
linux-2.6.38-rc4/drivers/media/radio/Makefile
--- linux-2.6.38-rc4-orig/drivers/media/radio/Makefile 2011-02-08
01:03:55.0 +0100
+++ linux-2.6.38-rc4/drivers/media/radio/Makefile 2011-03-19
17:12:39.0 +0100
@@ -16,7 +16,6 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemt
obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
obj-$(CONFIG_I2C_SI4713) += si4713-i2c.o
obj-$(CONFIG_RADIO_SI4713) += radio-si4713.o
-obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
obj-$(CONFIG_RADIO_MIROPCM20) += radio-miropcm20.o
obj-$(CONFIG_USB_DSBR) += dsbr100.o
obj-$(CONFIG_RADIO_SI470X) += si470x/
diff -urNp linux-2.6.38-rc4-orig/drivers/media/radio/radio-maestro.c
linux-2.6.38-rc4/drivers/media/radio/radio-maestro.c
--- linux-2.6.38-rc4-orig/drivers/media/radio/radio-maestro.c 2011-02-08
01:03:55.0 +0100
+++ linux-2.6.38-rc4/drivers/media/radio/radio-maestro.c1970-01-01
01:00:00.0 +0100
@@ -1,452 +0,0 @@
-/* Maestro PCI sound card radio driver for Linux support
- * (c) 2000 A. Tlalka, at...@pg.gda.pl
- * Notes on the hardware
- *
- * + Frequency control is done digitally
- * + No volume control - only mute/unmute - you have to use Aux line volume
- * control on Maestro card to set the volume
- * + Radio status (tuned/not_tuned and stereo/mono) is valid some time after
- * frequency setting (>100ms) and only when the radio is unmuted.
- * version 0.02
- * + io port is automatically detected - only the first radio is used
- * version 0.03
- * + thread access locking additions
- * version 0.04
- * + code improvements
- * + VIDEO_TUNER_LOW is permanent
- *
- * Converted to V4L2 API by Mauro Carvalho Chehab
- */
-
-#include
-#include
-#include
-#include
-#include /* for KERNEL_VERSION MACRO */
-#include
-#include
-#include
-#include
-#include
-#include
-
-MODULE_AUTHOR("Adam Tlalka, at...@pg.gda.pl");
-MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
-MODULE_LICENSE("GPL");
-
-static int radio_nr = -1;
-module_param(radio_nr, int, 0);
-
-#define RADIO_VERSION KERNEL_VERSION(0, 0, 6)
-#define DRIVER_VERSION "0.06"
-
-#define GPIO_DATA 0x60 /* port offset from ESS_IO_BASE */
-
-#define IO_MASK4 /* mask register offset from
GPIO_DATA
- bits 1=unmask write to given bit */
-#define IO_DIR 8 /* direction register offset from GPIO_DATA
- bits 0/1=read/write direction */
-
-#define GPIO6 0x0040 /* mask bits for GPIO lines */
-#define GPIO7 0x0080
-#define GPIO8 0x0100
-#define GPIO9 0x0200
-
-#define STR_DATA GPIO6 /* radio TEA5757 pins and GPIO bits */
-#define STR_CLKGPIO7
-#define STR_WREN GPIO8
-#define STR_MOST GPIO9
-
-#define FREQ_LO 50*16000
-#define FREQ_HI150*16000
-
-#define FREQ_IF171200 /* 10.7*16000 */
-#define FREQ_STEP 200/* 12.5*16 */
-
-#define FREQ2BITS(x) unsigned int)(x)+FREQ_IF+(FREQ_STEP<<1))\
- /(FREQ_STEP<<2))<<2) /* (x==fmhz*16*1000) -> bits */
-
-#define BITS2FREQ(x) ((x) * FREQ_STEP - FREQ_IF)
-
-struct maestro {
- struct v4l2_device v4l2_dev;
- struct video_device vdev;
- struct pci_dev *pdev;
- struct mutex lock;
-
- u16 io; /* base of Maestro card radio io (GPIO_DATA)*/
- u16 muted; /* VIDEO_AUDIO_MUTE */
- u16 stereo; /* VIDEO_TUNER_STEREO_ON */
- u16 tuned; /* signal strength (0 or 0x) */
-};
-
-static inline struct maestro *to_maestro(struct v4l2_device *v4
