http://www.berklix.com/~jhs/src/bsd/fixes/FreeBSD/ports/gen/misc/estic-1.60/files/patch-aa.REL=ALL.cust_rel *** estic/make/freebsd-x.mak.orig Sat Sep 21 17:37:54 1996 --- estic/make/freebsd-x.mak Sat Sep 21 17:49:09 1996 *************** *** 75,81 **** all: xestic xestic: $(LIB) $(OBJS) ! $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11 # ------------------------------------------------------------------------------ --- 76,82 ---- all: xestic xestic: $(LIB) $(OBJS) ! $(CC) -L /usr/local/lib -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11 # ------------------------------------------------------------------------------ # estic.doc # Mir ist mitgeteilt worden, daß die FreeBSD Version das Flag USE_OLD_TTY # braucht. Offenbar ist die Behandlung der RS232 Handshakeleitungen # geändert worden, die für die neue Platine der Istec (#3) benötigt # werden. Nähere Informationen liegen mir nicht vor, ich wäre dankbar, # wenn das nochmal jemand verifizieren könnte. # ovb_ERASE@swissmail.com does not use -DUSE_OLD_TTY # I jhs@ thought I didn't need it, but complete config reloads # failed & I had to use DOS to reload my istec-1008 ! so maybe I do need it. *** estic/make/freebsd-x.mak.orig Fri Jan 31 03:57:24 1997 --- estic/make/freebsd-x.mak Sun Mar 16 15:31:59 1997 *************** *** 32,38 **** LIB = ../spunk/spunk.a INCDIR = ../spunk ! CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L /usr/local/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES # ------------------------------------------------------------------------------ --- 32,38 ---- LIB = ../spunk/spunk.a INCDIR = ../spunk ! CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/local/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES # ------------------------------------------------------------------------------ *** estic/make/freebsd.mak.orig Fri Jan 31 03:57:24 1997 --- estic/make/freebsd.mak Sun Mar 16 15:34:29 1997 *************** *** 31,37 **** LIB = ../spunk/spunk.a INCDIR = ../spunk ! CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES # ------------------------------------------------------------------------------ --- 31,37 ---- LIB = ../spunk/spunk.a INCDIR = ../spunk ! CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES # ------------------------------------------------------------------------------ These were mailed to jhs@ by uz_ERASE@wuschel.ibb.schwaben.com (Ullrich von Bassewitz) They were titled: Written by Oliver von Bueren, ovb_ERASE@swissmail.com, 12-Nov-1996 The following is only an addition to the ESTIC program, which is Copyright by Ullrich von Bassewitz. It's free to integrate into ESTIC as long as the terms for the original program from UvB are met. There is absolutely no guarantee that it will work on any other system, it just works for me on my system. I Julian H. Stacey DTROff (); patch & can confirm for Ullrich, it is necessary, without it, I get a communications timeout. Thanks Oliver. # this is done in 1.60 generic # *** estic/devstate.cc.orig Sat Sep 14 15:40:16 1996 # --- estic/devstate.cc Tue Nov 12 20:11:06 1996 # *************** # *** 622,628 **** # if (DevNum + 21 == E.Info.U % 256) { # if (GetState (stBusy) == 0) { # // Get the duration # ! ForcedRingEnd = Time () + TimeDiff (E.Info.U / 256); # // Set the new state # SetState (stForcedRing | stForcedRingOn); # // Send the command to the istec # --- 622,631 ---- # if (DevNum + 21 == E.Info.U % 256) { # if (GetState (stBusy) == 0) { # // Get the duration # ! // ovb_ERASE@swissmail.com, 12-Nov-96: Added typecast (double) as the compiler # ! // complained about ambiguous selection # ! // possibilities for TimeDiff. # ! ForcedRingEnd = Time () + TimeDiff ((double)E.Info.U / 256); # // Set the new state # SetState (stForcedRing | stForcedRingOn); # // Send the command to the istec *** estic/iccom.cc.orig Sat Sep 14 15:40:16 1996 --- estic/iccom.cc Tue Nov 12 20:05:34 1996 # next bits causes compile to fail in generic 1.60 # *************** # *** 34,39 **** # --- 34,48 ---- # #include "iccom.h" # # # + /*****************************************************************************/ # + /* Explicit template instantiation */ # + /*****************************************************************************/ # + # + // ovb_ERASE@swissmail.com, 12-Nov-96: This definition seemed to be missing. # + #ifdef EXPLICIT_TEMPLATES # + template class CircularBuffer; # + #endif # + # # /*****************************************************************************/ # /* Data */ *************** *** 126,131 **** --- 135,144 ---- // Make the RTS line active. This is needed for the new PCB of the istec // (beginning from version #3). Port->RTSOn (); + // ovb_ERASE@swissmail.com, 12-Nov-96: Fix of Rev3. + // We have to turn the DTR off as this is needed for the power supply. + // -> Power is taken from the RTS(+) and the DTR(-) line. + Port->DTROff (); // Success return 0; *************** *** 159,165 **** // Post an appropriate event PostEvent (evChargeUpdate); } - static void IstecWrite (unsigned char* Msg, unsigned BufSize) --- 172,177 ---- *** estic/icfile.cc.orig Fri Jan 31 03:57:22 1997 --- estic/icfile.cc Sun Mar 16 23:45:13 1997 *************** *** 25,30 **** --- 25,31 ---- #include "stream.h" #include "syserror.h" + extern int errno; // ovb_ERASE@swissmail.com, 12-Nov-96: This was missing to compile on FreeBSD 2.1.5 #include "progutil.h" #include "icmsg.h" These patches are not strictly necessary, (in that it compiles & runs with or without them) but _with_ avoids propagating the /usr/local assumption. *** spunk/make/freebsd-x.mak.orig Sun Nov 24 22:33:26 1996 --- spunk/make/freebsd-x.mak Sun Mar 16 23:51:15 1997 *************** *** 30,36 **** CC = g++ # Flags for the gnu compiler ! CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/local/include -fno-implicit-templates -DEXPLICIT_TEMPLATES LIB = spunk.a ZIPFILE = spunk.zip --- 30,36 ---- CC = g++ # Flags for the gnu compiler ! CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I ${X11BASE}/include -fno-implicit-templates -DEXPLICIT_TEMPLATES LIB = spunk.a ZIPFILE = spunk.zip *************** *** 136,142 **** # Dummy targets xresed: $(LIB) $(RESEDITOBJS) ! $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -lg++ -L/usr/local/lib -lX11 lib: $(LIB) --- 136,142 ---- # Dummy targets xresed: $(LIB) $(RESEDITOBJS) ! $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -lg++ -L${X11BASE}/lib -lX11 lib: $(LIB) *** estic/make/freebsd-x.mak.orig Fri Jan 31 03:57:24 1997 --- estic/make/freebsd-x.mak Sun Mar 16 23:54:36 1997 *************** *** 32,38 **** LIB = ../spunk/spunk.a INCDIR = ../spunk ! CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/local/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES # ------------------------------------------------------------------------------ --- 32,38 ---- LIB = ../spunk/spunk.a INCDIR = ../spunk ! CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L ${X11BASE}/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES # ------------------------------------------------------------------------------ *** estic/make/freebsd-x.mak.orig Tue Mar 18 13:21:23 1997 --- estic/make/freebsd-x.mak Tue Mar 18 13:20:39 1997 *************** *** 71,81 **** icintcon.o \ iclog.o \ icmsgwin.o \ - icprefix.o \ icshort.o \ icver.o \ ! istecmsg.o # ------------------------------------------------------------------------------ # --- 71,82 ---- icintcon.o \ iclog.o \ icmsgwin.o \ icshort.o \ icver.o \ ! istecmsg.o \ ! ../areacode/areacode.o + # icprefix.o # ------------------------------------------------------------------------------ #