Added prototype support for ISI5634PCI modems, put ATI commands back in

probemodem, and added another NSF. Thanks to Lee and iFax Solutions for
these.

diff --git a/CHANGES b/CHANGES
index 2213e57f8a3cbf9ae404d93b0babe6839f722632..da4b6a7337da786d6f970cc28fe218528f614065 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX 4.1.3 - Jun 27, 2002
 
+* adds prototype support for MultiTech ISI5634PCI (09 Jul 2002)
 * caused the wedged script to give exit status (06 Jul 2002)
 * allowed faxgetty to identify extended RING data as a RING (06 Jul 2002)
 * fixed a buffer overflow when receiving long scan lines (06 Jul 2002)

diff --git a/config/lucent b/config/lucent
index 1888f014fd196a34b8050922029fe282f6d2d206..737b080ff52e1b26311278a15ccb1c49054b901f 100644 (file)
--- a/config/lucent
+++ b/config/lucent
@@ -37,6 +37,8 @@
 # CONFIG:CLASS1:LT V.92 1.0 MT5634ZPX-PCI*:.*:.*: Manufacturer=MultiTech Model=MT5634ZPX-PCI-V92
 # CONFIG:CLASS1:LT V.90 1.0 MT5634ZBA*:.*:.*: Manufacturer=MultiTech Model=MT5634ZBA
 # CONFIG:CLASS1:LT V.92 1.0 MT5634ZBA*:.*:.*: Manufacturer=MultiTech Model=MT5634ZBA
+# CONFIG:CLASS1:LT V.90 1.0 ISI5634PCI*:.*:.*: Manufacturer=MultiTech Model=ISI5634PCI
+# CONFIG:CLASS1:LT V.92 1.0 ISI5634PCI*:.*:.*: Manufacturer=MultiTech Model=ISI5634PCI
 # CONFIG:CLASS1:AT&T 33.6 Data/14.4 Fax*:.*:.*: Manufacturer="AT&T" Model=Lucent
 # CONFIG:CLASS1:Zoom V.90 PCI*:.*:.*: Manufacturer=Zoom Model=2920
 # CONFIG:CLASS1:Zoom V.90 USB*:.*:.*: Manufacturer=Zoom Model=2980

diff --git a/config/lucent-mt-2 b/config/lucent-mt-2
index a81c5ab45e8be70f7a67c0a4a6a739207db836ec..c2f0f84954e2e55385d50471b64aa9b46b0a163e 100644 (file)
--- a/config/lucent-mt-2
+++ b/config/lucent-mt-2
@@ -11,6 +11,7 @@
 #
 # CONFIG: CLASS2:"Multi-Tech Systems"-"MT5634ZPX-PCI"-*
 # CONFIG: CLASS2:"Multi-Tech Systems"-"MT5634ZBA"-*
+# CONFIG: CLASS2:*-"ISI5634PCI"-*
 #
 # BEGIN-SERVER
 # END-SERVER

diff --git a/config/lucent-mt-20 b/config/lucent-mt-20
index 599b5306058bded0c249bf063fa3cc6c1f6e8d36..03f291bc430b4bda214dfefc1ad68e4e3845b21a 100644 (file)
--- a/config/lucent-mt-20
+++ b/config/lucent-mt-20
@@ -6,6 +6,7 @@
 #
 # CONFIG: CLASS2.0:"Multi-Tech Systems"-"MT5634ZBA"-*
 # CONFIG: CLASS2.0:"Multi-Tech Systems"-"MT5634ZPX"-*
+# CONFIG: CLASS2.0:*-"ISI5634PCI"-*
 #
 # BEGIN-SERVER
 # END-SERVER

diff --git a/config/lucent-mt-21 b/config/lucent-mt-21
index 292eafdde0fb8ef08e9d108a658860b93a0087ad..7f725b8c7b413eb52bf5b6d0c08eaf4224a42887 100644 (file)
--- a/config/lucent-mt-21
+++ b/config/lucent-mt-21
@@ -6,6 +6,7 @@
 #
 # CONFIG: CLASS2.1:"Multi-Tech Systems"-"MT5634ZBA"-*
 # CONFIG: CLASS2.1:"Multi-Tech Systems"-"MT5634ZPX"-*
+# CONFIG: CLASS2.1:*-"ISI5634PCI"-*
 #
 # BEGIN-SERVER
 # END-SERVER

diff --git a/etc/probemodem.sh.in b/etc/probemodem.sh.in
index 770581437666b97761211c8eca2f36fdcbdb142b..47d7156688cf450d109f5e2db6895cf561a05efb 100644 (file)
--- a/etc/probemodem.sh.in
+++ b/etc/probemodem.sh.in
@@ -426,14 +426,14 @@ TryClass1Commands()
 
 TryCommonCommands()
 {
-    for i in 0 1 2 3; do
+    for i in 0 1 2 3 4 5 6 7 8 9; do
        Try "ATI$i"
     done
 }
 
 common()
 {
-    echo "This looks like a Class $1 modem."
+    echo "This looks like a Class $SUPPORT modem."
     echo ""
     TryCommonCommands
 }
@@ -499,6 +499,7 @@ if [ "$RESULT" = "OK" ]; then
        fi
     done;
     MODEMCLASSES=`echo $MODEMCLASSES | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g' -e 's/ $//g'`
+    SUPPORT=`echo $SUPPORT | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g' -e 's/ $//g'`
     if [ "$MODEMCLASSES" = "" ]; then
        echo "The result of the AT+FCLASS=? command was:"
        echo ""
@@ -507,6 +508,7 @@ if [ "$RESULT" = "OK" ]; then
        echo "I don't figure that it's worthwhile to continue..."
        exit
     else
+       common
        for CLASS in $MODEMCLASSES; do
            case $CLASS in
            1)          class1;;

diff --git a/faxd/NSF.c++ b/faxd/NSF.c++
index dd474fa66d8528e7d811d6150f3f3dc97ce6b99f..ad952fea85f43ebbcb6578c9ee164e1871f58a9e 100644 (file)
--- a/faxd/NSF.c++
+++ b/faxd/NSF.c++
@@ -101,6 +101,7 @@ static const ModelData HP[] =
 static const ModelData Sharp[] =
 {{"\x00\xCE\xB8\x80\x80\x11\x85\x0D\xDD\x00\x00\xDD\xDD\x00\x00\xDD\xDD\x00\x00\x00\x00\x00\x00\x00\x00\xED\x22\xB0\x00\x00\x90\x00\x8C", "Sharp UX-460" },
  {"\x00\x4E\xB8\x80\x80\x11\x84\x0D\xDD\x00\x00\xDD\xDD\x00\x00\xDD\xDD\x00\x00\x00\x00\x00\x00\x00\x00\xED\x22\xB0\x00\x00\x90\x00\xAD", "Sharp UX-177" },
+ {"\x00\xCE\xB8\x00\x84\x0D\xDD\x00\x00\xDD\xDD\x00\x00\xDD\xDD\xDD\xDD\xDD\x02\x05\x28\x02\x22\x43\x29\xED\x23\x90\x00\x00\x90\x01\x00", "Sharp FO-4810" },
  {NULL}};
 
 static const ModelData Xerox[] =