From: c vw <dl1ycf@darc.de>
Date: Wed, 11 Aug 2021 14:58:34 +0000 (+0200)
Subject: Manually merged John's update.
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/provisioning?a=commitdiff_plain;h=39f5bb4e99a138e7a57bc1941919edaa9e72598b;p=pihpsdr.git

Manually merged John's update.
---

diff --git a/gpio.c b/gpio.c
index 277bed0..d9d21d1 100644
--- a/gpio.c
+++ b/gpio.c
@@ -1023,14 +1023,9 @@ int gpio_init() {
     if((ret=setup_line(chip,CWL_BUTTON,CW_ACTIVE_LOW==1))<0) {
       goto err;
     }
-    monitor_lines[lines]=CWL_BUTTON;
-    lines++;
     if((ret=setup_line(chip,CWR_BUTTON,CW_ACTIVE_LOW==1))<0) {
       goto err;
     }
-    monitor_lines[lines]=CWR_BUTTON;
-    lines++;
-
   }
   if (ENABLE_GPIO_SIDETONE) {
 //
@@ -1089,18 +1084,12 @@ void gpio_cw_sidetone_set(int level) {
   if (ENABLE_GPIO_SIDETONE) {
 #ifdef GPIO
 #ifdef OLD_GPIOD
-    //
-    // changed from gpiod_ctxless_set_value_ext to gpiod_ctxless_set_value,
-    // so it works with older gpiod libs
-    //
     if((rc=gpiod_ctxless_set_value(gpio_device,SIDETONE_GPIO,level,FALSE,consumer,NULL,NULL))<0) {
-      g_print("%s: err=%d\n",__FUNCTION__,rc);
-    }
 #else
     if((rc=gpiod_ctxless_set_value_ext(gpio_device,SIDETONE_GPIO,level,FALSE,consumer,NULL,NULL,0))<0) {
-      g_print("%s: err=%d\n",__FUNCTION__,rc);
-    }
 #endif
+       g_print("%s: err=%d\n",__FUNCTION__,rc);
+    }
 #endif
   }
 }