- update to 1.61

- allow pipes as input
- fixed build with X11
- fixed option WITHOUT_X11
- new option WITH_ESTIC_DTR_OFF
- honor NOPORTDOCS
Submitted by:	Peter Much & Dirk Meyer

1 files changed, 28 insertions, 13 deletions

diff --git a/misc/estic/files/patch-icdevs.cc b/misc/estic/files/patch-icdevs.cc
index 80eaa7dbd172..62141a73283c 100644
--- a/misc/estic/files/patch-icdevs.cc
+++ b/misc/estic/files/patch-icdevs.cc
@@ -1,29 +1,43 @@
---- estic/icdevs.cc.orig	Sat Feb 26 18:30:40 2000
-+++ estic/icdevs.cc	Sat Feb 26 18:32:24 2000
-@@ -299,8 +299,8 @@
- String DevListBox::RerouteName (unsigned Val, unsigned char* Num)
+--- estic/icdevs.cc.orig	Wed Mar  5 21:48:44 1997
++++ estic/icdevs.cc	Tue Sep  6 09:54:21 2005
+@@ -157,8 +157,8 @@
+ String DevListBox::RerouteName (const String& Num)
  // Map the reroute capability to a string with fixed length
  {
--    const StringLength = 11;
--    const PadLength = 12;
-+    const int StringLength = 11;
-+    const int PadLength = 12;
+-    const StringLength = 18;
+-    const PadLength = 21;
++    const int StringLength = 18;
++    const int PadLength = 21;
      String Res (PadLength);
  
-     if (Val == 0x00) {
-@@ -427,37 +427,37 @@
+     if (Num.IsEmpty ()) {
+@@ -269,9 +269,9 @@
+ static void EditExtReroute (const Point& Pos, IstecDevConfig& Config)
+ // Edit the extended reroute capabilities of FW 2.0 in a separate menu
+ {
+-    const miPhone       = 10;
+-    const miCondition   = 20;
+-    const miRingCount   = 30;
++    const int miPhone       = 10;
++    const int miCondition   = 20;
++    const int miRingCount   = 30;
+ 
+     // Load the menu
+     Menue* M = (Menue*) LoadResource ("@ICDEVS.RerouteMenue");
+@@ -407,38 +407,38 @@
      static const String StgPosName = "EditDevConfig.ConfigMenue.Position";
  
      // Menue constants
 -    const miDialCaps      = 10;
 -    const miService       = 20;
--    const miReroute       = 30;
+-    const miReroute       = 30;         // Simple reroute, pre-2.00
 -    const miChargePulse   = 40;
 -    const miPIN           = 50;
 -    const miTerminalMode  = 60;
 -    const miKnockInt      = 70;
 -    const miKnockExt      = 80;
 -    const miKnockTFE      = 90;
+-    const miExtReroute    = 100;        // Extended reroute, 2.00 and up
 -    const miKnockInt21    = 1000;
 -    const miKnockInt22    = 1010;
 -    const miKnockInt23    = 1020;
@@ -48,13 +62,14 @@
 -    const miKnockTFE4     = 1230;
 +    const int miDialCaps      = 10;
 +    const int miService       = 20;
-+    const int miReroute       = 30;
++    const int miReroute       = 30;         // Simple reroute, pre-2.00
 +    const int miChargePulse   = 40;
 +    const int miPIN           = 50;
 +    const int miTerminalMode  = 60;
 +    const int miKnockInt      = 70;
 +    const int miKnockExt      = 80;
 +    const int miKnockTFE      = 90;
++    const int miExtReroute    = 100;        // Extended reroute, 2.00 and up
 +    const int miKnockInt21    = 1000;
 +    const int miKnockInt22    = 1010;
 +    const int miKnockInt23    = 1020;
@@ -79,4 +94,4 @@
 +    const int miKnockTFE4     = 1230;
  
  
-     // Save the configuration
+     // Save the configuration into a memory stream, remember the CRC