ecos: packages/io/serial/current/src/common/serial.c annotate

annotate packages/io/serial/current/src/common/serial.c @ 66:bf00f99aec69 ecos-sw-2000-02-02

Merge from eCos master repository on 2000-02-02-19:16:44-GMT

author	jlarmour
date	Wed, 02 Feb 2000 19:57:02 +0000
parents	c38311975d4f
children	6736c52df507

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 //==========================================================================
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	8 //####COPYRIGHTBEGIN####
64 c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	9 //
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	10 // -------------------------------------------
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	11 // The contents of this file are subject to the Red Hat eCos Public License
66 bf00f99aec69 Merge from eCos master repository on 2000-02-02-19:16:44-GMT jlarmour parents: 64 diff changeset	12 // Version 1.1 (the "License"); you may not use this file except in
64 c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	13 // compliance with the License. You may obtain a copy of the License at
66 bf00f99aec69 Merge from eCos master repository on 2000-02-02-19:16:44-GMT jlarmour parents: 64 diff changeset	14 // http://www.redhat.com/
64 c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	15 //
66 bf00f99aec69 Merge from eCos master repository on 2000-02-02-19:16:44-GMT jlarmour parents: 64 diff changeset	16 // Software distributed under the License is distributed on an "AS IS"
64 c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	17 // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	18 // License for the specific language governing rights and limitations under
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	19 // the License.
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	20 //
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	21 // The Original Code is eCos - Embedded Configurable Operating System,
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	22 // released September 30, 1998.
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	23 //
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	24 // The Initial Developer of the Original Code is Red Hat.
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	25 // Portions created by Red Hat are
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	26 // Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	27 // All Rights Reserved.
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	28 // -------------------------------------------
c38311975d4f Merge from eCos master repository on 2000-01-28-04:28:11-GMT jlarmour parents: 62 diff changeset	29 //
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	30 //####COPYRIGHTEND####
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	31 //==========================================================================
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	32 //#####DESCRIPTIONBEGIN####
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	33 //
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	34 // Author(s): gthomas
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	35 // Contributors: gthomas
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	36 // Date: 1999-02-04
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	37 // Purpose: Top level serial driver
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	38 // Description:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	39 //
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	40 //####DESCRIPTIONEND####
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 //==========================================================================
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	43
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	44 #include <pkgconf/io.h>
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	45 #include <cyg/io/io.h>
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	46 #include <cyg/io/devtab.h>
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	47 #include <cyg/io/serial.h>
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	48 #include <cyg/infra/diag.h>
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 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	51 static Cyg_ErrNo 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	52 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	53 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	54
62 7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT jlarmour parents: 20 diff changeset	55 DEVIO_TABLE(cyg_io_serial_devio,
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	56 serial_write,
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	57 serial_read,
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	58 serial_get_config,
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	59 serial_set_config
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	60 );
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	61
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	62 static void serial_init(serial_channel *chan);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	63 static void serial_xmt_char(serial_channel *chan);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	64 static void serial_rcv_char(serial_channel *chan, unsigned char c);
62 7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT jlarmour parents: 20 diff changeset	65 SERIAL_CALLBACKS(cyg_io_serial_callbacks,
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	66 serial_init,
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	67 serial_xmt_char,
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	68 serial_rcv_char);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	69
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	70 static void
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	71 serial_init(serial_channel *chan)
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	72 {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	73 if (chan->init) return;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	74 if (chan->out_cbuf.len != 0) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	75 #ifdef CYGDBG_IO_INIT
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	76 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	77 #endif
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	78 chan->out_cbuf.waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	79 chan->out_cbuf.abort = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	80 chan->out_cbuf.pending = 0;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	81 cyg_drv_mutex_init(&chan->out_cbuf.lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	82 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	83 chan->out_cbuf.low_water = chan->out_cbuf.len / 4;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	84 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	85 if (chan->in_cbuf.len != 0) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	86 #ifdef CYGDBG_IO_INIT
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	87 diag_printf("Set input buffer - buf: %x len: %d\n", chan->in_cbuf.data, chan->in_cbuf.len);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	88 #endif
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	89 chan->in_cbuf.waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	90 chan->in_cbuf.abort = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	91 cyg_drv_mutex_init(&chan->in_cbuf.lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	92 cyg_drv_cond_init(&chan->in_cbuf.wait, &chan->in_cbuf.lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	93 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	94 chan->init = true;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	95 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	96
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	97 static Cyg_ErrNo
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	98 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	99 {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	100 cyg_devtab_entry_t t = (cyg_devtab_entry_t )handle;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	101 serial_channel chan = (serial_channel )t->priv;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	102 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	103 cyg_int32 size = *len;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	104 cyg_uint8 buf = (cyg_uint8 )_buf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	105 int next;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	106 cbuf_t *cbuf = &chan->out_cbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	107 Cyg_ErrNo res = ENOERR;
20 5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	108
4 1d7f19c9e4d1 Merge from eCos master repository on 1999-05-11-21:11:10-BST jlarmour parents: 2 diff changeset	109 cbuf->abort = false;
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	110 cyg_drv_mutex_lock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	111 if (cbuf->len == 0) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	112 // Non interrupt driven (i.e. polled) operation
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	113 while (size-- > 0) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	114 while ((funs->putc)(chan, *buf) == false) ; // Ignore full, keep trying
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	115 buf++;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	116 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	117 } else {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	118 cyg_drv_dsr_lock(); // Avoid race condition testing pointers
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	119 while (size > 0) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	120 next = cbuf->put + 1;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	121 if (next == cbuf->len) next = 0;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	122 if (next == cbuf->get) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	123 cbuf->waiting = true;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	124 // Buffer full - wait for space
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	125 (funs->start_xmit)(chan); // Make sure xmit is running
62 7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT jlarmour parents: 20 diff changeset	126 if (cbuf->waiting) {
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT jlarmour parents: 20 diff changeset	127 // Note: 'start_xmit' may have obviated the need to wait :-)
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT jlarmour parents: 20 diff changeset	128 cbuf->pending += size; // Have this much more to send [eventually]
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT jlarmour parents: 20 diff changeset	129 cyg_drv_cond_wait(&cbuf->wait);
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT jlarmour parents: 20 diff changeset	130 cbuf->pending -= size;
7a6ac9edc838 Merge from eCos master repository on 2000-01-24-19:43:49-GMT jlarmour parents: 20 diff changeset	131 }
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	132 if (cbuf->abort) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	133 // Give up!
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	134 cbuf->abort = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	135 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	136 res = -EINTR;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	137 break;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	138 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	139 } else {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	140 cbuf->data[cbuf->put++] = *buf++;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	141 cbuf->put = next;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	142 size--; // Only count if actually sent!
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	143 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	144 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	145 cyg_drv_dsr_unlock();
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	146 (funs->start_xmit)(chan); // Start output as necessary
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	147 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	148 cyg_drv_mutex_unlock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	149 return res;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	150 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	151
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	152 static Cyg_ErrNo
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	153 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	154 {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	155 cyg_devtab_entry_t t = (cyg_devtab_entry_t )handle;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	156 serial_channel chan = (serial_channel )t->priv;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	157 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	158 cyg_uint8 buf = (cyg_uint8 )_buf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	159 cyg_int32 size = 0;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	160 cbuf_t *cbuf = &chan->in_cbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	161 Cyg_ErrNo res = ENOERR;
20 5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	162 #ifdef XX_CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	163 extern int enable_diag_uart;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	164 int _enable = enable_diag_uart;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	165 int _time, _stime;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	166 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	167 #endif // CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	168
4 1d7f19c9e4d1 Merge from eCos master repository on 1999-05-11-21:11:10-BST jlarmour parents: 2 diff changeset	169 cbuf->abort = false;
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	170 cyg_drv_mutex_lock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	171 if (cbuf->len == 0) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	172 // Non interrupt driven (i.e. polled) operation
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	173 while (size++ < *len) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	174 *buf++ = (funs->getc)(chan);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	175 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	176 } else {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	177 cyg_drv_dsr_lock(); // Avoid races
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	178 while (size < *len) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	179 if (cbuf->get != cbuf->put) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	180 *buf++ = cbuf->data[cbuf->get];
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	181 if (++cbuf->get == cbuf->len) cbuf->get = 0;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	182 size++;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	183 } else {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	184 cbuf->waiting = true;
20 5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	185 #ifdef XX_CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	186 enable_diag_uart = 0;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	187 HAL_CLOCK_READ(&_time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	188 _stime = (int)cyg_current_time();
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	189 diag_printf("READ wait - get: %d, put: %d, time: %x.%x\n", cbuf->get, cbuf->put, _stime, _time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	190 enable_diag_uart = _enable;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	191 #endif // CYGDBG_DIAG_BUF
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	192 cyg_drv_cond_wait(&cbuf->wait);
20 5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	193 #ifdef XX_CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	194 enable_diag_uart = 0;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	195 HAL_CLOCK_READ(&_time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	196 _stime = (int)cyg_current_time();
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	197 diag_printf("READ continue - get: %d, put: %d, time: %x.%x\n", cbuf->get, cbuf->put, _stime, _time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	198 enable_diag_uart = _enable;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	199 #endif // CYGDBG_DIAG_BUF
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	200 if (cbuf->abort) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	201 // Give up!
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	202 cbuf->abort = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	203 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	204 res = -EINTR;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	205 break;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	206 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	207 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	208 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	209 cyg_drv_dsr_unlock();
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	210 }
20 5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	211 cyg_drv_isr_lock();
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	212 #ifdef XX_CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	213 enable_diag_uart = 0;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	214 HAL_CLOCK_READ(&_time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	215 _stime = (int)cyg_current_time();
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	216 diag_printf("READ done - size: %d, len: %d, time: %x.%x\n", size, *len, _stime, _time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	217 enable_diag_uart = _enable;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	218 #endif // CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	219 cyg_drv_isr_unlock();
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	220 cyg_drv_mutex_unlock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	221 return res;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	222 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	223
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	224 static Cyg_ErrNo
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	225 serial_get_config(cyg_io_handle_t handle, cyg_uint32 key, void xbuf, cyg_uint32 len)
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	226 {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	227 cyg_devtab_entry_t t = (cyg_devtab_entry_t )handle;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	228 serial_channel chan = (serial_channel )t->priv;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	229 cyg_serial_info_t buf = (cyg_serial_info_t )xbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	230 Cyg_ErrNo res = ENOERR;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	231 cbuf_t *cbuf = &chan->out_cbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	232 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	233
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	234 switch (key) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	235 case CYG_IO_GET_CONFIG_SERIAL_INFO:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	236 if (*len < sizeof(cyg_serial_info_t)) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	237 return -EINVAL;
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 *buf = chan->config;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	240 *len = sizeof(chan->config);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	241 break;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	242 case CYG_IO_GET_CONFIG_SERIAL_OUTPUT_DRAIN:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	243 // Wait for any pending output to complete
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	244 if (cbuf->len == 0) break; // Nothing to do if not buffered
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	245 cyg_drv_mutex_lock(&cbuf->lock); // Stop any further output processing
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	246 cyg_drv_dsr_lock();
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	247 while (cbuf->pending \|\| (cbuf->get != cbuf->put)) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	248 cbuf->waiting = true;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	249 cyg_drv_cond_wait(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	250 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	251 cyg_drv_dsr_unlock();
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	252 cyg_drv_mutex_unlock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	253 break;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	254 case CYG_IO_GET_CONFIG_SERIAL_INPUT_FLUSH:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	255 // Flush any buffered input
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	256 cbuf = &chan->in_cbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	257 if (cbuf->len == 0) break; // Nothing to do if not buffered
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	258 cyg_drv_mutex_lock(&cbuf->lock); // Stop any further input processing
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	259 cyg_drv_dsr_lock();
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	260 if (cbuf->waiting) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	261 cbuf->abort = true;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	262 cyg_drv_cond_signal(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	263 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	264 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	265 cbuf->get = cbuf->put; // Flush buffered input
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	266 cyg_drv_dsr_unlock();
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	267 cyg_drv_mutex_unlock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	268 break;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	269 case CYG_IO_GET_CONFIG_SERIAL_ABORT:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	270 // Abort any outstanding I/O, including blocked reads
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	271 // Caution - assumed to be called from 'timeout' (i.e. DSR) code
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	272 cbuf = &chan->in_cbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	273 if (cbuf->len != 0) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	274 cbuf->abort = true;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	275 cyg_drv_cond_signal(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	276 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	277 cbuf = &chan->out_cbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	278 if (cbuf->len != 0) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	279 cbuf->abort = true;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	280 cyg_drv_cond_signal(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	281 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	282 break;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	283 case CYG_IO_GET_CONFIG_SERIAL_OUTPUT_FLUSH:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	284 // Throw away any pending output
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	285 if (cbuf->len == 0) break; // Nothing to do if not buffered
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	286 cyg_drv_mutex_lock(&cbuf->lock); // Stop any further output processing
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	287 cyg_drv_dsr_lock();
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	288 if (cbuf->get != cbuf->put) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	289 cbuf->get = cbuf->put; // Empties queue!
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	290 (funs->stop_xmit)(chan); // Done with transmit
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	291 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	292 if (cbuf->waiting) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	293 cbuf->abort = true;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	294 cyg_drv_cond_signal(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	295 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	296 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	297 cyg_drv_dsr_unlock();
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	298 cyg_drv_mutex_unlock(&cbuf->lock);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	299 break;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	300 default:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	301 res = -EINVAL;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	302 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	303 return res;
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
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	306 static Cyg_ErrNo
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	307 serial_set_config(cyg_io_handle_t handle, cyg_uint32 key, const void xbuf, cyg_uint32 len)
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	308 {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	309 Cyg_ErrNo res = ENOERR;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	310 cyg_devtab_entry_t t = (cyg_devtab_entry_t )handle;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	311 serial_channel chan = (serial_channel )t->priv;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	312 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	313 cyg_serial_info_t buf = (cyg_serial_info_t )xbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	314
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	315 switch (key) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	316 case CYG_IO_SET_CONFIG_SERIAL_INFO:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	317 if (*len != sizeof(cyg_serial_info_t)) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	318 return -EINVAL;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	319 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	320 if ((funs->set_config)(chan, buf) != true) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	321 // Device is not happy with paramters or they cannot be set
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	322 res = -EINVAL;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	323 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	324 break;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	325 default:
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	326 res = -EINVAL;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	327 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	328 return res;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	329 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	330
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	331 static void
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	332 serial_xmt_char(serial_channel *chan)
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	333 {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	334 cbuf_t *cbuf = &chan->out_cbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	335 serial_funs *funs = chan->funs;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	336 unsigned char c;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	337 int space;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	338
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	339 while (cbuf->get != cbuf->put) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	340 c = cbuf->data[cbuf->get];
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	341 if ((funs->putc)(chan, c)) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	342 cbuf->get++;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	343 if (cbuf->get == cbuf->len) cbuf->get = 0;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	344 if (cbuf->waiting) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	345 // See if there is now enough room to restart writer
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	346 space = (cbuf->len + cbuf->get) - cbuf->put;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	347 if (space > cbuf->len) space -= cbuf->len;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	348 if (space >= cbuf->low_water) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	349 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	350 cyg_drv_cond_broadcast(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	351 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	352 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	353 } else {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	354 return; // Need to wait for more space
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	355 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	356 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	357 (funs->stop_xmit)(chan); // Done with transmit
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	358 if (cbuf->waiting) {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	359 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	360 cyg_drv_cond_signal(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	361 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	362 }
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	363
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	364 static void
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	365 serial_rcv_char(serial_channel *chan, unsigned char c)
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	366 {
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	367 cbuf_t *cbuf = &chan->in_cbuf;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	368
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	369 cbuf->data[cbuf->put++] = c;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	370 if (cbuf->put == cbuf->len) cbuf->put = 0;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	371 if (cbuf->waiting) {
20 5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	372 #ifdef XX_CYGDBG_DIAG_BUF
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	373 extern int enable_diag_uart;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	374 int _enable = enable_diag_uart;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	375 int _time, _stime;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	376 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	377 enable_diag_uart = 0;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	378 HAL_CLOCK_READ(&_time);
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	379 _stime = (int)cyg_current_time();
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	380 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	381 enable_diag_uart = _enable;
5f5102441818 Merge from eCos master repository on 1999-07-02-23:17:07-BST jlarmour parents: 4 diff changeset	382 #endif // CYGDBG_DIAG_BUF
2 443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	383 cbuf->waiting = false;
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	384 cyg_drv_cond_signal(&cbuf->wait);
443894e2e912 Block commit of eCos version 1.2.1 jlarmour parents: diff changeset	385 }
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

Mercurial > ecos

annotate packages/io/serial/current/src/common/serial.c @ 66:bf00f99aec69 ecos-sw-2000-02-02