Fix prototype of cleanup, signal handlers can only get one argument.

Add lost patch to add the shared header.

3 files changed, 92 insertions, 10 deletions

diff --git a/ham/yaesu/distinfo b/ham/yaesu/distinfo
index 1c887855c28..4231391c884 100644
--- a/ham/yaesu/distinfo
+++ b/ham/yaesu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2012/10/24 15:37:58 joerg Exp $
+$NetBSD: distinfo,v 1.11 2012/11/19 23:15:10 joerg Exp $
 
 SHA1 (yaesu-0.13.tar.gz) = 188cd4f472bc191c0467f09cfd5d7df79a7b280b
 RMD160 (yaesu-0.13.tar.gz) = 779c982112255c72f4fb1d95d8921714aa266bb8
@@ -6,7 +6,7 @@ Size (yaesu-0.13.tar.gz) = 26388 bytes
 SHA1 (patch-aa) = 3b0181d8989dd6f69eb4e9f486a552d17f301908
 SHA1 (patch-ab) = d51cb63253878428c9b751d64a138c7a0e54cbba
 SHA1 (patch-ac) = cd5ee0384a53f436e07b4cec904c3a2176a40cdf
-SHA1 (patch-ad) = 9ed611c78cfd5bae2e825a76b2af02eb1d4ddb9d
+SHA1 (patch-ad) = fac65f2d455f8185ef08b048931c01223b1236f8
 SHA1 (patch-ae) = bdeb565940a70912bf03a0909eeccdfad30b928e
 SHA1 (patch-aux.c) = c9d4bd5dea9da933e16fcbe773f8b2462dd2c4fd
 SHA1 (patch-bright.c) = 6c4e2d6267b7ad1830894e2a611aa952b54fddb7
@@ -38,3 +38,4 @@ SHA1 (patch-vfo__a2b.c) = 368821a1ff98e401061bcab886c9aa93e5f95fbe
 SHA1 (patch-vfo__ab.c) = 0c8a1c882236004dada2c2ccbba5a9c490bec2e7
 SHA1 (patch-wwv__find.c) = f74d7196362c0bbe8546937004815e119c6f53e5
 SHA1 (patch-yaesu.c) = 37e46559d06c50ba104a49fc5402c142fd2c9aa4
+SHA1 (patch-yaesu.h) = 1bc805ee60d339fb24381de505cc48cfa9037153
diff --git a/ham/yaesu/patches/patch-ad b/ham/yaesu/patches/patch-ad
index da94d12288c..c7e03bfd023 100644
--- a/ham/yaesu/patches/patch-ad
+++ b/ham/yaesu/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2012/10/24 15:38:00 joerg Exp $
+$NetBSD: patch-ad,v 1.9 2012/11/19 23:15:10 joerg Exp $
 
 --- main.c.orig	2004-07-27 02:26:47.000000000 +0000
 +++ main.c
-@@ -5,8 +5,13 @@
+@@ -5,8 +5,14 @@
  #include <stdlib.h>
  #include <termios.h>
  #include <signal.h>
@@ -14,14 +14,24 @@ $NetBSD: patch-ad,v 1.8 2012/10/24 15:38:00 joerg Exp $
 +
 +static void bye_msg(void);
 +static int port_open(int, char*[]);
++static void cleanup(int);
 +
  float freq_to_change_to;
  char flag_data_return[5];
  char data_array[650];
