author | zecke <zecke> | 2002-10-15 10:55:58 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-15 10:55:58 (UTC) |
commit | f2e9de1c8b6d3b2b2e82dec23ebf502c5805f575 (patch) (unidiff) | |
tree | 108efdb1a75a78dd212a69ccad718c2e65ece0bf /noncore/apps/opie-console/io_serial.cpp | |
parent | daae7a75b0e9ccbf1ea4c699c631ad77825e6301 (diff) | |
download | opie-f2e9de1c8b6d3b2b2e82dec23ebf502c5805f575.zip opie-f2e9de1c8b6d3b2b2e82dec23ebf502c5805f575.tar.gz opie-f2e9de1c8b6d3b2b2e82dec23ebf502c5805f575.tar.bz2 |
Remove debugging output
Fix possible crashes in io_bt and io_irda
Diffstat (limited to 'noncore/apps/opie-console/io_serial.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/io_serial.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp index 03f1b1a..a4a6f0b 100644 --- a/noncore/apps/opie-console/io_serial.cpp +++ b/noncore/apps/opie-console/io_serial.cpp | |||
@@ -18,52 +18,47 @@ IOSerial::~IOSerial() { | |||
18 | } | 18 | } |
19 | } | 19 | } |
20 | 20 | ||
21 | void IOSerial::send(const QByteArray &data) { | 21 | void IOSerial::send(const QByteArray &data) { |
22 | if (m_fd) { | 22 | if (m_fd) { |
23 | write(m_fd, data.data(), data.size()); | 23 | write(m_fd, data.data(), data.size()); |
24 | } else { | 24 | } else { |
25 | emit error(Refuse, tr("Not connected")); | 25 | emit error(Refuse, tr("Not connected")); |
26 | } | 26 | } |
27 | } | 27 | } |
28 | 28 | ||
29 | void IOSerial::close() { | 29 | void IOSerial::close() { |
30 | qWarning("closing!"); | ||
31 | if (m_fd) { | 30 | if (m_fd) { |
32 | delete m_read; | 31 | delete m_read; |
33 | delete m_error; | 32 | delete m_error; |
34 | ::close(m_fd); | 33 | ::close(m_fd); |
35 | m_fd = 0; | 34 | m_fd = 0; |
36 | } else { | 35 | } else { |
37 | emit error(Refuse, tr("Not connected")); | 36 | emit error(Refuse, tr("Not connected")); |
38 | } | 37 | } |
39 | } | 38 | } |
40 | 39 | ||
41 | bool IOSerial::open() { | 40 | bool IOSerial::open() { |
42 | qWarning("open"); | ||
43 | if (!m_fd) { | 41 | if (!m_fd) { |
44 | qWarning("going to open %s", m_device.latin1()); | ||
45 | struct termios tty; | 42 | struct termios tty; |
46 | m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK); | 43 | m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK); |
47 | if (m_fd < 0) { | 44 | if (m_fd < 0) { |
48 | qWarning(" fd < 0 "); | ||
49 | emit error(CouldNotOpen, strerror(errno)); | 45 | emit error(CouldNotOpen, strerror(errno)); |
50 | return FALSE; | 46 | return FALSE; |
51 | } | 47 | } |
52 | tcgetattr(m_fd, &tty); | 48 | tcgetattr(m_fd, &tty); |
53 | 49 | ||
54 | /* Baud rate */ | 50 | /* Baud rate */ |
55 | int speed = baud(m_baud); | 51 | int speed = baud(m_baud); |
56 | if (speed == -1) { | 52 | if (speed == -1) { |
57 | qWarning("speed -1"); | ||
58 | emit error(Refuse, tr("Invalid baud rate")); | 53 | emit error(Refuse, tr("Invalid baud rate")); |
59 | } | 54 | } |
60 | cfsetospeed(&tty, speed); | 55 | cfsetospeed(&tty, speed); |
61 | cfsetispeed(&tty, speed); | 56 | cfsetispeed(&tty, speed); |
62 | 57 | ||
63 | /* Take care of Space / Mark parity */ | 58 | /* Take care of Space / Mark parity */ |
64 | if (m_dbits == 7 && (m_parity == ParitySpace || m_parity == ParityMark)) { | 59 | if (m_dbits == 7 && (m_parity == ParitySpace || m_parity == ParityMark)) { |
65 | m_dbits = 8; | 60 | m_dbits = 8; |
66 | } | 61 | } |
67 | 62 | ||
68 | /* Data bits */ | 63 | /* Data bits */ |
69 | switch (m_dbits) { | 64 | switch (m_dbits) { |
@@ -109,35 +104,32 @@ bool IOSerial::open() { | |||
109 | tty.c_cflag |= (PARENB | PARODD); | 104 | tty.c_cflag |= (PARENB | PARODD); |
110 | 105 | ||
111 | /* Set the changes */ | 106 | /* Set the changes */ |
112 | tcsetattr(m_fd, TCSANOW, &tty); | 107 | tcsetattr(m_fd, TCSANOW, &tty); |
113 | 108 | ||
114 | /* Notifications on read & errors */ | 109 | /* Notifications on read & errors */ |
115 | m_read = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); | 110 | m_read = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); |
116 | m_error = new QSocketNotifier(m_fd, QSocketNotifier::Exception, this); | 111 | m_error = new QSocketNotifier(m_fd, QSocketNotifier::Exception, this); |
117 | connect(m_read, SIGNAL(activated(int)), this, SLOT(dataArrived())); | 112 | connect(m_read, SIGNAL(activated(int)), this, SLOT(dataArrived())); |
118 | connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured())); | 113 | connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured())); |
119 | return TRUE; | 114 | return TRUE; |
120 | } else { | 115 | } else { |
121 | qWarning(" already opened"); | ||
122 | emit error(Refuse, tr("Device is already connected")); | 116 | emit error(Refuse, tr("Device is already connected")); |
123 | m_fd = 0; | 117 | m_fd = 0; |
124 | return FALSE; | 118 | return FALSE; |
125 | } | 119 | } |
126 | } | 120 | } |
127 | 121 | ||
128 | void IOSerial::reload(const Profile &config) { | 122 | void IOSerial::reload(const Profile &config) { |
129 | m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); | 123 | m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); |
130 | qWarning( "Dev" +m_device ); | ||
131 | qWarning( "Conf:" +config.readEntry("Device") ); | ||
132 | m_baud = config.readNumEntry("Speed", SERIAL_DEFAULT_BAUD); | 124 | m_baud = config.readNumEntry("Speed", SERIAL_DEFAULT_BAUD); |
133 | m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); | 125 | m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); |
134 | m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); | 126 | m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); |
135 | m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); | 127 | m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); |
136 | m_flow = config.readNumEntry("Flow", SERIAL_DEFAULT_FLOW); | 128 | m_flow = config.readNumEntry("Flow", SERIAL_DEFAULT_FLOW); |
137 | 129 | ||
138 | } | 130 | } |
139 | 131 | ||
140 | int IOSerial::baud(int baud) const { | 132 | int IOSerial::baud(int baud) const { |
141 | switch (baud) { | 133 | switch (baud) { |
142 | case 300: return B300; break; | 134 | case 300: return B300; break; |
143 | case 600: return B600; break; | 135 | case 600: return B600; break; |