author | wazlaf <wazlaf> | 2002-09-28 14:58:25 (UTC) |
---|---|---|
committer | wazlaf <wazlaf> | 2002-09-28 14:58:25 (UTC) |
commit | ea1975bdf411de3e08e7b84d2480a522596fe143 (patch) (unidiff) | |
tree | 3cd90b3440fa190e9853f66cbd1e9dfaeb6f330c /noncore/apps/opie-console | |
parent | 93f90487bf9d2b8937a4933aef2ee472b5cdc89c (diff) | |
download | opie-ea1975bdf411de3e08e7b84d2480a522596fe143.zip opie-ea1975bdf411de3e08e7b84d2480a522596fe143.tar.gz opie-ea1975bdf411de3e08e7b84d2480a522596fe143.tar.bz2 |
Some changes in io_layer.h; Untested Serial IOLayer implementation added
-rw-r--r-- | noncore/apps/opie-console/.cvsignore | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_layer.h | 26 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_serial.cpp | 155 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_serial.h | 51 |
4 files changed, 218 insertions, 17 deletions
diff --git a/noncore/apps/opie-console/.cvsignore b/noncore/apps/opie-console/.cvsignore new file mode 100644 index 0000000..acc07da --- a/dev/null +++ b/noncore/apps/opie-console/.cvsignore | |||
@@ -0,0 +1,3 @@ | |||
1 | moc*.cpp | ||
2 | Makefile | ||
3 | Makefile.in | ||
diff --git a/noncore/apps/opie-console/io_layer.h b/noncore/apps/opie-console/io_layer.h index c8f41d7..537c851 100644 --- a/noncore/apps/opie-console/io_layer.h +++ b/noncore/apps/opie-console/io_layer.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define OPIE_IO_LAYER_H | 2 | #define OPIE_IO_LAYER_H |
3 | 3 | ||
4 | #include <qobject.h> | 4 | #include <qobject.h> |
5 | 5 | #include <qpe/config.h> | |
6 | 6 | ||
7 | /** | 7 | /** |
8 | * This is the base class for IO Layers | 8 | * This is the base class for IO Layers |
@@ -29,7 +29,8 @@ public: | |||
29 | 29 | ||
30 | /** | 30 | /** |
31 | * create an IOLayer instance from a config file | 31 | * create an IOLayer instance from a config file |
32 | * can be used by session managemnt/profiles | 32 | * the currently set group stores the profile/session |
33 | * information | ||
33 | */ | 34 | */ |
34 | IOLayer( const Config& ); | 35 | IOLayer( const Config& ); |
35 | 36 | ||
@@ -37,6 +38,16 @@ public: | |||
37 | * destructor | 38 | * destructor |
38 | */ | 39 | */ |
39 | virtual ~IOLayer(); | 40 | virtual ~IOLayer(); |
41 | |||
42 | /** | ||
43 | * a small internal identifier | ||
44 | */ | ||
45 | virtual QString identifier() const = 0; | ||
46 | |||
47 | /** | ||
48 | * a short name | ||
49 | */ | ||
50 | virtual QString name() const = 0; | ||
40 | signals: | 51 | signals: |
41 | /** | 52 | /** |
42 | * received input as QCString | 53 | * received input as QCString |
@@ -70,17 +81,6 @@ public slots: | |||
70 | * closes and reloads the settings | 81 | * closes and reloads the settings |
71 | */ | 82 | */ |
72 | virtual void reload( const Config& ) = 0; | 83 | virtual void reload( const Config& ) = 0; |
73 | |||
74 | /** | ||
75 | * a small internal identifier | ||
76 | */ | ||
77 | virtual QString identifier()const = 0; | ||
78 | |||
79 | /** | ||
80 | * a short name | ||
81 | */ | ||
82 | virtual QString name()const = 0; | ||
83 | |||
84 | }; | 84 | }; |
85 | 85 | ||
86 | #endif | 86 | #endif |
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp index 42c86b5..9a81de9 100644 --- a/noncore/apps/opie-console/io_serial.cpp +++ b/noncore/apps/opie-console/io_serial.cpp | |||
@@ -1,12 +1,163 @@ | |||
1 | #include <fcntl.h> | ||
2 | #include <termios.h> | ||
3 | #include <errno.h> | ||
4 | #include <unistd.h> | ||
1 | #include "io_serial.h" | 5 | #include "io_serial.h" |
2 | 6 | ||
3 | IOSerial::IOSerial(const Config &config) : IOLayer(config) { | 7 | IOSerial::IOSerial(const Config &config) : IOLayer(config) { |
8 | m_fd = 0; | ||
9 | reload(config); | ||
4 | } | 10 | } |
5 | 11 | ||
6 | 12 | ||
7 | void IOSerial::error(int number, const QString &error) { | 13 | IOSerial::~IOSerial() { |
14 | if (m_fd) { | ||
15 | close(); | ||
16 | } | ||
8 | } | 17 | } |
9 | 18 | ||
10 | void IOSerial::received(const QByteArray &array) { | 19 | void IOSerial::send(const QByteArray &data) { |
20 | if (m_fd) { | ||
21 | write(m_fd, data.data(), data.size()); | ||
22 | } else { | ||
23 | emit error(Refuse, tr("Not connected")); | ||
24 | } | ||
11 | } | 25 | } |
12 | 26 | ||
27 | void IOSerial::close() { | ||
28 | if (m_fd) { | ||
29 | delete m_read; | ||
30 | delete m_error; | ||
31 | ::close(m_fd); | ||
32 | m_fd = 0; | ||
33 | } else { | ||
34 | emit error(Refuse, tr("Not connected")); | ||
35 | } | ||
36 | } | ||
37 | |||
38 | bool IOSerial::open() { | ||
39 | if (!m_fd) { | ||
40 | struct termios tty; | ||
41 | m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK); | ||
42 | if (m_fd < 0) { | ||
43 | emit error(CouldNotOpen, strerror(errno)); | ||
44 | return FALSE; | ||
45 | } | ||
46 | tcgetattr(m_fd, &tty); | ||
47 | |||
48 | /* Baud rate */ | ||
49 | int speed = getBaud(m_baud); | ||
50 | if (speed == -1) { | ||
51 | emit error(Refuse, tr("Invalid baud rate")); | ||
52 | } | ||
53 | cfsetospeed(&tty, speed); | ||
54 | cfsetispeed(&tty, speed); | ||
55 | |||
56 | /* Take care of Space / Mark parity */ | ||
57 | if (m_dbits == 7 && (m_parity == ParitySpace || m_parity == ParityMark)) { | ||
58 | m_dbits = 8; | ||
59 | } | ||
60 | |||
61 | /* Data bits */ | ||
62 | switch (m_dbits) { | ||
63 | case 5: tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS5; break; | ||
64 | case 6: tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS6; break; | ||
65 | case 7: tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS7; break; | ||
66 | case 8: tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS8; break; | ||
67 | } | ||
68 | |||
69 | /* Raw, no echo mode */ | ||
70 | tty.c_iflag = IGNBRK; | ||
71 | tty.c_lflag = 0; | ||
72 | tty.c_oflag = 0; | ||
73 | tty.c_cflag |= CLOCAL | CREAD; | ||
74 | |||
75 | /* Stop bits */ | ||
76 | if (m_sbits == 2) { | ||
77 | tty.c_cflag |= CSTOPB; | ||
78 | } else { | ||
79 | tty.c_cflag &= ~CSTOPB; | ||
80 | } | ||
81 | |||
82 | tty.c_cc[VMIN] = 1; | ||
83 | tty.c_cc[VTIME] = 5; | ||
84 | |||
85 | /* Flow control */ | ||
86 | if (m_flow & FlowSW) | ||
87 | tty.c_iflag |= IXON | IXOFF; | ||
88 | else | ||
89 | tty.c_iflag &= ~(IXON|IXOFF|IXANY); | ||
90 | |||
91 | if (m_flow & FlowHW) | ||
92 | tty.c_cflag |= CRTSCTS; | ||
93 | else | ||
94 | tty.c_cflag &= ~CRTSCTS; | ||
95 | |||
96 | /* Parity */ | ||
97 | tty.c_cflag &= ~(PARENB | PARODD); | ||
98 | if (m_parity & ParityEven) | ||
99 | tty.c_cflag |= PARENB; | ||
100 | else if (m_parity & ParityOdd) | ||
101 | tty.c_cflag |= (PARENB | PARODD); | ||
102 | |||
103 | /* Set the changes */ | ||
104 | tcsetattr(m_fd, TCSANOW, &tty); | ||
105 | |||
106 | /* Notifications on read & errors */ | ||
107 | m_read = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); | ||
108 | m_error = new QSocketNotifier(m_fd, QSocketNotifier::Exception, this); | ||
109 | connect(m_read, SIGNAL(activated(int)), this, SLOT(dataArrived())); | ||
110 | connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured())); | ||
111 | return TRUE; | ||
112 | } else { | ||
113 | emit error(Refuse, tr("Device is already connected")); | ||
114 | return FALSE; | ||
115 | } | ||
116 | } | ||
117 | |||
118 | void IOSerial::reload(const Config &config) { | ||
119 | m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); | ||
120 | m_baud = config.readNumEntry("Baud", SERIAL_DEFAULT_BAUD); | ||
121 | } | ||
122 | |||
123 | int IOSerial::getBaud(int baud) const { | ||
124 | switch (baud) { | ||
125 | case 300: return B300; break; | ||
126 | case 600: return B600; break; | ||
127 | case 1200: return B1200; break; | ||
128 | case 2400: return B2400; break; | ||
129 | case 4800: return B4800; break; | ||
130 | case 9600: return B9600; break; | ||
131 | case 19200: return B19200; break; | ||
132 | case 38400: return B38400; break; | ||
133 | case 57600: return B57600; break; | ||
134 | case 115200: return B115200; break; | ||
135 | } | ||
136 | return -1; | ||
137 | } | ||
138 | |||
139 | void IOSerial::errorOccured() { | ||
140 | emit error(ClosedUnexpected, strerror(errno)); | ||
141 | close(); | ||
142 | } | ||
143 | |||
144 | void IOSerial::dataArrived() { | ||
145 | QByteArray array; | ||
146 | char buf[4096]; | ||
147 | |||
148 | int len = read(m_fd, buf, 4096); | ||
149 | if (len == 0) | ||
150 | close(); | ||
151 | if (len < 0) | ||
152 | return; | ||
153 | array.setRawData(buf, len); | ||
154 | emit received(array); | ||
155 | } | ||
156 | |||
157 | QString IOSerial::identifier() const { | ||
158 | return "serial"; | ||
159 | } | ||
160 | |||
161 | QString IOSerial::name() const { | ||
162 | return "RS232 Serial IO Layer"; | ||
163 | } | ||
diff --git a/noncore/apps/opie-console/io_serial.h b/noncore/apps/opie-console/io_serial.h index c6a2efd..1d34411 100644 --- a/noncore/apps/opie-console/io_serial.h +++ b/noncore/apps/opie-console/io_serial.h | |||
@@ -1,16 +1,63 @@ | |||
1 | #ifndef OPIE_IO_SERIAL | 1 | #ifndef OPIE_IO_SERIAL |
2 | #define OPIE_IO_SERIAL | 2 | #define OPIE_IO_SERIAL |
3 | 3 | ||
4 | #include <qsocketnotifier.h> | ||
4 | #include "io_layer.h" | 5 | #include "io_layer.h" |
5 | 6 | ||
7 | /* Default values to be used if the profile information is incomplete */ | ||
8 | #define SERIAL_DEFAULT_DEVICE "/dev/ttyS0" | ||
9 | #define SERIAL_DEFAULT_BAUD 9600 | ||
10 | #define SERIAL_DEFAULT_PARITY 0 | ||
11 | #define SERIAL_DEFAULT_DBITS 8 | ||
12 | #define SERIAL_DEFAULT_SBITS 1 | ||
13 | #define SERIAL_DEFAULT_FLOW 0 | ||
14 | |||
15 | /* IOSerial implements a RS232 IO Layer */ | ||
16 | |||
6 | class IOSerial : public IOLayer { | 17 | class IOSerial : public IOLayer { |
7 | Q_OBJECT | 18 | Q_OBJECT |
8 | public: | 19 | public: |
20 | enum Parity { | ||
21 | ParityNone = 0, | ||
22 | ParityEven, | ||
23 | ParityOdd, | ||
24 | ParitySpace, | ||
25 | ParityMark | ||
26 | }; | ||
27 | |||
28 | enum Flow { | ||
29 | FlowHW = 0x01, | ||
30 | FlowSW = 0x02 | ||
31 | }; | ||
32 | |||
9 | IOSerial(const Config &); | 33 | IOSerial(const Config &); |
10 | public slots: | 34 | ~IOSerial(); |
35 | |||
36 | QString identifier() const; | ||
37 | QString name() const; | ||
38 | signals: | ||
11 | void received(const QByteArray &); | 39 | void received(const QByteArray &); |
12 | void error(int, const QString &); | 40 | void error(int, const QString &); |
41 | public slots: | ||
42 | void send(const QByteArray &); | ||
43 | bool open(); | ||
44 | void close(); | ||
45 | void reload(const Config &); | ||
46 | protected: | ||
47 | int getBaud(int baud) const; | ||
48 | protected slots: | ||
49 | void dataArrived(); | ||
50 | void errorOccured(); | ||
51 | protected: | ||
52 | QSocketNotifier *m_read; | ||
53 | QSocketNotifier *m_error; | ||
54 | QString m_device; | ||
55 | int m_baud; | ||
56 | int m_parity; | ||
57 | int m_dbits; | ||
58 | int m_sbits; | ||
59 | int m_flow; | ||
60 | int m_fd; | ||
13 | }; | 61 | }; |
14 | 62 | ||
15 | |||
16 | #endif /* OPIE_IO_SERIAL */ | 63 | #endif /* OPIE_IO_SERIAL */ |