Merge branch 'txinh' of git://github.com/ab0tj/direwolf into ab0tj-txinh

Conflicts:
	hdlc_rec.c

	modified:   atest.c
	modified:   audio.h
	modified:   config.c
	modified:   hdlc_rec.c
	modified:   ptt.c
	modified:   ptt.h

Author: wb2osz

atest.c

@@ -705,6 +705,10 @@ void ptt_set (int ot, int chan, int ptt_signal)
 	return;
 }
 
+int get_input (int it, int chan)
+{
+	return -1;
+}
 
 static void usage (void) {
 

audio.h

@@ -191,6 +191,16 @@ struct audio_s {
 
 	    } octrl[NUM_OCTYPES];
 
+#define ICTYPE_TXINH 0
+
+#define NUM_ICTYPES 1
+
+	    struct {
+		ptt_method_t method;	/* none, serial port, GPIO, LPT. */
+		int gpio;		/* GPIO number */
+		int invert;		/* 1 = active low */
+	    } ictrl[NUM_ICTYPES];
+
 	/* Transmit timing. */
 
 	    int dwait;			/* First wait extra time for receiver squelch. */

config.c

@@ -1610,6 +1610,53 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 
 	  }  /* end of PTT */
 
+/*
+ * INPUTS
+ *
+ * TXINH - TX holdoff input
+ *
+ * xxx GPIO [-]gpio-num (only type supported yet)
+ */
+
+	  else if (strcasecmp(t, "TXINH") == 0) {
+	    int it;
+	    char itname[8];
+
+	    it = ICTYPE_TXINH;
+	    strlcpy (itname, "TXINH", sizeof(itname));
+
+	    t = split(NULL,0);
+	    if (t == NULL) {
+	      text_color_set(DW_COLOR_ERROR);
+	      dw_printf ("Config file line %d: Missing input type name for %s command.\n", line, itname);
+	      continue;
+	    }
+
+	    if (strcasecmp(t, "GPIO") == 0) {
+
+#if __WIN32__
+	      text_color_set(DW_COLOR_ERROR);
+	      dw_printf ("Config file line %d: %s with GPIO is only available on Linux.\n", line, itname);
+#else
+	      t = split(NULL,0);
+	      if (t == NULL) {
+	        text_color_set(DW_COLOR_ERROR);
+		dw_printf ("Config file line %d: Missing GPIO number for %s.\n", line, itname);
+		continue;
+	      }
+
+	      if (*t == '-') {
+	        p_audio_config->achan[channel].ictrl[it].gpio = atoi(t+1);
+		p_audio_config->achan[channel].ictrl[it].invert = 1;
+	      }
+	      else {
+	        p_audio_config->achan[channel].ictrl[it].gpio = atoi(t);
+		p_audio_config->achan[channel].ictrl[it].invert = 0;
+	      }
+	      p_audio_config->achan[channel].ictrl[it].method = PTT_METHOD_GPIO;
+#endif
+	    }
+	  }
 
 /*
  * DWAIT 		- Extra delay for receiver squelch.

hdlc_rec.c

@@ -626,17 +626,23 @@ void dcd_change (int chan, int subchan, int slice, int state)
  *		at the same time.  The channel is busy if ANY of them
  *		thinks the channel is busy.
  *
+ * Version 1.3: New option for input signal to inhibit transmit.
+ *
  *--------------------------------------------------------------------*/
 
 int hdlc_rec_data_detect_any (int chan)
 {
+
 	int sc;
 	assert (chan >= 0 && chan < MAX_CHANS);
 
 	for (sc = 0; sc < num_subchan[chan]; sc++) {
 	  if (composite_dcd[chan][sc] != 0)
 	    return (1);
 	}
+
+	if (get_input(ICTYPE_TXINH, chan) == 1) return (1);
+
 	return (0);
 
 } /* end hdlc_rec_data_detect_any */