diff options
| author | Holger Waechtler <devnull@localhost> | 2003-11-10 22:59:55 +0000 |
|---|---|---|
| committer | Holger Waechtler <devnull@localhost> | 2003-11-10 22:59:55 +0000 |
| commit | f150f1d227c001922b6e4def0dfb731a9fb87cc6 (patch) | |
| tree | 46604c22ee92c37f99dd62a78e2665ca18082f37 | |
| parent | 7b828a4f8d1dabcc093871857c7a79c0256e6c91 (diff) | |
| download | mediapointer-dvb-s2-f150f1d227c001922b6e4def0dfb731a9fb87cc6.tar.gz mediapointer-dvb-s2-f150f1d227c001922b6e4def0dfb731a9fb87cc6.tar.bz2 | |
applied skystar2 tone burst patch by Vincenzo Di Massa and fixed a compile time cast warning
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/skystar2.c | 44 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_demux.c | 2 |
3 files changed, 48 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c index 4490cbc86..93491d2a1 100644 --- a/linux/drivers/media/dvb/b2c2/skystar2.c +++ b/linux/drivers/media/dvb/b2c2/skystar2.c @@ -4,6 +4,9 @@ * * Copyright (C) 2003 Vadim Catana, skystar@moldova.cc * + * FIX: DISEQC Tone Burst in flexcop_diseqc_ioctl() + * Vincenzo Di Massa, hawk.it at tiscalinet.it + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 2.1 @@ -2281,6 +2284,44 @@ static int flexcop_diseqc_ioctl(struct dvb_frontend *fe, unsigned int cmd, void struct dvb_frontend_info info; switch (cmd) { + + case FE_DISEQC_SEND_BURST: + { + u8 count; + dprintk("%s: FE_SEND_BURST ", __FUNCTION__); + fe_sec_mini_cmd_t b = (fe_sec_mini_cmd_t) arg; + switch ( b ) + { + case SEC_MINI_A: + { + dprintk("SEC_MINI_A\n"); + set_tuner_tone(adapter, 1); // This lines are needed + udelay(500*25); // to do a down-step + set_tuner_tone(adapter, 0); + udelay(500*25); + break; + } + case SEC_MINI_B: + { + dprintk("SEC_MINI_B\n"); + set_tuner_tone(adapter, 0); + udelay(1000*15); + for (count=0;count<9; count++) + { + set_tuner_tone(adapter, 1); + udelay(500); + set_tuner_tone(adapter, 0); + udelay(1000); + } + udelay(1000*15); + break; + } + default: + break; + }; + return 0; + } + case FE_SLEEP: { @@ -2511,5 +2552,8 @@ static void skystar2_cleanup(void) module_init(skystar2_init); module_exit(skystar2_cleanup); +MODULE_PARM(debug,"i"); +MODULE_PARM_DESC(debug, "enable verbose debug messages"); + MODULE_DESCRIPTION("Technisat SkyStar2 DVB PCI Driver"); MODULE_LICENSE("GPL"); diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 8ad4f1774..fa9073dd8 100644 --- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -111,7 +111,9 @@ static int master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg msgs[], in if (down_interruptible (&card->bt->gpio_lock)) return -ERESTARTSYS; - retval = i2c_transfer(card->i2c_adapter, msgs, num); + retval = i2c_transfer(card->i2c_adapter, + (struct i2c_msg*) msgs, + num); up(&card->bt->gpio_lock); diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c index d33157091..b2716a616 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c @@ -410,7 +410,7 @@ void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf, size_t cou void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count) { - int p = 0,i, j; + int p = 0, i, j; spin_lock(&demux->lock); |