* [PATCH 1/5] tm6000: bugfix select moduls @ 2010-05-23 18:29 stefan.ringel 2010-05-23 18:29 ` [PATCH 2/5] tm6000: add power led off stefan.ringel 2010-05-23 18:29 ` [PATCH 3/5] tm6000: set variable dev_mode in function tm6000_start_stream stefan.ringel 0 siblings, 2 replies; 3+ messages in thread From: stefan.ringel @ 2010-05-23 18:29 UTC (permalink / raw) To: linux-media; +Cc: mchehab, d.belimov, Stefan Ringel From: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> --- drivers/staging/tm6000/Kconfig | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/staging/tm6000/Kconfig b/drivers/staging/tm6000/Kconfig index 5fe759c..3657e33 100644 --- a/drivers/staging/tm6000/Kconfig +++ b/drivers/staging/tm6000/Kconfig @@ -2,7 +2,8 @@ config VIDEO_TM6000 tristate "TV Master TM5600/6000/6010 driver" depends on VIDEO_DEV && I2C && INPUT && USB && EXPERIMENTAL select VIDEO_TUNER - select TUNER_XC2028 + select MEDIA_TUNER_XC2028 + select MEDIA_TUNER_XC5000 select VIDEOBUF_VMALLOC help Support for TM5600/TM6000/TM6010 USB Device -- 1.7.0.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/5] tm6000: add power led off 2010-05-23 18:29 [PATCH 1/5] tm6000: bugfix select moduls stefan.ringel @ 2010-05-23 18:29 ` stefan.ringel 2010-05-23 18:29 ` [PATCH 3/5] tm6000: set variable dev_mode in function tm6000_start_stream stefan.ringel 1 sibling, 0 replies; 3+ messages in thread From: stefan.ringel @ 2010-05-23 18:29 UTC (permalink / raw) To: linux-media; +Cc: mchehab, d.belimov, Stefan Ringel From: Stefan Ringel <stefan.ringel@arcor.de> - add power led off, if device is disconnected Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> --- drivers/staging/tm6000/tm6000-cards.c | 19 +++++++++++++++++++ drivers/staging/tm6000/tm6000-core.c | 13 +++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 33b134b..553ebe4 100644 --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -925,6 +925,25 @@ static void tm6000_usb_disconnect(struct usb_interface *interface) } #endif + if (dev->gpio.power_led) { + switch (dev->model) { + case TM6010_BOARD_HAUPPAUGE_900H: + case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE: + case TM6010_BOARD_TWINHAN_TU501: + /* Power led off */ + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, + dev->gpio.power_led, 0x01); + msleep(15); + break; + case TM6010_BOARD_BEHOLD_WANDER: + case TM6010_BOARD_BEHOLD_VOYAGER: + /* Power led off */ + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, + dev->gpio.power_led, 0x00); + msleep(15); + break; + } + } tm6000_v4l2_unregister(dev); tm6000_i2c_unregister(dev); diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index 1259ae5..624c276 100644 --- a/drivers/staging/tm6000/tm6000-core.c +++ b/drivers/staging/tm6000/tm6000-core.c @@ -323,6 +323,12 @@ int tm6000_init_analog_mode (struct tm6000_core *dev) tm6000_set_standard (dev, &dev->norm); tm6000_set_audio_bitrate (dev,48000); + /* switch dvb led off */ + if (dev->gpio.dvb_led) { + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, + dev->gpio.dvb_led, 0x01); + } + return 0; } @@ -375,6 +381,13 @@ int tm6000_init_digital_mode (struct tm6000_core *dev) tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT, 0x0020, 0x00); msleep(100); } + + /* switch dvb led on */ + if (dev->gpio.dvb_led) { + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, + dev->gpio.dvb_led, 0x00); + } + return 0; } -- 1.7.0.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/5] tm6000: set variable dev_mode in function tm6000_start_stream 2010-05-23 18:29 [PATCH 1/5] tm6000: bugfix select moduls stefan.ringel 2010-05-23 18:29 ` [PATCH 2/5] tm6000: add power led off stefan.ringel @ 2010-05-23 18:29 ` stefan.ringel 1 sibling, 0 replies; 3+ messages in thread From: stefan.ringel @ 2010-05-23 18:29 UTC (permalink / raw) To: linux-media; +Cc: mchehab, d.belimov, Stefan Ringel From: Stefan Ringel <stefan.ringel@arcor.de> set variable dev_mode in function tm6000_start_stream and check mode Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> --- drivers/staging/tm6000/tm6000-dvb.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c index eafc89c..e6a802e 100644 --- a/drivers/staging/tm6000/tm6000-dvb.c +++ b/drivers/staging/tm6000/tm6000-dvb.c @@ -100,7 +100,10 @@ int tm6000_start_stream(struct tm6000_core *dev) printk(KERN_INFO "tm6000: got start stream request %s\n",__FUNCTION__); - tm6000_init_digital_mode(dev); + if (dev->mode != TM6000_MODE_DIGITAL) { + tm6000_init_digital_mode(dev); + dev->mode = TM6000_MODE_DIGITAL; + } dvb->bulk_urb = usb_alloc_urb(0, GFP_KERNEL); if(dvb->bulk_urb == NULL) { -- 1.7.0.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-23 18:31 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-05-23 18:29 [PATCH 1/5] tm6000: bugfix select moduls stefan.ringel 2010-05-23 18:29 ` [PATCH 2/5] tm6000: add power led off stefan.ringel 2010-05-23 18:29 ` [PATCH 3/5] tm6000: set variable dev_mode in function tm6000_start_stream stefan.ringel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).