Fix main.

21 files changed, 281 insertions, 1 deletions

diff --git a/misc/ibutton-pdkit/distinfo b/misc/ibutton-pdkit/distinfo
index a07db976fb8..1b2e50ae870 100644
--- a/misc/ibutton-pdkit/distinfo
+++ b/misc/ibutton-pdkit/distinfo
@@ -1,10 +1,30 @@
-$NetBSD: distinfo,v 1.5 2007/12/20 13:12:13 obache Exp $
+$NetBSD: distinfo,v 1.6 2013/01/11 13:30:32 joerg Exp $
 
 SHA1 (ulinuxgnu.zip) = 3c60908177c665fc10f56b6b81c39c6117b7d9d2
 RMD160 (ulinuxgnu.zip) = bc0797ffd2e0042807d6d02ca96e5f1f36233624
 Size (ulinuxgnu.zip) = 837059 bytes
+SHA1 (patch-1wsensor.c) = a30f9dc80e9b93bf9c21403571afbc1da2200000
 SHA1 (patch-aa) = 59a7106d544315cdebaf236edb81b32fccd83971
 SHA1 (patch-ab) = 0381f2be279a842b2b007aeb51a37cfa30b95e2c
 SHA1 (patch-ac) = 4fb5ab4e92c0c0ea648084442ecdad1513092064
 SHA1 (patch-ad) = 69910ca489c46e1c9e8fda90753cf98054e00ebe
 SHA1 (patch-ae) = f146dbc9b0bd94725c86d4e2bc4cc32075c5a457
