From 572df095b92699d7e4295dad59ee099e10b97339 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 30 Jun 2014 16:49:30 +0200
Subject: [PATCH] linuxdvb: diseqc switch - fix config issues for port2 and
 port4 switches

---
 src/input/mpegts/linuxdvb/linuxdvb_private.h |  2 +-
 src/input/mpegts/linuxdvb/linuxdvb_switch.c  | 22 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_private.h b/src/input/mpegts/linuxdvb/linuxdvb_private.h
index 79d68a42..4c0002aa 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_private.h
+++ b/src/input/mpegts/linuxdvb/linuxdvb_private.h
@@ -260,7 +260,7 @@ void linuxdvb_diseqc_destroy ( linuxdvb_diseqc_t *ld );
 linuxdvb_lnb_t    *linuxdvb_lnb_create0
   ( const char *name, htsmsg_t *conf, linuxdvb_satconf_ele_t *ls );
 linuxdvb_diseqc_t *linuxdvb_switch_create0
-  ( const char *name, htsmsg_t *conf, linuxdvb_satconf_ele_t *ls, int u, int c );
+  ( const char *name, htsmsg_t *conf, linuxdvb_satconf_ele_t *ls, int c, int u );
 linuxdvb_diseqc_t *linuxdvb_rotor_create0
   ( const char *name, htsmsg_t *conf, linuxdvb_satconf_ele_t *ls );
 linuxdvb_diseqc_t *linuxdvb_en50494_create0
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_switch.c b/src/input/mpegts/linuxdvb/linuxdvb_switch.c
index 1e39b350..e0bcabc9 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_switch.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_switch.c
@@ -42,7 +42,7 @@ typedef struct linuxdvb_switch
   /* Port settings */
   int ls_toneburst;
   int ls_committed;
-  int ls_uncomitted;
+  int ls_uncommitted;
 
 } linuxdvb_switch_t;
 
@@ -124,7 +124,7 @@ const idclass_t linuxdvb_switch_class =
       .type   = PT_INT,
       .id     = "uncommitted",
       .name   = "Uncommitted",
-      .off    = offsetof(linuxdvb_switch_t, ls_uncomitted),
+      .off    = offsetof(linuxdvb_switch_t, ls_uncommitted),
       .list   = linuxdvb_switch_class_uncommitted_list
     },
     {
@@ -173,9 +173,9 @@ linuxdvb_switch_tune
   for (i = 0; i <= sc->lse_parent->ls_diseqc_repeats; i++) {
 
     /* Uncommitted */
-    if (ls->ls_uncomitted >= 0) {
+    if (ls->ls_uncommitted >= 0) {
       if (linuxdvb_diseqc_send(fd, 0xE0 | r1, 0x10, 0x39, 1,
-                               0xF0 | ls->ls_uncomitted))
+                               0xF0 | ls->ls_uncommitted))
         return -1;
       usleep(25000);
     }
@@ -219,7 +219,7 @@ linuxdvb_switch_list ( void *o )
 
 linuxdvb_diseqc_t *
 linuxdvb_switch_create0
-  ( const char *name, htsmsg_t *conf, linuxdvb_satconf_ele_t *ls, int u, int c )
+  ( const char *name, htsmsg_t *conf, linuxdvb_satconf_ele_t *ls, int c, int u )
 {
   linuxdvb_switch_t *ld = NULL;
   if (!strcmp(name ?: "", "Generic")) {
@@ -227,13 +227,15 @@ linuxdvb_switch_create0
     if (ld) {
       ld->ld_tune = linuxdvb_switch_tune;
       if (!conf) {
-        if (u >= 0) {
-          ld->ls_committed = (u - 1);
-          ld->ls_toneburst = (u - 1) % 2;
-        }
+        ld->ls_committed     = -1;
+        ld->ls_uncommitted   = -1;
+        ld->ls_toneburst     = -1;
         if (c >= 0) {
-          ld->ls_committed = c;
+          ld->ls_committed   = c;
+          ld->ls_toneburst   = c % 2;
         }
+        if (u >= 0)
+          ld->ls_uncommitted = c;
       }
     }
   }