-rw-r--r-- | noncore/apps/opie-console/io_serial.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp index 4129d64..03f1b1a 100644 --- a/noncore/apps/opie-console/io_serial.cpp +++ b/noncore/apps/opie-console/io_serial.cpp | |||
@@ -108,53 +108,54 @@ bool IOSerial::open() { | |||
108 | else if (m_parity & ParityOdd) | 108 | else if (m_parity & ParityOdd) |
109 | tty.c_cflag |= (PARENB | PARODD); | 109 | tty.c_cflag |= (PARENB | PARODD); |
110 | 110 | ||
111 | /* Set the changes */ | 111 | /* Set the changes */ |
112 | tcsetattr(m_fd, TCSANOW, &tty); | 112 | tcsetattr(m_fd, TCSANOW, &tty); |
113 | 113 | ||
114 | /* Notifications on read & errors */ | 114 | /* Notifications on read & errors */ |
115 | m_read = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); | 115 | m_read = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); |
116 | m_error = new QSocketNotifier(m_fd, QSocketNotifier::Exception, this); | 116 | m_error = new QSocketNotifier(m_fd, QSocketNotifier::Exception, this); |
117 | connect(m_read, SIGNAL(activated(int)), this, SLOT(dataArrived())); | 117 | connect(m_read, SIGNAL(activated(int)), this, SLOT(dataArrived())); |
118 | connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured())); | 118 | connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured())); |
119 | return TRUE; | 119 | return TRUE; |
120 | } else { | 120 | } else { |
121 | qWarning(" already opened"); | 121 | qWarning(" already opened"); |
122 | emit error(Refuse, tr("Device is already connected")); | 122 | emit error(Refuse, tr("Device is already connected")); |
123 | m_fd = 0; | 123 | m_fd = 0; |
124 | return FALSE; | 124 | return FALSE; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
128 | void IOSerial::reload(const Profile &config) { | 128 | void IOSerial::reload(const Profile &config) { |
129 | m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); | 129 | m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); |
130 | qWarning( "Dev" +m_device ); | 130 | qWarning( "Dev" +m_device ); |
131 | qWarning( "Conf:" +config.readEntry("Device") ); | 131 | qWarning( "Conf:" +config.readEntry("Device") ); |
132 | m_baud = config.readNumEntry("Baud", SERIAL_DEFAULT_BAUD); | 132 | m_baud = config.readNumEntry("Speed", SERIAL_DEFAULT_BAUD); |
133 | m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); | 133 | m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); |
134 | m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); | 134 | m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); |
135 | m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); | 135 | m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); |
136 | m_flow = config.readNumEntry("Flow", SERIAL_DEFAULT_FLOW); | 136 | m_flow = config.readNumEntry("Flow", SERIAL_DEFAULT_FLOW); |
137 | |||
137 | } | 138 | } |
138 | 139 | ||
139 | int IOSerial::baud(int baud) const { | 140 | int IOSerial::baud(int baud) const { |
140 | switch (baud) { | 141 | switch (baud) { |
141 | case 300: return B300; break; | 142 | case 300: return B300; break; |
142 | case 600: return B600; break; | 143 | case 600: return B600; break; |
143 | case 1200: return B1200; break; | 144 | case 1200: return B1200; break; |
144 | case 2400: return B2400; break; | 145 | case 2400: return B2400; break; |
145 | case 4800: return B4800; break; | 146 | case 4800: return B4800; break; |
146 | case 9600: return B9600; break; | 147 | case 9600: return B9600; break; |
147 | case 19200: return B19200; break; | 148 | case 19200: return B19200; break; |
148 | case 38400: return B38400; break; | 149 | case 38400: return B38400; break; |
149 | case 57600: return B57600; break; | 150 | case 57600: return B57600; break; |
150 | case 115200: return B115200; break; | 151 | case 115200: return B115200; break; |
151 | } | 152 | } |
152 | return -1; | 153 | return -1; |
153 | } | 154 | } |
154 | 155 | ||
155 | void IOSerial::errorOccured() { | 156 | void IOSerial::errorOccured() { |
156 | emit error(ClosedUnexpected, strerror(errno)); | 157 | emit error(ClosedUnexpected, strerror(errno)); |
157 | close(); | 158 | close(); |
158 | } | 159 | } |
159 | 160 | ||
160 | void IOSerial::dataArrived() { | 161 | void IOSerial::dataArrived() { |