+SHA1 (patch-atodtst.c) = 66f5cc5c359f9960a5fbaeecb3ba936672bdb087
+SHA1 (patch-counter.c) = ed0009a20187ece83f76757ccc0bfb00f5a2dcb7
+SHA1 (patch-coupler.c) = 7221539d6023429ea5b3353259050d2edc0e1ae4
+SHA1 (patch-debit.c) = e1e73d3bf1af15bc1f6c6cee748fd721f7994844
+SHA1 (patch-dumptag.c) = 9d5d4e116462409a135ca098ae3464ea2b423ebf
+SHA1 (patch-initcopr.c) = 8afcb8484c14be6cbd5e295357f0bff21319ece0
+SHA1 (patch-initrov.c) = 1ce4ade6d60cd84ee50f0f56be43a98222f045d3
+SHA1 (patch-list2tag.c) = 4260486b856aaa0f4721a4a41fa9297fb6bb769c
+SHA1 (patch-mktag.c) = c6175f92da92469bbcfc3f04a3542d2e6730af41
+SHA1 (patch-mweather.c) = e8eed93eb16c7fcf341fa8bd09da78b9df30b360
+SHA1 (patch-swtloop.c) = 661aade08968697164cb776102c0a4af0c87a440
+SHA1 (patch-swtoper.c) = bd3315cc938bbf959358a92466d0f9766cc5cc07
+SHA1 (patch-swtsngl.c) = 557107e16c0f3448995df60502ec4f4573252b06
+SHA1 (patch-temp.c) = 3b00eca1dfdfe4d48c167b425966ec3d4d93123b
+SHA1 (patch-thermodl.c) = b5f6fb8f4d6036e68cdac97ed2e183d6b54a4819
+SHA1 (patch-thermoms.c) = 9679efe9ce019b136dd4dd99eb7d3cb962e5b245
+SHA1 (patch-tstfind.c) = 54c4bdd1d827b09795d81637176cf0b7ff8abb36
+SHA1 (patch-tstow.c) = a3160693f578e3080856462d460fe98af50a2e9b
+SHA1 (patch-tstowe.c) = 3e228e26727858cea0d47472dbcc44619df261e5
diff --git a/misc/ibutton-pdkit/patches/patch-1wsensor.c b/misc/ibutton-pdkit/patches/patch-1wsensor.c
new file mode 100644
index 00000000000..9472d65c020
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-1wsensor.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-1wsensor.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- 1wsensor.c.orig	2013-01-11 01:30:59.000000000 +0000
++++ 1wsensor.c
+@@ -63,7 +63,7 @@ FILE *fp;
+ //----------------------------------------------------------------------
+ //  This is the Main routine for 1wsensor 
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int ShowStatus=FALSE,filenum,first,rslt;
+    uchar tagdata[MSGMAX];
diff --git a/misc/ibutton-pdkit/patches/patch-atodtst.c b/misc/ibutton-pdkit/patches/patch-atodtst.c
new file mode 100644
index 00000000000..dacdeaec4f1
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-atodtst.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-atodtst.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- atodtst.c.orig	2013-01-11 01:30:30.000000000 +0000
++++ atodtst.c
+@@ -80,7 +80,7 @@ uchar FamilySN[MAXDEVICES][8];
+ //----------------------------------------------------------------------
+ //  Main Test for the DS2450 - 1-Wire Quad A/D Converter
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    char return_msg[128];
+    char msg[45];
diff --git a/misc/ibutton-pdkit/patches/patch-counter.c b/misc/ibutton-pdkit/patches/patch-counter.c
new file mode 100644
index 00000000000..05a14b74170
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-counter.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-counter.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- counter.c.orig	2013-01-11 01:30:46.000000000 +0000
++++ counter.c
+@@ -60,7 +60,7 @@ uchar FamilySN[MAXDEVICES][8];
+ //----------------------------------------------------------------------
+ //  Main Test for the DS2423 - counter
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    char return_msg[128];
+    int NumDevices=0;
diff --git a/misc/ibutton-pdkit/patches/patch-coupler.c b/misc/ibutton-pdkit/patches/patch-coupler.c
new file mode 100644
index 00000000000..e38609a8c48
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-coupler.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-coupler.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- coupler.c.orig	2013-01-11 01:31:02.000000000 +0000
++++ coupler.c
+@@ -60,7 +60,7 @@ extern int SwitchStateToString1F(int,cha
+ // This is the begining of the program that test the commands for the
+ // DS2409
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    char return_msg[128];           //returned message from 1-wire operations
+    uchar SwitchSN[MAXDEVICES][8];  //the serial numbers for the devices
diff --git a/misc/ibutton-pdkit/patches/patch-debit.c b/misc/ibutton-pdkit/patches/patch-debit.c
new file mode 100644
index 00000000000..13f7d425b3b
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-debit.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-debit.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- debit.c.orig	2013-01-11 01:31:04.000000000 +0000
++++ debit.c
+@@ -69,7 +69,7 @@ FILE *fp;
+ //----------------------------------------------------------------------
+ //  This is the Main routine for debit
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int ShowStatus=FALSE,filenum,LOOP,i,cnt,exit_code=EXIT_SUCCESS;
+    char msg[200];
diff --git a/misc/ibutton-pdkit/patches/patch-dumptag.c b/misc/ibutton-pdkit/patches/patch-dumptag.c
new file mode 100644
index 00000000000..8056364fe53
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-dumptag.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-dumptag.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- dumptag.c.orig	2013-01-11 01:31:07.000000000 +0000
++++ dumptag.c
+@@ -43,7 +43,7 @@ extern int TAGToString(TAGType *, char *
+ //----------------------------------------------------------------------
+ //  This is the Main routine for dumpobm.
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    FILE *infp;
+    TAGType OutTAG;
diff --git a/misc/ibutton-pdkit/patches/patch-initcopr.c b/misc/ibutton-pdkit/patches/patch-initcopr.c
new file mode 100644
index 00000000000..3d817c0a638
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-initcopr.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-initcopr.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- initcopr.c.orig	2013-01-11 01:31:10.000000000 +0000
++++ initcopr.c
+@@ -56,7 +56,7 @@ FILE *fp;
+ //----------------------------------------------------------------------
+ //  This is the Main routine for initcopr 
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int ShowStatus=FALSE,filenum;
+    char msg[200];
diff --git a/misc/ibutton-pdkit/patches/patch-initrov.c b/misc/ibutton-pdkit/patches/patch-initrov.c
new file mode 100644
index 00000000000..09647defb33
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-initrov.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-initrov.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- initrov.c.orig	2013-01-11 01:31:12.000000000 +0000
++++ initrov.c
+@@ -67,7 +67,7 @@ FILE *fp;
+ //----------------------------------------------------------------------
+ //  This is the Main routine for initrov 
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int ShowStatus=FALSE,filenum;
+    char msg[300];
diff --git a/misc/ibutton-pdkit/patches/patch-list2tag.c b/misc/ibutton-pdkit/patches/patch-list2tag.c
new file mode 100644
index 00000000000..b4c58f69c02
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-list2tag.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-list2tag.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- list2tag.c.orig	2013-01-11 01:31:14.000000000 +0000
++++ list2tag.c
+@@ -59,7 +59,7 @@ int ParseData(char *, int, uchar *, int)
+ //----------------------------------------------------------------------
+ //  This is the Main routine for list2tag.
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int fllen,buflen,i,j,mcnt,ln;
+    FILE *infp,*outfp;
diff --git a/misc/ibutton-pdkit/patches/patch-mktag.c b/misc/ibutton-pdkit/patches/patch-mktag.c
new file mode 100644
index 00000000000..5a141e37c77
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-mktag.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-mktag.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- mktag.c.orig	2013-01-11 01:31:16.000000000 +0000
++++ mktag.c
+@@ -62,7 +62,7 @@ int ReadRoms(FILE *, uchar *, int);
+ //----------------------------------------------------------------------
+ //  This is the Main routine for list2obm.
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    uchar databuf[MAX_DATABUF];
+    int i,j,mcnt,ln;
diff --git a/misc/ibutton-pdkit/patches/patch-mweather.c b/misc/ibutton-pdkit/patches/patch-mweather.c
new file mode 100644
index 00000000000..5e5c3920adc
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-mweather.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-mweather.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- mweather.c.orig	2013-01-11 01:31:18.000000000 +0000
++++ mweather.c
+@@ -72,7 +72,7 @@ uchar TempSN[8],CountSN[8],SwitchSN[8], 
+ //----------------------------------------------------------------------
+ //  Main Test for Weather Station
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    WeatherStruct weather1;
+ //   WeatherStruct weather1 = { {0x20, 0x7A, 0x01, 0x01, 0x00, 0x00, 0x00, 0xFA},
diff --git a/misc/ibutton-pdkit/patches/patch-swtloop.c b/misc/ibutton-pdkit/patches/patch-swtloop.c
new file mode 100644
index 00000000000..4bbfb5af890
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-swtloop.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-swtloop.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- swtloop.c.orig	2013-01-11 01:31:21.000000000 +0000
++++ swtloop.c
+@@ -53,7 +53,7 @@ extern int getkeystroke(void);
+ 
+ //--------------------------------------------------------------------------
+ // This is the begining of the program that tests the different Channels
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    char return_msg[128];           //returned message from 1-wire operations
+    int i,j,k,n;                    //loop counters
diff --git a/misc/ibutton-pdkit/patches/patch-swtoper.c b/misc/ibutton-pdkit/patches/patch-swtoper.c
new file mode 100644
index 00000000000..1e2f1a0fb6b
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-swtoper.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-swtoper.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- swtoper.c.orig	2013-01-11 01:34:38.000000000 +0000
++++ swtoper.c
+@@ -54,7 +54,7 @@ extern int getkeystroke(void);
+ //---------------------------------------------------------------------------
+ // The main program that performs the operations on switches
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    char return_msg[128];           //returned message from 1-wire operations
+    short test;                     //info byte data
diff --git a/misc/ibutton-pdkit/patches/patch-swtsngl.c b/misc/ibutton-pdkit/patches/patch-swtsngl.c
new file mode 100644
index 00000000000..2172da65407
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-swtsngl.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-swtsngl.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- swtsngl.c.orig	2013-01-11 01:31:26.000000000 +0000
++++ swtsngl.c
+@@ -48,7 +48,7 @@ extern int ReadSwitch05(int,uchar *,int 
+ // This is the begining of the program that tests the commands for the
+ // DS2405
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    char return_msg[128];           //returned message from 1-wire operations
+    uchar SwitchSN[MAXDEVICES][8];  //the serial numbers for the devices
diff --git a/misc/ibutton-pdkit/patches/patch-temp.c b/misc/ibutton-pdkit/patches/patch-temp.c
new file mode 100644
index 00000000000..e34506a3660
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-temp.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-temp.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- temp.c.orig	2013-01-11 01:31:28.000000000 +0000
++++ temp.c
+@@ -62,7 +62,7 @@ int family_code;
+ //----------------------------------------------------------------------
+ //  Main Test for DS1920/DS1820 temperature measurement
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    float current_temp;
+    char return_msg[128];
diff --git a/misc/ibutton-pdkit/patches/patch-thermodl.c b/misc/ibutton-pdkit/patches/patch-thermodl.c
new file mode 100644
index 00000000000..18d2b23c704
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-thermodl.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-thermodl.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- thermodl.c.orig	2013-01-11 01:31:30.000000000 +0000
++++ thermodl.c
+@@ -65,7 +65,7 @@ void PrintResults(ThermoStateType *,FILE
+ //----------------------------------------------------------------------
+ //  This is the Main routine for thermodl.
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int Fahrenheit=FALSE,filenum,num,i,j;
+    FILE *fp;
diff --git a/misc/ibutton-pdkit/patches/patch-thermoms.c b/misc/ibutton-pdkit/patches/patch-thermoms.c
new file mode 100644
index 00000000000..7951243797a
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-thermoms.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-thermoms.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- thermoms.c.orig	2013-01-11 01:31:32.000000000 +0000
++++ thermoms.c
+@@ -68,7 +68,7 @@ int InputMissionType(ThermoStateType *,i
+ //----------------------------------------------------------------------
+ //  This is the Main routine for thermoms.
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int Fahrenheit=FALSE,num,i,j;
+    char str[800];
diff --git a/misc/ibutton-pdkit/patches/patch-tstfind.c b/misc/ibutton-pdkit/patches/patch-tstfind.c
new file mode 100644
index 00000000000..75ac983ad11
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-tstfind.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-tstfind.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- tstfind.c.orig	2013-01-11 01:31:35.000000000 +0000
++++ tstfind.c
+@@ -57,7 +57,7 @@ void PrintSerialNum(int);
+ //----------------------------------------------------------------------
+ //  Main for tstfind
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int rslt,cnt;
+    char return_msg[128];
diff --git a/misc/ibutton-pdkit/patches/patch-tstow.c b/misc/ibutton-pdkit/patches/patch-tstow.c
new file mode 100644
index 00000000000..a78027af76b
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-tstow.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-tstow.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- tstow.c.orig	2013-01-11 01:31:37.000000000 +0000
++++ tstow.c
+@@ -69,7 +69,7 @@ void PrintSerialNum(int portnum);
+ //----------------------------------------------------------------------
+ //  Main Test
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int PortNum=1,rslt,i,j,testcnt=0,length;
+    uchar TempSerialNum[8];
diff --git a/misc/ibutton-pdkit/patches/patch-tstowe.c b/misc/ibutton-pdkit/patches/patch-tstowe.c
new file mode 100644
index 00000000000..7efaeb354be
--- /dev/null
+++ b/misc/ibutton-pdkit/patches/patch-tstowe.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-tstowe.c,v 1.1 2013/01/11 13:30:32 joerg Exp $
+
+--- tstowe.c.orig	2013-01-11 01:31:39.000000000 +0000
++++ tstowe.c
+@@ -67,7 +67,7 @@ void PrintSerialNum(int);
+ //----------------------------------------------------------------------
+ //  Main Test
+ //
+-int main(short argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int PortNum=1,rslt,i,testcnt=0,length,pg;
+    uchar tran_buffer[2000];