All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] DiSEqC bug fixed for stv0288 based interfaces
@ 2010-09-01 12:35 Josef Pavlik
  2010-09-08 19:16 ` Mauro Carvalho Chehab
  0 siblings, 1 reply; 5+ messages in thread
From: Josef Pavlik @ 2010-09-01 12:35 UTC (permalink / raw)
  To: linux-media

Fixed problem with DiSEqC communication. The message was wrongly modulated, 
so the DiSEqC switch was not work.

This patch fixes DiSEqC messages, simple tone burst and tone on/off. 
I verified it with osciloscope against the DiSEqC documentation.

Interface: PCI DVB-S TV tuner TeVii S420
Kernel: 2.6.32-24-generic (UBUNTU 10.4)

Signed-off-by: Josef Pavlik <josef@pavlik.it>




diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c
index 2930a5d..6a32535 100644
--- a/drivers/media/dvb/frontends/stv0288.c
+++ b/drivers/media/dvb/frontends/stv0288.c
@@ -6,6 +6,8 @@
        Copyright (C) 2008 Igor M. Liplianin <liplianin@me.by>
                Removed stb6000 specific tuner code and revised some
                procedures.
+       2010-09-01 Josef Pavlik <josef@pavlik.it>
+               Fixed diseqc_msg, diseqc_burst and set_tone problems

        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -156,14 +158,13 @@ static int stv0288_send_diseqc_msg(struct dvb_frontend *fe,

        stv0288_writeregI(state, 0x09, 0);
        msleep(30);
-       stv0288_writeregI(state, 0x05, 0x16);
+       stv0288_writeregI(state, 0x05, 0x12); /* modulated mode, single shot */

        for (i = 0; i < m->msg_len; i++) {
                if (stv0288_writeregI(state, 0x06, m->msg[i]))
                        return -EREMOTEIO;
-               msleep(12);
        }
-
+       msleep(m->msg_len*12);
        return 0;
 }

@@ -174,13 +175,14 @@ static int stv0288_send_diseqc_burst(struct dvb_frontend *fe,

        dprintk("%s\n", __func__);

-       if (stv0288_writeregI(state, 0x05, 0x16))/* burst mode */
+       if (stv0288_writeregI(state, 0x05, 0x03)) /* "simple tone burst" mode, single shot */
                return -EREMOTEIO;

        if (stv0288_writeregI(state, 0x06, burst == SEC_MINI_A ? 0x00 : 0xff))
                return -EREMOTEIO;

-       if (stv0288_writeregI(state, 0x06, 0x12))
+       msleep(15);
+       if (stv0288_writeregI(state, 0x05, 0x12))
                return -EREMOTEIO;

        return 0;
@@ -192,18 +194,19 @@ static int stv0288_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)

        switch (tone) {
        case SEC_TONE_ON:
-               if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode */
+               if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode, continuous carrier */
                        return -EREMOTEIO;
-               return stv0288_writeregI(state, 0x06, 0xff);
+               break;

        case SEC_TONE_OFF:
-               if (stv0288_writeregI(state, 0x05, 0x13))/* burst mode */
+               if (stv0288_writeregI(state, 0x05, 0x12))/* burst mode off*/
                        return -EREMOTEIO;
-               return stv0288_writeregI(state, 0x06, 0x00);
+               break;

        default:
                return -EINVAL;
        }
+       return 0;
 }

 static u8 stv0288_inittab[] = {

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] DiSEqC bug fixed for stv0288 based interfaces
@ 2010-09-26 18:16 tvbox
  0 siblings, 0 replies; 5+ messages in thread
From: tvbox @ 2010-09-26 18:16 UTC (permalink / raw)
  To: josef; +Cc: linux-media, Mauro Carvalho Chehab

Hi Josef

This patch does work and has been tested in my driver.

However, your patch was still corrupt, here is a cleaned up version.

I have had to shorten some quotes in some lines to within 80 characters

Tested-by: Malcolm Priestley <tvboxspy@gmail.com>

It is also in my own hg tree at
http://mercurial.intuxication.org/hg/tvboxspy/rev/666fe763c5f6


diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c
index 2930a5d..6cd442e 100644
--- a/drivers/media/dvb/frontends/stv0288.c
+++ b/drivers/media/dvb/frontends/stv0288.c
@@ -6,6 +6,8 @@
 	Copyright (C) 2008 Igor M. Liplianin <liplianin@me.by>
 		Removed stb6000 specific tuner code and revised some
 		procedures.
+	2010-09-01 Josef Pavlik <josef@pavlik.it>
+		Fixed diseqc_msg, diseqc_burst and set_tone problems

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -156,14 +158,13 @@ static int stv0288_send_diseqc_msg(struct dvb_frontend *fe,
 
 	stv0288_writeregI(state, 0x09, 0);
 	msleep(30);
-	stv0288_writeregI(state, 0x05, 0x16);
+	stv0288_writeregI(state, 0x05, 0x12);/* modulated mode, single shot */

 	for (i = 0; i < m->msg_len; i++) {
 		if (stv0288_writeregI(state, 0x06, m->msg[i]))
 			return -EREMOTEIO;
-		msleep(12);
 	}
-
+	msleep(m->msg_len*12);
 	return 0;
 }

@@ -174,13 +175,14 @@ static int stv0288_send_diseqc_burst(struct dvb_frontend *fe,

 	dprintk("%s\n", __func__);
 
-	if (stv0288_writeregI(state, 0x05, 0x16))/* burst mode */
-		return -EREMOTEIO;
-
-	if (stv0288_writeregI(state, 0x06, burst == SEC_MINI_A ? 0x00 : 0xff))
+	if (stv0288_writeregI(state, 0x05, 0x03))/* burst mode, single shot */
+		return -EREMOTEIO;
+
+	if (stv0288_writeregI(state, 0x06, burst == SEC_MINI_A ? 0x00 : 0xff))
 		return -EREMOTEIO;

-	if (stv0288_writeregI(state, 0x06, 0x12))
+	msleep(15);
+	if (stv0288_writeregI(state, 0x05, 0x12))
 		return -EREMOTEIO;
 
 	return 0;
@@ -192,18 +194,19 @@ static int stv0288_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)

 	switch (tone) {
 	case SEC_TONE_ON:
-		if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode */
+		if (stv0288_writeregI(state, 0x05, 0x10))/* cont carrier */
 			return -EREMOTEIO;
-		return stv0288_writeregI(state, 0x06, 0xff);
+	break;
 
 	case SEC_TONE_OFF:
-		if (stv0288_writeregI(state, 0x05, 0x13))/* burst mode */
+		if (stv0288_writeregI(state, 0x05, 0x12))/* burst mode off*/
 			return -EREMOTEIO;
-		return stv0288_writeregI(state, 0x06, 0x00);
+	break;
 
 	default:
 		return -EINVAL;
 	}
+	return 0;
 }
 
 static u8 stv0288_inittab[] = {


> sorry, but something eats the leading spaces (but no the tabs) in the inlined 
> patch making it unusable, so please use the attached one.
> 
> 
> ---------------------
> on  Sep 12, 2010, at 13:30, I wrote:
> seems that the patch was corrupted by the kmail used for the post (missing 
> space before the last close bracket resulting corrupted patch)
> the corrected patch follows (and I'm sending it with another mail program)
> 
> Signed-off-by: Josef Pavlik <jo...@pavlik.it>
> 
> -------------------------------------
> diff --git a/drivers/media/dvb/frontends/stv0288.c 
> b/drivers/media/dvb/frontends/stv0288.c
> index 2930a5d..6cd442e 100644
> --- a/drivers/media/dvb/frontends/stv0288.c
> +++ b/drivers/media/dvb/frontends/stv0288.c
> @@ -6,6 +6,8 @@
>         Copyright (C) 2008 Igor M. Liplianin <liplia...@me.by>
>                 Removed stb6000 specific tuner code and revised some
>                 procedures.
> +        2010-09-01 Josef Pavlik <jo...@pavlik.it>
> +                Fixed diseqc_msg, diseqc_burst and set_tone problems
> 
>         This program is free software; you can redistribute it and/or modify
>         it under the terms of the GNU General Public License as published by
> @@ -156,14 +158,13 @@ static int stv0288_send_diseqc_msg(struct dvb_frontend 
> *fe,
> 
>         stv0288_writeregI(state, 0x09, 0);
>         msleep(30);
> -       stv0288_writeregI(state, 0x05, 0x16);
> +       stv0288_writeregI(state, 0x05, 0x12); /* modulated mode, single shot */
> 
>         for (i = 0; i < m->msg_len; i++) {
>                 if (stv0288_writeregI(state, 0x06, m->msg[i]))
>                         return -EREMOTEIO;
> -               msleep(12);
>         }
> -
> +    msleep(m->msg_len*12); 
>         return 0;
> }
> 
> @@ -174,13 +175,14 @@ static int stv0288_send_diseqc_burst(struct dvb_frontend 
> *fe,
> 
>         dprintk("%s\n", __func__);
> 
> -       if (stv0288_writeregI(state, 0x05, 0x16))/* burst mode */
> -               return -EREMOTEIO;
> -
> -       if (stv0288_writeregI(state, 0x06, burst == SEC_MINI_A ? 0x00 : 0xff))
> +    if (stv0288_writeregI(state, 0x05, 0x03)) /* simple tone burst mode, 
> single shot */
> +        return -EREMOTEIO;
> +       
> +    if (stv0288_writeregI(state, 0x06, burst == SEC_MINI_A ? 0x00 : 0xff))
>                 return -EREMOTEIO;
> 
> -       if (stv0288_writeregI(state, 0x06, 0x12))
> +    msleep(15);
> +       if (stv0288_writeregI(state, 0x05, 0x12))
>                 return -EREMOTEIO;
> 
>         return 0;
> @@ -192,18 +194,19 @@ static int stv0288_set_tone(struct dvb_frontend *fe, 
> fe_sec_tone_mode_t tone)
> 
>         switch (tone) {
>         case SEC_TONE_ON:
> -               if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode */
> +               if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode, 
> continuous carrier */
>                         return -EREMOTEIO;
> -               return stv0288_writeregI(state, 0x06, 0xff);
> +        break;
> 
>         case SEC_TONE_OFF:
> -               if (stv0288_writeregI(state, 0x05, 0x13))/* burst mode */
> +               if (stv0288_writeregI(state, 0x05, 0x12))/* burst mode off*/
>                         return -EREMOTEIO;
> -               return stv0288_writeregI(state, 0x06, 0x00);
> +        break;
> 
>         default:
>                 return -EINVAL;
>         }
> +    return 0;
> }
> 
> static u8 stv0288_inittab[] = {
> -----------------------------------------------------
> 
> 
> 
> On Sep 8, 2010, at 21:16 , Mauro Carvalho Chehab wrote:
> 
> > Em 01-09-2010 09:35, Josef Pavlik escreveu:
> >> Fixed problem with DiSEqC communication. The message was wrongly modulated, 
> >> so the DiSEqC switch was not work.
> >> 
> >> This patch fixes DiSEqC messages, simple tone burst and tone on/off. 
> >> I verified it with osciloscope against the DiSEqC documentation.
> >> 
> >> Interface: PCI DVB-S TV tuner TeVii S420
> >> Kernel: 2.6.32-24-generic (UBUNTU 10.4)
> >> 
> >> Signed-off-by: Josef Pavlik <jo...@pavlik.it>
> > 
> > Patch doesn't apply against the latest version, at my -git tree. 
> > Not sure if the bugs you're pointing were already fixed.
> > 
> > Cheers,
> > Mauro.
> >> 
> >> 
> >> 
> >> 
> >> diff --git a/drivers/media/dvb/frontends/stv0288.c 
> >> b/drivers/media/dvb/frontends/stv0288.c
> >> index 2930a5d..6a32535 100644
> >> --- a/drivers/media/dvb/frontends/stv0288.c
> >> +++ b/drivers/media/dvb/frontends/stv0288.c
> >> @@ -6,6 +6,8 @@
> >>       Copyright (C) 2008 Igor M. Liplianin <liplia...@me.by>
> >>               Removed stb6000 specific tuner code and revised some
> >>               procedures.
> >> +       2010-09-01 Josef Pavlik <jo...@pavlik.it>
> >> +               Fixed diseqc_msg, diseqc_burst and set_tone problems
> >> 
> >>       This program is free software; you can redistribute it and/or modify
> >>       it under the terms of the GNU General Public License as published by
> >> @@ -156,14 +158,13 @@ static int stv0288_send_diseqc_msg(struct dvb_frontend 
> >> *fe,
> >> 
> >>       stv0288_writeregI(state, 0x09, 0);
> >>       msleep(30);
> >> -       stv0288_writeregI(state, 0x05, 0x16);
> >> +       stv0288_writeregI(state, 0x05, 0x12); /* modulated mode, single shot 
> >> */
> >> 
> >>       for (i = 0; i < m->msg_len; i++) {
> >>               if (stv0288_writeregI(state, 0x06, m->msg[i]))
> >>                       return -EREMOTEIO;
> >> -               msleep(12);
> >>       }
> >> -
> >> +       msleep(m->msg_len*12);
> >>       return 0;
> >> }
> >> 
> >> @@ -174,13 +175,14 @@ static int stv0288_send_diseqc_burst(struct 
> >> dvb_frontend *fe,
> >> 
> >>       dprintk("%s\n", __func__);
> >> 
> >> -       if (stv0288_writeregI(state, 0x05, 0x16))/* burst mode */
> >> +       if (stv0288_writeregI(state, 0x05, 0x03)) /* "simple tone burst" 
> >> mode, single shot */
> >>               return -EREMOTEIO;
> >> 
> >>       if (stv0288_writeregI(state, 0x06, burst == SEC_MINI_A ? 0x00 : 0xff))
> >>               return -EREMOTEIO;
> >> 
> >> -       if (stv0288_writeregI(state, 0x06, 0x12))
> >> +       msleep(15);
> >> +       if (stv0288_writeregI(state, 0x05, 0x12))
> >>               return -EREMOTEIO;
> >> 
> >>       return 0;
> >> @@ -192,18 +194,19 @@ static int stv0288_set_tone(struct dvb_frontend *fe, 
> >> fe_sec_tone_mode_t tone)
> >> 
> >>       switch (tone) {
> >>       case SEC_TONE_ON:
> >> -               if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode */
> >> +               if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode, 
> >> continuous carrier */
> >>                       return -EREMOTEIO;
> >> -               return stv0288_writeregI(state, 0x06, 0xff);
> >> +               break;
> >> 
> >>       case SEC_TONE_OFF:
> >> -               if (stv0288_writeregI(state, 0x05, 0x13))/* burst mode */
> >> +               if (stv0288_writeregI(state, 0x05, 0x12))/* burst mode off*/
> >>                       return -EREMOTEIO;
> >> -               return stv0288_writeregI(state, 0x06, 0x00);
> >> +               break;
> >> 
> >>       default:
> >>               return -EINVAL;
> >>       }
> >> +       return 0;
> >> }
> >> 
> >> static u8 stv0288_inittab[] = {
> >> --
> >> 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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-26 18:16 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-01 12:35 [PATCH] DiSEqC bug fixed for stv0288 based interfaces Josef Pavlik
2010-09-08 19:16 ` Mauro Carvalho Chehab
2010-09-12 11:29   ` Josef Pavlik
2010-09-12 17:03   ` Josef Pavlik
  -- strict thread matches above, loose matches on Subject: below --
2010-09-26 18:16 tvbox

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.