-@@ -24,34 +29,6 @@ int main(int argc, char* argv[]) {
+@@ -17,41 +23,14 @@ char mode1, mode2, mode3;
+ char narrow1, narrow2, narrow3, narrow4, narrow5, narrow6;
+ char white_space;
+ 
++struct termios defaults_serial;
++
+ int main(int argc, char* argv[]) {
+     static char version[] = "yaesu v .11lx.  May 19th, 1995.  Author: Emarit Ranu, KG0CQ.";
+     int fdSer; 				/* serial file descriptor integer */
+     int zero_port_byte;
      char flag_data_return[5];
      struct termios termattribs;
-     struct termios *defaults_serial;
+-    struct termios *defaults_serial;
 -    extern splt_tog();
 -    extern freq_out();
 -    extern mem_rec();
@@ -53,7 +63,16 @@ $NetBSD: patch-ad,v 1.8 2012/10/24 15:38:00 joerg Exp $
      signal(SIGINT, cleanup);
      yaesu_return = 1;
  
-@@ -94,35 +71,35 @@ int main(int argc, char* argv[]) {
+@@ -59,7 +38,7 @@ int main(int argc, char* argv[]) {
+     if (fdSer == -1) {
+         exit(3);
+     }
+-    tcgetattr(fdSer,defaults_serial);      /* save current serial settings */
++    tcgetattr(fdSer, &defaults_serial);      /* save current serial settings */
+ 
+     termattribs.c_iflag = IGNBRK | IGNPAR | IMAXBEL | IXOFF;
+     termattribs.c_oflag = 0;  
+@@ -94,35 +73,35 @@ int main(int argc, char* argv[]) {
  /*
   *  This function returns the fd for the serial port.
   */
@@ -98,7 +117,7 @@ $NetBSD: patch-ad,v 1.8 2012/10/24 15:38:00 joerg Exp $
                  exit(3);
               }
               break;
-@@ -130,6 +107,15 @@ port_open(int argc, char* argv[]) {
+@@ -130,6 +109,15 @@ port_open(int argc, char* argv[]) {
               printf("Invalid serial port number!!!\n  Remember:  com1 is 0, com2 is 1, etc.\n");
               return(-1);
         }
@@ -114,7 +133,7 @@ $NetBSD: patch-ad,v 1.8 2012/10/24 15:38:00 joerg Exp $
      } else {
         printf("usage:  yaesu [port #]\n");
         exit(3);
-@@ -137,10 +123,23 @@ port_open(int argc, char* argv[]) {
+@@ -137,16 +125,29 @@ port_open(int argc, char* argv[]) {
      return(fdSer);
  }
  
@@ -140,4 +159,13 @@ $NetBSD: patch-ad,v 1.8 2012/10/24 15:38:00 joerg Exp $
 +    Having fun hamming, hope to catch you on the air!!!\n\n");
  }
  
- void
+-void
+-cleanup(int fdSer, struct termios *defaults_serial)
++static void
++cleanup(int fdSer)
+ {
+-  tcsetattr(fdSer, TCSANOW, defaults_serial); 
++  tcsetattr(fdSer, TCSANOW, &defaults_serial); 
+   close(fdSer);
+   bye_msg();
+   printf("Killed by signal 2!\n"); 
diff --git a/ham/yaesu/patches/patch-yaesu.h b/ham/yaesu/patches/patch-yaesu.h
new file mode 100644
index 00000000000..0cec1579e1c
--- /dev/null
+++ b/ham/yaesu/patches/patch-yaesu.h
@@ -0,0 +1,53 @@
+$NetBSD: patch-yaesu.h,v 1.1 2012/11/19 23:15:10 joerg Exp $
+
+--- yaesu.h.orig	2012-11-19 16:04:48.000000000 +0000
++++ yaesu.h
+@@ -0,0 +1,48 @@
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++void stat_out(int fdSer, int current_freq_mode);
++void mem_scsk(int fdSer);
++void wwv_find(int fdSer);
++void mem_hide(int fdSer);
++void mem_save(int fdSer);
++void outport(int fdSer, int one, int two, int three, int four, int opcode);
++void stat_upd(int fdSer);
++void rd_flags(int fdSer);
++void pacing(int fdSer);
++void aux(int fdSer);
++void ctcss(int fdSer);
++void rptr_off(int fdSer);
++void ham_gen(int fdSer);
++void clar(int fdSer);
++void vfo_a2b(int fdSer);
++void step(int fdSer);
++void strt_tun(int fdSer);
++void tuner10(int fdSer);
++void mem_2vfo(int fdSer);
++void vfo_ab(int fdSer);
++void lock(int fdSer);
++void vfo_2mem(int fdSer);
++void mem_rec(int fdSer);
++void ptt(int fdSer);
++void bright(int fdSer);
++void mode (int fdSer);
++void freq_out(int fdSer);
++void repeater_simplex(int fdSer);
++int meter_rd(int fdSer);
++void splt_tog(int fdSer);
++void yaesu(int fdSer);
++
++extern int aux_comeback;
++extern char data_array[650];
++extern int memory_number;
++extern int data_return_param;
++extern char flag_data_return[5];
++extern float freq_to_change_to;
++
++extern char narrow1, narrow2, narrow3, narrow4, narrow5, narrow6;
++extern char white_space;
++extern char mode1, mode2, mode3;
++extern int yaesu_return;