author | josef <josef> | 2002-10-21 20:22:57 (UTC) |
---|---|---|
committer | josef <josef> | 2002-10-21 20:22:57 (UTC) |
commit | d7703116959fb71492f18a60eb41babd1183d7ec (patch) (unidiff) | |
tree | b8c4d77c283ca06298525cd24cf0cf388b7443c8 | |
parent | 95a908dba86f7588e3130094e7d292f3df6a3a42 (diff) | |
download | opie-d7703116959fb71492f18a60eb41babd1183d7ec.zip opie-d7703116959fb71492f18a60eb41babd1183d7ec.tar.gz opie-d7703116959fb71492f18a60eb41babd1183d7ec.tar.bz2 |
WARNING, UNTESTED
- closeRawIO() when we're done with dialing
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index 2f0c04e..e1f9ff1 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp | |||
@@ -1,56 +1,58 @@ | |||
1 | 1 | ||
2 | #include "io_modem.h" | 2 | #include "io_modem.h" |
3 | 3 | ||
4 | #include "dialer.h" | 4 | #include "dialer.h" |
5 | 5 | ||
6 | IOModem::IOModem( const Profile &profile ) | 6 | IOModem::IOModem( const Profile &profile ) |
7 | : IOSerial( profile ) { | 7 | : IOSerial( profile ) { |
8 | m_profile = profile; | 8 | m_profile = profile; |
9 | } | 9 | } |
10 | 10 | ||
11 | 11 | ||
12 | IOModem::~IOModem() { | 12 | IOModem::~IOModem() { |
13 | 13 | ||
14 | } | 14 | } |
15 | 15 | ||
16 | 16 | ||
17 | void IOModem::close() { | 17 | void IOModem::close() { |
18 | // Hangup, discarding result | 18 | // Hangup, discarding result |
19 | Dialer d(m_profile, rawIO()); | 19 | Dialer d(m_profile, rawIO()); |
20 | d.setHangupOnly(); | 20 | d.setHangupOnly(); |
21 | d.exec(); | 21 | d.exec(); |
22 | closeRawIO(); | ||
22 | 23 | ||
23 | IOSerial::close(); | 24 | IOSerial::close(); |
24 | } | 25 | } |
25 | 26 | ||
26 | bool IOModem::open() { | 27 | bool IOModem::open() { |
27 | bool ret = IOSerial::open(); | 28 | bool ret = IOSerial::open(); |
28 | if(!ret) return false; | 29 | if(!ret) return false; |
29 | 30 | ||
30 | Dialer d(m_profile, rawIO()); | 31 | Dialer d(m_profile, rawIO()); |
31 | 32 | ||
32 | int result = d.exec(); | 33 | int result = d.exec(); |
34 | closeRawIO(); | ||
33 | if(result == QDialog::Accepted) | 35 | if(result == QDialog::Accepted) |
34 | { | 36 | { |
35 | return true; | 37 | return true; |
36 | } | 38 | } |
37 | else | 39 | else |
38 | { | 40 | { |
39 | close(); | 41 | close(); |
40 | return false; | 42 | return false; |
41 | } | 43 | } |
42 | } | 44 | } |
43 | 45 | ||
44 | void IOModem::reload( const Profile &config ) { | 46 | void IOModem::reload( const Profile &config ) { |
45 | 47 | ||
46 | m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE); | 48 | m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE); |
47 | m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD); | 49 | m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD); |
48 | m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY); | 50 | m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY); |
49 | m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS); | 51 | m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS); |
50 | m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS); | 52 | m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS); |
51 | m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW); | 53 | m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW); |
52 | 54 | ||
53 | m_initString = config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ); | 55 | m_initString = config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ); |
54 | m_resetString = config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ); | 56 | m_resetString = config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ); |
55 | m_dialPref1 = config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ); | 57 | m_dialPref1 = config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ); |
56 | m_dialSuf1 = config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 ); | 58 | m_dialSuf1 = config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 ); |