Mercurial > ecos

annotate packages/io/serial/current/src/common/serial.c @ 1214:349e2eadf98d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/common/serial.c: Fixed bug for XON/XOFF flow control that would cause multiple XON (or XOFF) characters to be sent for a single flow control state transition. Fixed bug in serial_write() that would cause output data to be discarded if using polled mode with flow control, and output was blocked due to flow control. Fixed bug in serial_data_xmt_req() that would not stop sending data when output was flow controlled off (hardware flow control).
author jlarmour
date Fri, 12 Sep 2003 15:32:49 +0000
parents d53522870fc0
children b300f8978722
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
1 //==========================================================================
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
2 //
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
3 // io/serial/common/serial.c
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
4 //
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
5 // High level serial driver
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
6 //
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
7 //==========================================================================
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
8 //####ECOSGPLCOPYRIGHTBEGIN####
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
9 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
10 // This file is part of eCos, the Embedded Configurable Operating System.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
11 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
852
7f6b818846b4 Fix problems with -EAGAIN. Change behaviour of VMIN to match accepted behaviour.
gthomas
parents: 210
diff changeset
12 // Copyright (C) 2003 Gary Thomas
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
13 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
14 // eCos is free software; you can redistribute it and/or modify it under
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
15 // the terms of the GNU General Public License as published by the Free
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
16 // Software Foundation; either version 2 or (at your option) any later version.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
17 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
18 // eCos is distributed in the hope that it will be useful, but WITHOUT ANY
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
19 // WARRANTY; without even the implied warranty of MERCHANTABILITY or
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
20 // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
21 // for more details.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
22 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
23 // You should have received a copy of the GNU General Public License along
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
24 // with eCos; if not, write to the Free Software Foundation, Inc.,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
25 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
26 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
27 // As a special exception, if other files instantiate templates or use macros
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
28 // or inline functions from this file, or you compile this file and link it
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
29 // with other works to produce a work based on this file, this file does not
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
30 // by itself cause the resulting work to be covered by the GNU General Public
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
31 // License. However the source code for this file must still be made available
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
32 // in accordance with section (3) of the GNU General Public License.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
33 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
34 // This exception does not invalidate any other reasons why a work based on
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
35 // this file might be covered by the GNU General Public License.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
36 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
37 // Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
210
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents: 208
diff changeset
38 // at http://sources.redhat.com/ecos/ecos-license/
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
39 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 143
diff changeset
40 //####ECOSGPLCOPYRIGHTEND####
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
41 //==========================================================================
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
42 //#####DESCRIPTIONBEGIN####
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
43 //
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
44 // Author(s): gthomas
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
45 // Contributors: gthomas, grante, jlarmour, jskov
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
46 // Date: 1999-02-04
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
47 // Purpose: Top level serial driver
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
48 // Description:
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
49 //
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
50 //####DESCRIPTIONEND####
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
51 //
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
52 //==========================================================================
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
53
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
54 #include <pkgconf/io.h>
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
55 #include <pkgconf/io_serial.h>
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
56
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
57 #include <cyg/io/io.h>
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
58 #include <cyg/io/devtab.h>
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
59 #include <cyg/io/serial.h>
130
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents: 128
diff changeset
60 #include <cyg/infra/cyg_ass.h> // assertion support
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents: 128
diff changeset
61 #include <cyg/infra/diag.h> // diagnostic output
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
62
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
63 static Cyg_ErrNo serial_write(cyg_io_handle_t handle, const void *buf, cyg_uint32 *len);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
64 static Cyg_ErrNo serial_read(cyg_io_handle_t handle, void *buf, cyg_uint32 *len);
1190
d53522870fc0 * src/common/serial.c: Make serial_select prototype match
jlarmour
parents: 1054
diff changeset
65 static cyg_bool serial_select(cyg_io_handle_t handle, cyg_uint32 which, CYG_ADDRWORD info);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
66 static Cyg_ErrNo serial_get_config(cyg_io_handle_t handle, cyg_uint32 key, void *buf, cyg_uint32 *len);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
67 static Cyg_ErrNo serial_set_config(cyg_io_handle_t handle, cyg_uint32 key, const void *buf, cyg_uint32 *len);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
68
62
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT
jlarmour
parents: 20
diff changeset
69 DEVIO_TABLE(cyg_io_serial_devio,
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
70 serial_write,
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
71 serial_read,
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
72 serial_select,
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
73 serial_get_config,
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
74 serial_set_config
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
75 );
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
76
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
77 static void serial_init(serial_channel *chan);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
78 static void serial_xmt_char(serial_channel *chan);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
79 static void serial_rcv_char(serial_channel *chan, unsigned char c);
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
80 #ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
81 static void serial_indicate_status(serial_channel *chan,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
82 cyg_serial_line_status_t *s);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
83 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
84 #if CYGINT_IO_SERIAL_BLOCK_TRANSFER
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
85 static rcv_req_reply_t serial_data_rcv_req(serial_channel *chan, int avail,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
86 int* space_avail,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
87 unsigned char** space);
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
88 static void serial_data_rcv_done(serial_channel *chan, int chars_rcvd);
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
89 static xmt_req_reply_t serial_data_xmt_req(serial_channel *chan, int space,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
90 int* chars_avail,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
91 unsigned char** chars);
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
92 static void serial_data_xmt_done(serial_channel *chan, int chars_sent);
143
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents: 138
diff changeset
93 # ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
94 SERIAL_CALLBACKS(cyg_io_serial_callbacks,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
95 serial_init,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
96 serial_xmt_char,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
97 serial_rcv_char,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
98 serial_data_rcv_req,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
99 serial_data_rcv_done,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
100 serial_data_xmt_req,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
101 serial_data_xmt_done,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
102 serial_indicate_status);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
103
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
104 # else
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
105 SERIAL_CALLBACKS(cyg_io_serial_callbacks,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
106 serial_init,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
107 serial_xmt_char,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
108 serial_rcv_char,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
109 serial_data_rcv_req,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
110 serial_data_rcv_done,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
111 serial_data_xmt_req,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
112 serial_data_xmt_done);
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
113 # endif
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
114 #else
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
115 # ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
116 SERIAL_CALLBACKS(cyg_io_serial_callbacks,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
117 serial_init,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
118 serial_xmt_char,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
119 serial_rcv_char,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
120 serial_indicate_status);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
121 # else
62
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT
jlarmour
parents: 20
diff changeset
122 SERIAL_CALLBACKS(cyg_io_serial_callbacks,
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
123 serial_init,
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
124 serial_xmt_char,
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
125 serial_rcv_char);
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
126 # endif
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
127 #endif
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
128
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
129 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
130
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
131 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
132
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
133 static __inline__ void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
134 throttle_tx( serial_channel *chan )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
135 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
136 chan->flow_desc.flags |= CYG_SERIAL_FLOW_OUT_THROTTLED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
137 // the throttling itself occurs in the serial_xmt_char() callback
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
138 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
139
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
140 static __inline__ void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
141 restart_tx( serial_channel *chan )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
142 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
143 serial_funs *funs = chan->funs;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
144
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
145 chan->flow_desc.flags &= ~CYG_SERIAL_FLOW_OUT_THROTTLED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
146
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
147 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
148 // See if there is now enough room to say it is available
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
149 // for writing
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
150 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
151 cbuf_t *cbuf = &chan->out_cbuf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
152 int space;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
153
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
154 space = cbuf->len - cbuf->nb;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
155 if (space >= cbuf->low_water)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
156 cyg_selwakeup( &cbuf->selinfo );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
157 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
158 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
159 if ( chan->out_cbuf.nb > 0 )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
160 (funs->start_xmit)(chan);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
161 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
162
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
163 static __inline__ void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
164 throttle_rx( serial_channel *chan, cyg_bool force )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
165 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
166 serial_funs *funs = chan->funs;
1214
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
167 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
168 cyg_uint32 prev_flags = chan->flow_desc.flags;
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
169 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
170
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
171 chan->flow_desc.flags |= CYG_SERIAL_FLOW_IN_THROTTLED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
172 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
1214
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
173 // send an xoff if not already done (throttled)
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
174 if ( force ||
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
175 ((chan->config.flags & CYGNUM_SERIAL_FLOW_XONXOFF_RX) &&
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
176 (0==(prev_flags & CYG_SERIAL_FLOW_IN_THROTTLED))) ) {
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
177 CYG_ASSERT(force||(chan->flow_desc.xchar=='\0')||(chan->flow_desc.xchar==CYGDAT_IO_SERIAL_FLOW_CONTROL_XOFF_CHAR), "xchar already set (XOFF)");
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
178 chan->flow_desc.xchar = CYGDAT_IO_SERIAL_FLOW_CONTROL_XOFF_CHAR;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
179 // Make sure xmit is running so we can send it
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
180 (funs->start_xmit)(chan);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
181 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
182 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
183 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_HW
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
184 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
185 cyg_uint32 i=1;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
186 cyg_uint32 len = sizeof(i);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
187
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
188 // set hardware flow control - don't care if it fails
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
189 if ( force || (chan->config.flags & CYGNUM_SERIAL_FLOW_RTSCTS_RX) ||
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
190 (chan->config.flags & CYGNUM_SERIAL_FLOW_DSRDTR_RX) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
191 (funs->set_config)(chan,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
192 CYG_IO_SET_CONFIG_SERIAL_HW_RX_FLOW_THROTTLE,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
193 &i, &len);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
194 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
195 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
196 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
197
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
198 static __inline__ void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
199 restart_rx( serial_channel *chan, cyg_bool force )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
200 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
201 serial_funs *funs = chan->funs;
1214
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
202 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
203 cyg_uint32 prev_flags = chan->flow_desc.flags;
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
204 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
205
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
206 chan->flow_desc.flags &= ~CYG_SERIAL_FLOW_IN_THROTTLED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
207 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
1214
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
208 // send an xon, if we haven't already
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
209 if ( force ||
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
210 ((chan->config.flags & CYGNUM_SERIAL_FLOW_XONXOFF_RX) &&
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
211 (prev_flags & CYG_SERIAL_FLOW_IN_THROTTLED)) ) {
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
212 CYG_ASSERT(force||(chan->flow_desc.xchar=='\0')||(chan->flow_desc.xchar==CYGDAT_IO_SERIAL_FLOW_CONTROL_XON_CHAR), "xchar already set (XON)");
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
213 chan->flow_desc.xchar = CYGDAT_IO_SERIAL_FLOW_CONTROL_XON_CHAR;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
214 (funs->start_xmit)(chan); // Make sure xmit is running so we can send it
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
215 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
216 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
217 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_HW
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
218 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
219 cyg_uint32 i=0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
220 cyg_uint32 len = sizeof(i);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
221
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
222 // set hardware flow control - don't care if it fails
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
223 if ( force || (chan->config.flags & CYGNUM_SERIAL_FLOW_RTSCTS_RX) ||
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
224 (chan->config.flags & CYGNUM_SERIAL_FLOW_DSRDTR_RX) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
225 (funs->set_config)(chan,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
226 CYG_IO_SET_CONFIG_SERIAL_HW_RX_FLOW_THROTTLE,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
227 &i, &len);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
228 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
229 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
230 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
231
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
232 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
233
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
234 // ---------------------------------------------------------------------------
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
235
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
236 static void
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
237 serial_init(serial_channel *chan)
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
238 {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
239 if (chan->init) return;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
240 if (chan->out_cbuf.len != 0) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
241 #ifdef CYGDBG_IO_INIT
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
242 diag_printf("Set output buffer - buf: %x len: %d\n", chan->out_cbuf.data, chan->out_cbuf.len);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
243 #endif
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
244 chan->out_cbuf.waiting = false;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
245 chan->out_cbuf.abort = false;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
246 #ifdef CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
247 chan->out_cbuf.blocking = true;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
248 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
249 chan->out_cbuf.pending = 0;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
250 cyg_drv_mutex_init(&chan->out_cbuf.lock);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
251 cyg_drv_cond_init(&chan->out_cbuf.wait, &chan->out_cbuf.lock);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
252 chan->out_cbuf.low_water = chan->out_cbuf.len / 4;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
253 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
254 cyg_selinit( &chan->out_cbuf.selinfo );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
255 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
256 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
257 if (chan->in_cbuf.len != 0) {
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
258 cbuf_t *cbuf = &chan->in_cbuf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
259
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
260 #ifdef CYGDBG_IO_INIT
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
261 diag_printf("Set input buffer - buf: %x len: %d\n", cbuf->data, cbuf->len);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
262 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
263 cbuf->waiting = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
264 cbuf->abort = false;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
265 #ifdef CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
266 cbuf->blocking = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
267 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
268 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
269 cyg_selinit( &cbuf->selinfo );
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
270 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
271 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
272 cbuf->low_water =
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
273 (CYGNUM_IO_SERIAL_FLOW_CONTROL_LOW_WATER_PERCENT * cbuf->len) / 100;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
274 cbuf->high_water =
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
275 (CYGNUM_IO_SERIAL_FLOW_CONTROL_HIGH_WATER_PERCENT * cbuf->len) / 100;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
276 # ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
277 // But make sure it is at least 35 below buffer size, to allow
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
278 // for 16 byte fifos, twice, plus some latency before s/w flow
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
279 // control can kick in. This doesn't apply to h/w flow control
1214
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
280 // as it is near-instantaneous
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
281 if ( (cbuf->len - cbuf->high_water) < 35 )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
282 cbuf->high_water = cbuf->len - 35;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
283 // and just in case...
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
284 if ( cbuf->high_water <= 0 )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
285 cbuf->high_water = 1;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
286 if ( cbuf->low_water > cbuf->high_water )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
287 cbuf->low_water = cbuf->high_water;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
288 # endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
289 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
290 cyg_drv_mutex_init(&cbuf->lock);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
291 cyg_drv_cond_init(&cbuf->wait, &cbuf->lock);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
292 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
293 #ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
294 chan->status_callback = NULL;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
295 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
296
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
297 #ifdef CYGDBG_USE_ASSERTS
138
289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT
jlarmour
parents: 130
diff changeset
298 #if CYGINT_IO_SERIAL_BLOCK_TRANSFER
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
299 chan->in_cbuf.block_mode_xfer_running = false;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
300 chan->out_cbuf.block_mode_xfer_running = false;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
301 #endif // CYGINT_IO_SERIAL_BLOCK_TRANSFER
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
302 #endif // CYGDBG_USE_ASSERTS
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
303 chan->init = true;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
304 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
305
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
306 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
307
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
308 static Cyg_ErrNo
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
309 serial_write(cyg_io_handle_t handle, const void *_buf, cyg_uint32 *len)
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
310 {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
311 cyg_devtab_entry_t *t = (cyg_devtab_entry_t *)handle;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
312 serial_channel *chan = (serial_channel *)t->priv;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
313 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
314 cyg_int32 size = *len;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
315 cyg_uint8 *buf = (cyg_uint8 *)_buf;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
316 int next;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
317 cbuf_t *cbuf = &chan->out_cbuf;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
318 Cyg_ErrNo res = ENOERR;
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
319
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
320 cyg_drv_mutex_lock(&cbuf->lock);
4
1d7f19c9e4d1 Merge from eCos master repository on 1999-05-11-21:11:10-BST
jlarmour
parents: 2
diff changeset
321 cbuf->abort = false;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
322
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
323 if (cbuf->len == 0) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
324 // Non interrupt driven (i.e. polled) operation
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
325 while (size-- > 0) {
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
326 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
1214
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
327 while ( ( 0 != (chan->flow_desc.flags & CYG_SERIAL_FLOW_OUT_THROTTLED) ) ||
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
328 ((funs->putc)(chan, *buf) == false) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
329 ; // Ignore full, keep trying
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
330 #else
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
331 while ((funs->putc)(chan, *buf) == false)
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
332 ; // Ignore full, keep trying
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
333 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
334 buf++;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
335 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
336 } else {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
337 cyg_drv_dsr_lock(); // Avoid race condition testing pointers
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
338 while (size > 0) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
339 next = cbuf->put + 1;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
340 if (next == cbuf->len) next = 0;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
341 if (cbuf->nb == cbuf->len) {
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
342 cbuf->waiting = true;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
343 // Buffer full - wait for space
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
344 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
345 if ( 0 == (chan->flow_desc.flags & CYG_SERIAL_FLOW_OUT_THROTTLED) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
346 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
347 (funs->start_xmit)(chan); // Make sure xmit is running
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
348
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
349 // Check flag: 'start_xmit' may have obviated the need
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
350 // to wait :-)
62
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT
jlarmour
parents: 20
diff changeset
351 if (cbuf->waiting) {
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
352 #ifdef CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
353 // Optionally return if configured for non-blocking mode.
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
354 if (!cbuf->blocking) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
355 *len -= size; // number of characters actually sent
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
356 cbuf->waiting = false;
868
61bd80311015 Fix typo - ENOERROR must be ENOERR
gthomas
parents: 864
diff changeset
357 res = size == 0 ? -EAGAIN : ENOERR;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
358 break;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
359 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
360 #endif // CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
62
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT
jlarmour
parents: 20
diff changeset
361 cbuf->pending += size; // Have this much more to send [eventually]
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
362 if( !cyg_drv_cond_wait(&cbuf->wait) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
363 cbuf->abort = true;
62
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT
jlarmour
parents: 20
diff changeset
364 cbuf->pending -= size;
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT
jlarmour
parents: 20
diff changeset
365 }
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
366 if (cbuf->abort) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
367 // Give up!
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
368 *len -= size; // number of characters actually sent
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
369 cbuf->abort = false;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
370 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
371 res = -EINTR;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
372 break;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
373 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
374 } else {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
375 cbuf->data[cbuf->put++] = *buf++;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
376 cbuf->put = next;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
377 cbuf->nb++;
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
378 size--; // Only count if actually sent!
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
379 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
380 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
381 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
382 if ( 0 == (chan->flow_desc.flags & CYG_SERIAL_FLOW_OUT_THROTTLED) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
383 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
384 (funs->start_xmit)(chan); // Start output as necessary
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
385 cyg_drv_dsr_unlock();
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
386 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
387 cyg_drv_mutex_unlock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
388 return res;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
389 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
390
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
391
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
392 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
393
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
394 static Cyg_ErrNo
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
395 serial_read(cyg_io_handle_t handle, void *_buf, cyg_uint32 *len)
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
396 {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
397 cyg_devtab_entry_t *t = (cyg_devtab_entry_t *)handle;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
398 serial_channel *chan = (serial_channel *)t->priv;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
399 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
400 cyg_uint8 *buf = (cyg_uint8 *)_buf;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
401 cyg_int32 size = 0;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
402 cbuf_t *cbuf = &chan->in_cbuf;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
403 Cyg_ErrNo res = ENOERR;
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
404 #ifdef XX_CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
405 extern int enable_diag_uart;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
406 int _enable = enable_diag_uart;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
407 int _time, _stime;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
408 externC cyg_tick_count_t cyg_current_time(void);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
409 #endif // CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
410
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
411 cyg_drv_mutex_lock(&cbuf->lock);
4
1d7f19c9e4d1 Merge from eCos master repository on 1999-05-11-21:11:10-BST
jlarmour
parents: 2
diff changeset
412 cbuf->abort = false;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
413
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
414 if (cbuf->len == 0) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
415 // Non interrupt driven (i.e. polled) operation
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
416 while (size++ < *len) {
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
417 cyg_uint8 c = (funs->getc)(chan);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
418 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
419 // for software flow control, if the driver returns one of the
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
420 // characters we act on it and then drop it (the app must not
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
421 // see it)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
422 if ( chan->config.flags & CYGNUM_SERIAL_FLOW_XONXOFF_TX ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
423 if ( c == CYGDAT_IO_SERIAL_FLOW_CONTROL_XOFF_CHAR ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
424 throttle_tx( chan );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
425 } else if ( c == CYGDAT_IO_SERIAL_FLOW_CONTROL_XON_CHAR ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
426 restart_tx( chan );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
427 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
428 else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
429 *buf++ = c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
430 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
431 else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
432 *buf++ = c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
433 #else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
434 *buf++ = c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
435 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
436 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
437 } else {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
438 cyg_drv_dsr_lock(); // Avoid races
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
439 while (size < *len) {
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
440 if (cbuf->nb > 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
441 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
442 if ( (cbuf->nb <= cbuf->low_water) &&
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
443 (chan->flow_desc.flags & CYG_SERIAL_FLOW_IN_THROTTLED) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
444 restart_rx( chan, false );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
445 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
446 *buf++ = cbuf->data[cbuf->get];
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
447 if (++cbuf->get == cbuf->len) cbuf->get = 0;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
448 cbuf->nb--;
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
449 size++;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
450 } else {
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
451 #ifdef CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
452 if (!cbuf->blocking) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
453 *len = size; // characters actually read
868
61bd80311015 Fix typo - ENOERROR must be ENOERR
gthomas
parents: 864
diff changeset
454 res = size == 0 ? -EAGAIN : ENOERR;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
455 break;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
456 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
457 #endif // CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
458 cbuf->waiting = true;
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
459 #ifdef XX_CYGDBG_DIAG_BUF
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
460 enable_diag_uart = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
461 HAL_CLOCK_READ(&_time);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
462 _stime = (int)cyg_current_time();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
463 diag_printf("READ wait - get: %d, put: %d, time: %x.%x\n", cbuf->get, cbuf->put, _stime, _time);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
464 enable_diag_uart = _enable;
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
465 #endif // CYGDBG_DIAG_BUF
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
466 if( !cyg_drv_cond_wait(&cbuf->wait) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
467 cbuf->abort = true;
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
468 #ifdef XX_CYGDBG_DIAG_BUF
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
469 enable_diag_uart = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
470 HAL_CLOCK_READ(&_time);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
471 _stime = (int)cyg_current_time();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
472 diag_printf("READ continue - get: %d, put: %d, time: %x.%x\n", cbuf->get, cbuf->put, _stime, _time);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
473 enable_diag_uart = _enable;
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
474 #endif // CYGDBG_DIAG_BUF
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
475 if (cbuf->abort) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
476 // Give up!
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
477 *len = size; // characters actually read
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
478 cbuf->abort = false;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
479 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
480 res = -EINTR;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
481 break;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
482 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
483 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
484 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
485 cyg_drv_dsr_unlock();
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
486 }
82
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST
jlarmour
parents: 66
diff changeset
487 #ifdef XX_CYGDBG_DIAG_BUF
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
488 cyg_drv_isr_lock();
82
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST
jlarmour
parents: 66
diff changeset
489 enable_diag_uart = 0;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST
jlarmour
parents: 66
diff changeset
490 HAL_CLOCK_READ(&_time);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST
jlarmour
parents: 66
diff changeset
491 _stime = (int)cyg_current_time();
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST
jlarmour
parents: 66
diff changeset
492 diag_printf("READ done - size: %d, len: %d, time: %x.%x\n", size, *len, _stime, _time);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST
jlarmour
parents: 66
diff changeset
493 enable_diag_uart = _enable;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST
jlarmour
parents: 66
diff changeset
494 cyg_drv_isr_unlock();
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
495 #endif // CYGDBG_DIAG_BUF
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
496 cyg_drv_mutex_unlock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
497 return res;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
498 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
499
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
500
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
501 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
502
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
503 static cyg_bool
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
504 serial_select(cyg_io_handle_t handle, cyg_uint32 which, CYG_ADDRWORD info)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
505 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
506 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
507
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
508 cyg_devtab_entry_t *t = (cyg_devtab_entry_t *)handle;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
509 serial_channel *chan = (serial_channel *)t->priv;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
510
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
511
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
512 switch( which )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
513 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
514 case CYG_FREAD:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
515 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
516 cbuf_t *cbuf = &chan->in_cbuf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
517
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
518 // Check for data in the input buffer. If there is none,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
519 // register the select operation, otherwise return true.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
520
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
521 if( cbuf->nb == 0 )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
522 cyg_selrecord( info, &cbuf->selinfo );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
523 else return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
524 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
525 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
526
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
527 case CYG_FWRITE:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
528 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
529 // Check for space in the output buffer. If there is none,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
530 // register the select operation, otherwise return true.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
531
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
532 cbuf_t *cbuf = &chan->out_cbuf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
533 int space = cbuf->len - cbuf->nb;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
534 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
535 if ( (space < cbuf->low_water) ||
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
536 (chan->flow_desc.flags & CYG_SERIAL_FLOW_OUT_THROTTLED) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
537 cyg_selrecord( info, &cbuf->selinfo );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
538 #else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
539 if (space < cbuf->low_water)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
540 cyg_selrecord( info, &cbuf->selinfo );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
541 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
542 else return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
543 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
544 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
545
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
546 case 0: // exceptions - none supported
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
547 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
548 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
549 return false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
550 #else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
551
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
552 // With no select support, we simply return true.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
553 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
554 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
555 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
556
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
557
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
558 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
559
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
560 static Cyg_ErrNo
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
561 serial_get_config(cyg_io_handle_t handle, cyg_uint32 key, void *xbuf,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
562 cyg_uint32 *len)
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
563 {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
564 cyg_devtab_entry_t *t = (cyg_devtab_entry_t *)handle;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
565 serial_channel *chan = (serial_channel *)t->priv;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
566 cyg_serial_info_t *buf = (cyg_serial_info_t *)xbuf;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
567 Cyg_ErrNo res = ENOERR;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
568 cbuf_t *out_cbuf = &chan->out_cbuf;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
569 cbuf_t *in_cbuf = &chan->in_cbuf;
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
570 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
571
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
572 switch (key) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
573 case CYG_IO_GET_CONFIG_SERIAL_INFO:
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
574 if (*len < sizeof(cyg_serial_info_t)) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
575 return -EINVAL;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
576 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
577 *buf = chan->config;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
578 *len = sizeof(chan->config);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
579 break;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
580
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
581 case CYG_IO_GET_CONFIG_SERIAL_BUFFER_INFO:
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
582 // return rx/tx buffer sizes and counts
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
583 {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
584 cyg_serial_buf_info_t *p;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
585 if (*len < sizeof(cyg_serial_buf_info_t))
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
586 return -EINVAL;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
587
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
588 *len = sizeof(cyg_serial_buf_info_t);
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
589 p = (cyg_serial_buf_info_t *)xbuf;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
590
88
afdeb44241de Merge from eCos master repository on 2000-05-12-07:47:04-BST
jlarmour
parents: 86
diff changeset
591 p->rx_bufsize = in_cbuf->len;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
592 if (p->rx_bufsize)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
593 p->rx_count = in_cbuf->nb;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
594 else
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
595 p->rx_count = 0;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
596
88
afdeb44241de Merge from eCos master repository on 2000-05-12-07:47:04-BST
jlarmour
parents: 86
diff changeset
597 p->tx_bufsize = out_cbuf->len;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
598 if (p->tx_bufsize)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
599 p->tx_count = out_cbuf->nb;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
600 else
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
601 p->tx_count = 0;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
602 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
603 break;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
604
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
605 case CYG_IO_GET_CONFIG_SERIAL_OUTPUT_DRAIN:
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
606 // Wait for any pending output to complete
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
607 if (out_cbuf->len == 0) break; // Nothing to do if not buffered
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
608 cyg_drv_mutex_lock(&out_cbuf->lock); // Stop any further output processing
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
609 cyg_drv_dsr_lock();
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
610 while (out_cbuf->pending || (out_cbuf->nb > 0)) {
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
611 out_cbuf->waiting = true;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
612 if(!cyg_drv_cond_wait(&out_cbuf->wait) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
613 res = -EINTR;
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
614 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
615 cyg_drv_dsr_unlock();
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
616 cyg_drv_mutex_unlock(&out_cbuf->lock);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
617 break;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
618
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
619 case CYG_IO_GET_CONFIG_SERIAL_INPUT_FLUSH:
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
620 // Flush any buffered input
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
621 if (in_cbuf->len == 0) break; // Nothing to do if not buffered
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
622 cyg_drv_mutex_lock(&in_cbuf->lock); // Stop any further input processing
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
623 cyg_drv_dsr_lock();
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
624 if (in_cbuf->waiting) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
625 in_cbuf->abort = true;
1054
c706e0d163d7 * src/common/serial.c: Changed all calls to cyg_drv_cond_signal()
nickg
parents: 1035
diff changeset
626 cyg_drv_cond_broadcast(&in_cbuf->wait);
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
627 in_cbuf->waiting = false;
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
628 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
629 in_cbuf->get = in_cbuf->put = in_cbuf->nb = 0; // Flush buffered input
864
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
630
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
631 // Pass to the hardware driver in case it wants to flush FIFOs etc.
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
632 (funs->set_config)(chan,
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
633 CYG_IO_SET_CONFIG_SERIAL_INPUT_FLUSH,
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
634 NULL, NULL);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
635 cyg_drv_dsr_unlock();
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
636 cyg_drv_mutex_unlock(&in_cbuf->lock);
1035
f81e485de35c Restart RX after flush
gthomas
parents: 868
diff changeset
637 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
f81e485de35c Restart RX after flush
gthomas
parents: 868
diff changeset
638 // Restart receiver if it was shutdown
f81e485de35c Restart RX after flush
gthomas
parents: 868
diff changeset
639 if ((chan->flow_desc.flags & CYG_SERIAL_FLOW_IN_THROTTLED) != 0) {
f81e485de35c Restart RX after flush
gthomas
parents: 868
diff changeset
640 restart_rx( chan, false );
f81e485de35c Restart RX after flush
gthomas
parents: 868
diff changeset
641 }
f81e485de35c Restart RX after flush
gthomas
parents: 868
diff changeset
642 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
643 break;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
644
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
645 case CYG_IO_GET_CONFIG_SERIAL_ABORT:
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
646 // Abort any outstanding I/O, including blocked reads
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
647 // Caution - assumed to be called from 'timeout' (i.e. DSR) code
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
648 if (in_cbuf->len != 0) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
649 in_cbuf->abort = true;
1054
c706e0d163d7 * src/common/serial.c: Changed all calls to cyg_drv_cond_signal()
nickg
parents: 1035
diff changeset
650 cyg_drv_cond_broadcast(&in_cbuf->wait);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
651 }
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
652 if (out_cbuf->len != 0) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
653 out_cbuf->abort = true;
1054
c706e0d163d7 * src/common/serial.c: Changed all calls to cyg_drv_cond_signal()
nickg
parents: 1035
diff changeset
654 cyg_drv_cond_broadcast(&out_cbuf->wait);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
655 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
656 break;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
657
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
658 case CYG_IO_GET_CONFIG_SERIAL_OUTPUT_FLUSH:
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
659 // Throw away any pending output
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
660 if (out_cbuf->len == 0) break; // Nothing to do if not buffered
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
661 cyg_drv_mutex_lock(&out_cbuf->lock); // Stop any further output processing
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
662 cyg_drv_dsr_lock();
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
663 if (out_cbuf->nb > 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
664 out_cbuf->get = out_cbuf->put = out_cbuf->nb = 0; // Empties queue!
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
665 (funs->stop_xmit)(chan); // Done with transmit
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
666 }
864
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
667 // Pass to the hardware driver in case it wants to flush FIFOs etc.
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
668 (funs->set_config)(chan,
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
669 CYG_IO_SET_CONFIG_SERIAL_OUTPUT_FLUSH,
c398056d144d * src/common/serial.c (serial_get_config): For both INPUT_FLUSH
jlarmour
parents: 852
diff changeset
670 NULL, NULL);
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
671 if (out_cbuf->waiting) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
672 out_cbuf->abort = true;
1054
c706e0d163d7 * src/common/serial.c: Changed all calls to cyg_drv_cond_signal()
nickg
parents: 1035
diff changeset
673 cyg_drv_cond_broadcast(&out_cbuf->wait);
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
674 out_cbuf->waiting = false;
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
675 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
676 cyg_drv_dsr_unlock();
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
677 cyg_drv_mutex_unlock(&out_cbuf->lock);
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
678 break;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
679
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
680 #ifdef CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
681 case CYG_IO_GET_CONFIG_READ_BLOCKING:
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
682 if (*len < sizeof(cyg_uint32)) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
683 return -EINVAL;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
684 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
685 *(cyg_uint32*)xbuf = (in_cbuf->blocking) ? 1 : 0;
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
686 break;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
687
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
688 case CYG_IO_GET_CONFIG_WRITE_BLOCKING:
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
689 if (*len < sizeof(cyg_uint32)) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
690 return -EINVAL;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
691 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
692 *(cyg_uint32*)xbuf = (out_cbuf->blocking) ? 1 : 0;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
693 break;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
694 #endif // CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
695
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
696 default:
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
697 res = -EINVAL;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
698 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
699 return res;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
700 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
701
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
702
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
703 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
704
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
705 static Cyg_ErrNo
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
706 serial_set_config(cyg_io_handle_t handle, cyg_uint32 key, const void *xbuf,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
707 cyg_uint32 *len)
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
708 {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
709 Cyg_ErrNo res = ENOERR;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
710 cyg_devtab_entry_t *t = (cyg_devtab_entry_t *)handle;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
711 serial_channel *chan = (serial_channel *)t->priv;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
712 #ifdef CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
713 cbuf_t *out_cbuf = &chan->out_cbuf;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
714 cbuf_t *in_cbuf = &chan->in_cbuf;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
715 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
716 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
717
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
718 switch (key) {
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
719 #ifdef CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
720 case CYG_IO_SET_CONFIG_READ_BLOCKING:
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
721 if (*len < sizeof(cyg_uint32) || 0 == in_cbuf->len) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
722 return -EINVAL;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
723 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
724 in_cbuf->blocking = (1 == *(cyg_uint32*)xbuf) ? true : false;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
725 break;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
726 case CYG_IO_SET_CONFIG_WRITE_BLOCKING:
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
727 if (*len < sizeof(cyg_uint32) || 0 == out_cbuf->len) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
728 return -EINVAL;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
729 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
730 out_cbuf->blocking = (1 == *(cyg_uint32*)xbuf) ? true : false;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
731 break;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
732 #endif // CYGOPT_IO_SERIAL_SUPPORT_NONBLOCKING
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
733
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
734 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
735 case CYG_IO_SET_CONFIG_SERIAL_FLOW_CONTROL_METHOD:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
736 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
737 cyg_uint32 *f = (cyg_uint32 *)xbuf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
738
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
739 if (*len < sizeof(*f))
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
740 return -EINVAL;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
741
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
742 cyg_drv_dsr_lock();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
743
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
744 chan->config.flags &= ~(CYGNUM_SERIAL_FLOW_XONXOFF_RX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
745 CYGNUM_SERIAL_FLOW_XONXOFF_TX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
746 CYGNUM_SERIAL_FLOW_RTSCTS_RX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
747 CYGNUM_SERIAL_FLOW_RTSCTS_TX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
748 CYGNUM_SERIAL_FLOW_DSRDTR_RX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
749 CYGNUM_SERIAL_FLOW_DSRDTR_TX);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
750 chan->config.flags |= (*f & (
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
751 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
752 CYGNUM_SERIAL_FLOW_XONXOFF_RX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
753 CYGNUM_SERIAL_FLOW_XONXOFF_TX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
754 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
755 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_HW
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
756 CYGNUM_SERIAL_FLOW_RTSCTS_RX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
757 CYGNUM_SERIAL_FLOW_RTSCTS_TX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
758 CYGNUM_SERIAL_FLOW_DSRDTR_RX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
759 CYGNUM_SERIAL_FLOW_DSRDTR_TX|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
760 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
761 0));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
762 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_HW
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
763 // up to hardware driver to clear flags if rejected
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
764 res = (funs->set_config)(chan,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
765 CYG_IO_SET_CONFIG_SERIAL_HW_FLOW_CONFIG,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
766 NULL, NULL);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
767 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
768 cyg_drv_dsr_unlock();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
769 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
770 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
771
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
772 case CYG_IO_SET_CONFIG_SERIAL_FLOW_CONTROL_FORCE:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
773 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
774 cyg_uint32 *f = (cyg_uint32 *)xbuf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
775
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
776 if (*len < sizeof(*f))
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
777 return -EINVAL;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
778
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
779 cyg_drv_dsr_lock();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
780 switch (*f) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
781 case CYGNUM_SERIAL_FLOW_THROTTLE_RX:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
782 throttle_rx( chan, true );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
783 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
784 case CYGNUM_SERIAL_FLOW_RESTART_RX:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
785 restart_rx( chan, true );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
786 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
787 case CYGNUM_SERIAL_FLOW_THROTTLE_TX:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
788 throttle_tx( chan );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
789 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
790 case CYGNUM_SERIAL_FLOW_RESTART_TX:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
791 restart_tx( chan );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
792 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
793 default:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
794 res = -EINVAL;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
795 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
796 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
797 cyg_drv_dsr_unlock();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
798 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
799 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
800 #endif // CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
801
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
802 #ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
803 case CYG_IO_SET_CONFIG_SERIAL_STATUS_CALLBACK:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
804 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
805 cyg_serial_line_status_callback_fn_t newfn;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
806 CYG_ADDRWORD newpriv;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
807 cyg_serial_line_status_callback_t *tmp =
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
808 (cyg_serial_line_status_callback_t *)xbuf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
809
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
810 if ( *len < sizeof(*tmp) )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
811 return -EINVAL;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
812
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
813 newfn = tmp->fn;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
814 newpriv = tmp->priv;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
815
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
816 // prevent callbacks while we do this
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
817 cyg_drv_dsr_lock();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
818 // store old callbacks in same structure
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
819 tmp->fn = chan->status_callback;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
820 tmp->priv = chan->status_callback_priv;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
821 chan->status_callback = newfn;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
822 chan->status_callback_priv = newpriv;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
823 cyg_drv_dsr_unlock();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
824 *len = sizeof(*tmp);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
825 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
826 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
827 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
828
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
829 default:
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
830 // pass down to lower layers
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
831 return (funs->set_config)(chan, key, xbuf, len);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
832 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
833 return res;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
834 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
835
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
836 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
837
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
838 static void
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
839 serial_xmt_char(serial_channel *chan)
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
840 {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
841 cbuf_t *cbuf = &chan->out_cbuf;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
842 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
843 unsigned char c;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
844 int space;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
845
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
846 #if CYGINT_IO_SERIAL_BLOCK_TRANSFER
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
847 CYG_ASSERT(false == cbuf->block_mode_xfer_running,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
848 "Attempting char xmt while block transfer is running");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
849 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
850 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
851 // if we are required to send an XON/XOFF char, send it before
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
852 // anything else
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
853 // FIXME: what if XON gets corrupted in transit to the other end?
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
854 // Should we resend XON even though the other end may not be wanting
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
855 // to send us stuff at this point?
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
856 if ( chan->config.flags & CYGNUM_SERIAL_FLOW_XONXOFF_RX ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
857 if ( chan->flow_desc.xchar ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
858 if ( (funs->putc)(chan, chan->flow_desc.xchar) ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
859 chan->flow_desc.xchar = '\0';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
860 } else { // otherwise there's no space and we have to wait
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
861 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
862 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
863 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
864 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
865 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
866 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
867 // if we're meant to be throttled, just stop and leave
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
868 if ( chan->flow_desc.flags & CYG_SERIAL_FLOW_OUT_THROTTLED ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
869 (funs->stop_xmit)(chan); // Stop transmitting for now
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
870 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
871 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
872 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
873 while (cbuf->nb > 0) {
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
874 c = cbuf->data[cbuf->get];
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
875 if ((funs->putc)(chan, c)) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
876 cbuf->get++;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
877 if (cbuf->get == cbuf->len) cbuf->get = 0;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
878 cbuf->nb--;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
879 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
880 // See if there is now enough room to restart writer
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
881 space = cbuf->len - cbuf->nb;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
882 if (space >= cbuf->low_water) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
883 if (cbuf->waiting) {
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
884 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
885 cyg_drv_cond_broadcast(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
886 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
887 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
888 cyg_selwakeup( &cbuf->selinfo );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
889 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
890 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
891 return; // Need to wait for more space
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
892 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
893 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
894 (funs->stop_xmit)(chan); // Done with transmit
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
895
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
896 // must signal waiters, and wake up selecters for the case when
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
897 // this was the last char to be sent and they hadn't been signalled
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
898 // before (e.g. because of flow control)
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
899 if (cbuf->waiting) {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
900 cbuf->waiting = false;
1054
c706e0d163d7 * src/common/serial.c: Changed all calls to cyg_drv_cond_signal()
nickg
parents: 1035
diff changeset
901 cyg_drv_cond_broadcast(&cbuf->wait);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
902 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
903 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
904 cyg_selwakeup( &cbuf->selinfo );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
905 #endif
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
906 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
907
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
908 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
909
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
910 static void
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
911 serial_rcv_char(serial_channel *chan, unsigned char c)
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
912 {
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
913 cbuf_t *cbuf = &chan->in_cbuf;
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
914
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
915 #if CYGINT_IO_SERIAL_BLOCK_TRANSFER
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
916 CYG_ASSERT(false == cbuf->block_mode_xfer_running,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
917 "Attempting char rcv while block transfer is running");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
918 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
919 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
920 // for software flow control, if the driver returns one of the characters
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
921 // we act on it and then drop it (the app must not see it)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
922 if ( chan->config.flags & CYGNUM_SERIAL_FLOW_XONXOFF_TX ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
923 if ( c == CYGDAT_IO_SERIAL_FLOW_CONTROL_XOFF_CHAR ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
924 throttle_tx( chan );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
925 return; // it wasn't a "real" character
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
926 } else if ( c == CYGDAT_IO_SERIAL_FLOW_CONTROL_XON_CHAR ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
927 restart_tx( chan );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
928 return; // it wasn't a "real" character
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
929 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
930 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
931 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
932 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
933 // If we've hit the high water mark, tell the other side to stop
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
934 if ( cbuf->nb >= cbuf->high_water ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
935 throttle_rx( chan, false );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
936 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
937 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
938 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
939 // Wake up any pending selectors if we are about to
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
940 // put some data into a previously empty buffer.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
941 if( cbuf->nb == 0 )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
942 cyg_selwakeup( &cbuf->selinfo );
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
943 #endif
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
944
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
945 // If the flow control is not enabled/sufficient and the buffer is
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
946 // already full, just throw new characters away.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
947
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
948 if ( cbuf->nb < cbuf->len ) {
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
949 cbuf->data[cbuf->put++] = c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
950 if (cbuf->put == cbuf->len) cbuf->put = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
951 cbuf->nb++;
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
952 } // note trailing else
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
953 #ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
954 else {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
955 // Overrun. Report the error.
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
956 cyg_serial_line_status_t stat;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
957 stat.which = CYGNUM_SERIAL_STATUS_OVERRUNERR;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
958 serial_indicate_status(chan, &stat);
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
959 }
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
960 #endif
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
961
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
962 if (cbuf->waiting) {
20
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
963 #ifdef XX_CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
964 extern int enable_diag_uart;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
965 int _enable = enable_diag_uart;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
966 int _time, _stime;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
967 externC cyg_tick_count_t cyg_current_time(void);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
968 enable_diag_uart = 0;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
969 HAL_CLOCK_READ(&_time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
970 _stime = (int)cyg_current_time();
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
971 diag_printf("Signal reader - time: %x.%x\n", _stime, _time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
972 enable_diag_uart = _enable;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST
jlarmour
parents: 4
diff changeset
973 #endif // CYGDBG_DIAG_BUF
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
974 cbuf->waiting = false;
1054
c706e0d163d7 * src/common/serial.c: Changed all calls to cyg_drv_cond_signal()
nickg
parents: 1035
diff changeset
975 cyg_drv_cond_broadcast(&cbuf->wait);
2
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
976 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
977 }
443894e2e912 Block commit of eCos version 1.2.1
jlarmour
parents:
diff changeset
978
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
979 //----------------------------------------------------------------------------
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
980 // Flow control indication callback
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
981
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
982 #ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
983 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
984 serial_indicate_status(serial_channel *chan, cyg_serial_line_status_t *s )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
985 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
986 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
987 if ( CYGNUM_SERIAL_STATUS_FLOW == s->which ) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
988 if ( s->value )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
989 restart_tx( chan );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
990 else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
991 throttle_tx( chan );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
992 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
993 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
994 if ( chan->status_callback )
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
995 (*chan->status_callback)(s, chan->status_callback_priv);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
996 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
997 #endif // ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
998
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
999 //----------------------------------------------------------------------------
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1000 // Block transfer functions. Not all drivers require these. Those that
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1001 // do must follow the required semantics:
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1002 //
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1003 // Attempt to transfer as much via the block transfer function as
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1004 // possible, _but_ if that fails, do the remaining bytes via the
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1005 // single-char function. That ensures that all policy decisions can be
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1006 // made in this driver, and not in the device driver.
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1007 //
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1008 // Note: if the driver uses DMA for transmission, an initial failing
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1009 // call to the xmt_req function must cause the start_xmit function to
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1010 // fall-back to regular CPU-interrupt based single-character
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1011 // transmission.
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1012
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1013 #if CYGINT_IO_SERIAL_BLOCK_TRANSFER
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1014
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1015 static rcv_req_reply_t
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1016 serial_data_rcv_req(serial_channel *chan, int avail,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1017 int* space_avail, unsigned char** space)
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1018 {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1019 cbuf_t *cbuf = &chan->in_cbuf;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1020 int gap;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1021
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1022 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1023 // When there is software flow-control, force the serial device
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1024 // driver to use the single-char xmt/rcv functions, since these
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1025 // have to make policy decision based on the data. Rcv function
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1026 // may also have to transmit data to throttle the xmitter.
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1027 if (chan->config.flags & (CYGNUM_SERIAL_FLOW_XONXOFF_TX|CYGNUM_SERIAL_FLOW_XONXOFF_RX))
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1028 return CYG_RCV_DISABLED;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1029 #endif
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1030
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1031 CYG_ASSERT(false == cbuf->block_mode_xfer_running,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1032 "Attempting new block transfer while another is running");
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1033 // Check for space
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1034 gap = cbuf->nb;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1035 if (gap == cbuf->len)
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1036 return CYG_RCV_FULL;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1037
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1038 #ifdef CYGDBG_USE_ASSERTS
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1039 cbuf->block_mode_xfer_running = true;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1040 #endif
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1041
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1042 if (0 == gap) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1043 // Buffer is empty. Reset put/get indexes to get max transfer in
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1044 // one chunk.
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1045 cbuf->get = 0;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1046 cbuf->put = 0;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1047 gap = cbuf->len;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1048 } else {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1049 // Free space (G = get, P = put, x = data, . = empty)
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1050 // positive: xxxxP.....Gxxx
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1051 // negative: ..GxxxxxP..... [offer last chunk only]
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1052
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1053 // First try for a gap between put and get locations
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1054 gap = cbuf->get - cbuf->put;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1055 if (gap < 0) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1056 // If failed, the gap is between put and the end of buffer
107
7f461c3a372c Merge from eCos master repository on 2000-07-04-08:04:30-BST
jlarmour
parents: 88
diff changeset
1057 gap = cbuf->len - cbuf->put;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1058 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1059 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1060
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1061 if (avail < gap) gap = avail; // bound by what's available from hw
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1062
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1063 *space_avail = gap;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1064 *space = &cbuf->data[cbuf->put];
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1065
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1066 CYG_ASSERT((gap+cbuf->nb) <= cbuf->len, "Buffer will overflow");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1067 CYG_ASSERT(cbuf->put < cbuf->len, "Invalid put ptr");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1068 CYG_ASSERT(cbuf->get < cbuf->len, "Invalid get ptr");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1069
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1070 return CYG_RCV_OK;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1071 }
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1072
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1073 static void
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1074 serial_data_rcv_done(serial_channel *chan, int chars_rcvd)
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1075 {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1076 cbuf_t *cbuf = &chan->in_cbuf;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1077
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1078 cbuf->put += chars_rcvd;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1079 cbuf->nb += chars_rcvd;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1080
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1081 if (cbuf->put == cbuf->len) cbuf->put = 0;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1082
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1083 CYG_ASSERT(cbuf->nb <= cbuf->len, "Buffer overflow");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1084 CYG_ASSERT(cbuf->put < cbuf->len, "Invalid put ptr");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1085 CYG_ASSERT(cbuf->get < cbuf->len, "Invalid get ptr");
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1086
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1087 if (cbuf->waiting) {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1088 cbuf->waiting = false;
1054
c706e0d163d7 * src/common/serial.c: Changed all calls to cyg_drv_cond_signal()
nickg
parents: 1035
diff changeset
1089 cyg_drv_cond_broadcast(&cbuf->wait);
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1090 }
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1091 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1092 // If we've hit the high water mark, tell the other side to stop
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1093 if ( cbuf->nb >= cbuf->high_water ) {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1094 throttle_rx( chan, false );
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1095 }
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1096 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1097 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1098 // Wake up any pending selectors if we have
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1099 // put some data into a previously empty buffer.
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1100 if (chars_rcvd == cbuf->nb)
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1101 cyg_selwakeup( &cbuf->selinfo );
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1102 #endif
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1103
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1104 #ifdef CYGDBG_USE_ASSERTS
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1105 cbuf->block_mode_xfer_running = false;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1106 #endif
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1107 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1108
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1109 static xmt_req_reply_t
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1110 serial_data_xmt_req(serial_channel *chan, int space,
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1111 int* chars_avail, unsigned char** chars)
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1112 {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1113 cbuf_t *cbuf = &chan->out_cbuf;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1114 int avail;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1115
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1116 #ifdef CYGOPT_IO_SERIAL_FLOW_CONTROL_SOFTWARE
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1117 // When there is software flow-control, force the serial device
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1118 // driver to use the single-char xmt/rcv functions, since these
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1119 // have to make policy decision based on the data. Rcv function
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1120 // may also have to transmit data to throttle the xmitter.
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1121 if (chan->config.flags & (CYGNUM_SERIAL_FLOW_XONXOFF_TX|CYGNUM_SERIAL_FLOW_XONXOFF_RX))
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1122 return CYG_XMT_DISABLED;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1123 #endif
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1124
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1125 CYG_ASSERT(false == cbuf->block_mode_xfer_running,
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1126 "Attempting new block transfer while another is running");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1127
1214
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
1128 #ifdef CYGPKG_IO_SERIAL_FLOW_CONTROL
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
1129 // if we're meant to be throttled, just stop and leave
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
1130 if ( chan->flow_desc.flags & CYG_SERIAL_FLOW_OUT_THROTTLED ) {
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
1131 (chan->funs->stop_xmit)(chan); // Stop transmitting for now
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
1132 return CYG_XMT_EMPTY;
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
1133 }
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
1134 #endif
349e2eadf98d * src/common/serial.c: Fixed bug for XON/XOFF flow control that
jlarmour
parents: 1190
diff changeset
1135
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1136 // Available data (G = get, P = put, x = data, . = empty)
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1137 // 0: no data
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1138 // negative: xxxxP.....Gxxx [offer last chunk only]
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1139 // positive: ..GxxxxxP.....
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1140 if (0 == cbuf->nb)
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1141 return CYG_XMT_EMPTY;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1142
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1143 #ifdef CYGDBG_USE_ASSERTS
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1144 cbuf->block_mode_xfer_running = true;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1145 #endif
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1146
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1147 if (cbuf->get >= cbuf->put) {
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1148 avail = cbuf->len - cbuf->get;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1149 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1150 avail = cbuf->put - cbuf->get;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1151 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1152
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1153 if (avail > space) avail = space; // bound by space in hardware
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1154
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1155 *chars_avail = avail;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1156 *chars = &cbuf->data[cbuf->get];
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1157
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1158 CYG_ASSERT(avail <= cbuf->len, "Avail overflow");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1159 CYG_ASSERT(cbuf->nb <= cbuf->len, "Buffer overflow");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1160 CYG_ASSERT(cbuf->put < cbuf->len, "Invalid put ptr");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1161 CYG_ASSERT(cbuf->get < cbuf->len, "Invalid get ptr");
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1162
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1163 return CYG_XMT_OK;
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1164 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1165
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1166 static void
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1167 serial_data_xmt_done(serial_channel *chan, int chars_sent)
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1168 {
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1169 cbuf_t *cbuf = &chan->out_cbuf;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1170 serial_funs *funs = chan->funs;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1171 int space;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1172
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1173 cbuf->get += chars_sent;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1174 cbuf->nb -= chars_sent;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1175
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1176 if (cbuf->get == cbuf->len) cbuf->get = 0;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1177
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1178 CYG_ASSERT(cbuf->nb <= cbuf->len, "Buffer overflow");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1179 CYG_ASSERT(cbuf->nb >= 0, "Buffer underflow");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1180 CYG_ASSERT(cbuf->put < cbuf->len, "Invalid put ptr");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1181 CYG_ASSERT(cbuf->get < cbuf->len, "Invalid get ptr");
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1182
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1183 if (0 == cbuf->nb) {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1184 (funs->stop_xmit)(chan); // Done with transmit
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1185 cbuf->get = cbuf->put = 0; // reset ptrs if empty
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1186 }
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1187
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1188 // See if there is now enough room to restart writer
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1189 space = cbuf->len - cbuf->nb;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1190 if (space >= cbuf->low_water) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1191 if (cbuf->waiting) {
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1192 cbuf->waiting = false;
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1193 cyg_drv_cond_broadcast(&cbuf->wait);
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1194 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1195 #ifdef CYGPKG_IO_SERIAL_SELECT_SUPPORT
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1196 cyg_selwakeup( &cbuf->selinfo );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1197 #endif
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1198 }
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1199
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1200 #ifdef CYGDBG_USE_ASSERTS
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1201 cbuf->block_mode_xfer_running = false;
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 115
diff changeset
1202 #endif
86
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1203 }
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1204
6512add4f5d6 Merge from eCos master repository on 2000-05-05-07:47:05-BST
jlarmour
parents: 82
diff changeset
1205 #endif // CYGINT_IO_SERIAL_BLOCK_TRANSFER
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1206
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1207 // ---------------------------------------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1208
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents: 107
diff changeset
1209 // EOF serial.c