summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-console/io_modem.cpp
Unidiff
Diffstat (limited to 'noncore/apps/opie-console/io_modem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/io_modem.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index b7901b9..896c24f 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -1,71 +1,73 @@
1 1
2#include "io_modem.h" 2#include "io_modem.h"
3 3
4#include "dialer.h" 4#include "dialer.h"
5 5
6IOModem::IOModem( const Profile &profile ) 6IOModem::IOModem( const Profile &profile )
7 : IOSerial( profile ) { 7 : IOSerial( profile ) {
8 m_profile = profile; 8 m_profile = profile;
9} 9}
10 10
11 11
12IOModem::~IOModem() { 12IOModem::~IOModem() {
13 13
14} 14}
15 15
16 16
17void IOModem::close() { 17void IOModem::close() {
18 // Hangup, discarding result 18 // Hangup, discarding result
19 int fd = rawIO(); 19 //int fd = rawIO();
20 Dialer d(m_profile, fd); 20 internDetach();
21 Dialer d(m_profile, m_fd);
21 d.setHangupOnly(); 22 d.setHangupOnly();
22 d.exec(); 23 //d.exec();
23 closeRawIO(fd); 24 internAttach();
25 //closeRawIO(fd);
24 26
25 IOSerial::close(); 27 IOSerial::close();
26} 28}
27 29
28bool IOModem::open() { 30bool IOModem::open() {
29 bool ret = IOSerial::open(); 31 bool ret = IOSerial::open();
30 if(!ret) return false; 32 if(!ret) return false;
31 33
32 //int fd = rawIO(); 34 //int fd = rawIO();
33 internDetach(); 35 internDetach();
34 Dialer d(m_profile, m_fd); 36 Dialer d(m_profile, m_fd);
35 37
36 int result = d.exec(); 38 int result = d.exec();
37 internAttach(); 39 internAttach();
38 //closeRawIO(fd); 40 //closeRawIO(fd);
39 if(result == QDialog::Accepted) 41 if(result == QDialog::Accepted)
40 { 42 {
41 return true; 43 return true;
42 } 44 }
43 else 45 else
44 { 46 {
45 close(); 47 close();
46 return false; 48 return false;
47 } 49 }
48} 50}
49 51
50void IOModem::reload( const Profile &config ) { 52void IOModem::reload( const Profile &config ) {
51 53
52 m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE); 54 m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE);
53 m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD); 55 m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD);
54 m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY); 56 m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY);
55 m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS); 57 m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS);
56 m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS); 58 m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS);
57 m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW); 59 m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW);
58 60
59 m_initString = config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ); 61 m_initString = config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING );
60 m_resetString = config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ); 62 m_resetString = config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING );
61 m_dialPref1 = config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ); 63 m_dialPref1 = config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 );
62 m_dialSuf1 = config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 ); 64 m_dialSuf1 = config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 );
63 m_dialPref2 = config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 ); 65 m_dialPref2 = config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 );
64 m_dialSuf2 = config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 ); 66 m_dialSuf2 = config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 );
65 m_dialPref3 = config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 ); 67 m_dialPref3 = config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 );
66 m_dialSuf3 = config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ); 68 m_dialSuf3 = config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 );
67 m_connect = config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING ); 69 m_connect = config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING );
68 m_hangup = config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ); 70 m_hangup = config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING );
69 m_cancel = config.readEntry("CancelString", MODEM_DEFAULT_CANCEL_STRING ); 71 m_cancel = config.readEntry("CancelString", MODEM_DEFAULT_CANCEL_STRING );
70 m_dialTime = config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME ); 72 m_dialTime = config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME );
71 m_delayRedial = config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ); 73 m_delayRedial = config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL );