[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdenetwork/kppp
From:       Andras Mantia <amantia () kde ! org>
Date:       2006-01-16 20:16:32
Message-ID: 1137442592.877381.11918.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 499014 by amantia:

Fix initialization for the Qualcomm Z010 CDMA modem. If there is anybody who feels \
competent in this code, feel free to review (Harri Ported already did.) Add 921600 as \
possible speed for the modem.

 M  +4 -0      general.cpp  
 M  +10 -0     modem.cpp  


--- branches/KDE/3.5/kdenetwork/kppp/general.cpp #499013:499014
@@ -306,6 +306,10 @@
 
   static const char *baudrates[] = {
 
+#ifdef B921600
+    "921600",
+#endif
+
 #ifdef B460800
     "460800",
 #endif
--- branches/KDE/3.5/kdenetwork/kppp/modem.cpp #499013:499014
@@ -105,6 +105,12 @@
     break;
 #endif
 
+#ifdef B921600
+  case 9216:
+    return B921600;
+    break;
+#endif
+
   default:
     return B38400;
     break;
@@ -354,6 +360,7 @@
 
     usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec
 
+
 #ifndef DEBUG_WO_DIALING
     if (sigsetjmp(jmp_buffer, 1) == 0) {
       // set alarm in case tcsendbreak() hangs
@@ -365,12 +372,15 @@
       alarm(0);
       signal(SIGALRM, SIG_IGN);
     } else {
+      kdWarning(5002) << "Modem did not respond properly." << endl;
+#if 0 // observed false alarms with some modems
       // we reach this point if the alarm handler got called
       closetty();
       close(modemfd);
       modemfd = -1;
       errmsg = i18n("The modem does not respond.");
       return false;
+#endif      
     }
 
 #ifndef __svr4__ // drops DTR but doesn't set it afterwards again. not good for \
init.


[prev in list] [next in list] [prev in thread] [next in thread]