-/*!
+/**
* \file
* <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction. Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License. This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
* Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- * This file is part of DevLib - See README.devlib for information.
+ *
* -->
*
* \brief Buffered serial I/O driver
/*#*
*#* $Log$
+ *#* Revision 1.38 2007/06/21 17:07:21 batt
+ *#* Remove CONFIG_WATCHDOG stuff: watchdog macros expand to nothing when wdt is active.
+ *#*
+ *#* Revision 1.37 2007/06/07 14:35:12 batt
+ *#* Merge from project_ks.
+ *#*
+ *#* Revision 1.36 2007/01/29 11:30:29 batt
+ *#* Reimplement ser_clearstatus as a macro.
+ *#*
+ *#* Revision 1.35 2007/01/27 20:47:12 batt
+ *#* Add clear status.
+ *#*
+ *#* Revision 1.34 2006/11/20 15:07:40 batt
+ *#* Revert unneeded locked functions.
+ *#*
+ *#* Revision 1.33 2006/11/17 18:15:55 batt
+ *#* Avoid race conditions.
+ *#*
+ *#* Revision 1.32 2006/11/17 17:03:58 batt
+ *#* Implement ser_setstatus and ser_getstatus as functions to avoid race conditions.
+ *#*
+ *#* Revision 1.31 2006/07/21 10:58:00 batt
+ *#* Use timer_clock() instead of obsolete timer_ticks().
+ *#*
+ *#* Revision 1.30 2006/07/19 12:56:26 bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.29 2006/05/18 00:39:30 bernie
+ *#* ser_open(): Document a bit more.
+ *#*
+ *#* Revision 1.28 2006/02/17 22:23:06 bernie
+ *#* Update POSIX serial emulator.
+ *#*
+ *#* Revision 1.27 2005/11/27 23:33:40 bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
*#* Revision 1.26 2005/11/04 16:20:02 bernie
*#* Fix reference to README.devlib in header.
*#*
*#*/
#include "ser.h"
+
+#include "wdt.h"
+
#include "ser_p.h"
#include <mware/formatwr.h>
#include <cfg/debug.h>
-#include <hw.h>
-#include <cfg/config.h>
+#include <appconfig.h>
/*
* Sanity check for config parameters required by this module.
/* Serial configuration parameters */
-#define SER_CTSDELAY 70 /*!< CTS line retry interval (ms) */
-#define SER_TXPOLLDELAY 2 /*!< Transmit buffer full retry interval (ms) */
-#define SER_RXPOLLDELAY 2 /*!< Receive buffer empty retry interval (ms) */
+#define SER_CTSDELAY 70 /**< CTS line retry interval (ms) */
+#define SER_TXPOLLDELAY 2 /**< Transmit buffer full retry interval (ms) */
+#define SER_RXPOLLDELAY 2 /**< Receive buffer empty retry interval (ms) */
struct Serial ser_handles[SER_CNT];
-/*!
+/**
* Inserisce il carattere c nel buffer di trasmissione.
* Questa funzione mette il processo chiamante in attesa
* quando il buffer e' pieno.
if (fifo_isfull_locked(&port->txfifo))
{
#if CONFIG_SER_TXTIMEOUT != -1
- mtime_t start_time = timer_ticks();
+ ticks_t start_time = timer_clock();
#endif
/* Attende finche' il buffer e' pieno... */
do
{
+ wdt_reset();
#if CONFIG_KERNEL && CONFIG_KERN_SCHED
/* Give up timeslice to other processes. */
proc_switch();
#endif
#if CONFIG_SER_TXTIMEOUT != -1
- if (timer_ticks() - start_time >= port->txtimeout)
+ if (timer_clock() - start_time >= port->txtimeout)
{
- port->status |= SERRF_TXTIMEOUT;
+ ATOMIC(port->status |= SERRF_TXTIMEOUT);
return EOF;
}
#endif /* CONFIG_SER_TXTIMEOUT */
}
-/*!
+/**
* Preleva un carattere dal buffer di ricezione.
* Questa funzione mette il processo chiamante in attesa
* quando il buffer e' vuoto. L'attesa ha un timeout
if (fifo_isempty_locked(&port->rxfifo))
{
#if CONFIG_SER_RXTIMEOUT != -1
- mtime_t start_time = timer_ticks();
+ ticks_t start_time = timer_clock();
#endif
/* Wait while buffer is empty */
do
{
+ wdt_reset();
#if CONFIG_KERNEL && CONFIG_KERN_SCHED
/* Give up timeslice to other processes. */
proc_switch();
#endif
#if CONFIG_SER_RXTIMEOUT != -1
- if (timer_ticks() - start_time >= port->rxtimeout)
+ if (timer_clock() - start_time >= port->rxtimeout)
{
- port->status |= SERRF_RXTIMEOUT;
+ ATOMIC(port->status |= SERRF_RXTIMEOUT);
return EOF;
}
#endif /* CONFIG_SER_RXTIMEOUT */
}
- while (fifo_isempty_locked(&port->rxfifo) && (port->status & SERRF_RX) == 0);
+ while (fifo_isempty_locked(&port->rxfifo) && (ser_getstatus(port) & SERRF_RX) == 0);
}
/*
* Get a byte from the FIFO (avoiding sign-extension),
* re-enable RTS, then return result.
*/
- if (port->status & SERRF_RX)
+ if (ser_getstatus(port) & SERRF_RX)
return EOF;
return (int)(unsigned char)fifo_pop_locked(&port->rxfifo);
}
-/*!
+/**
* Preleva un carattere dal buffer di ricezione.
* Se il buffer e' vuoto, ser_getchar_nowait() ritorna
* immediatamente EOF.
#if CONFIG_SER_GETS
-/*!
+/**
* Read a line long at most as size and put it
* in buf.
* \return number of chars read or EOF in case
}
-/*!
+/**
* Read a line long at most as size and put it
* in buf, with optional echo.
*
#endif /* !CONFIG_SER_GETS */
-/*!
+/**
* Read at most \a size bytes from \a port and put them in \a buf
*
* \return number of bytes actually read, or EOF in
}
-/*!
+/**
* Write a string to serial.
* \return 0 if OK, EOF in case of error.
*/
}
-/*!
+/**
* \brief Write a buffer to serial.
*
* \return 0 if OK, EOF in case of error.
#if CONFIG_PRINTF
-/*!
+/**
* Formatted write
*/
int ser_printf(struct Serial *port, const char *format, ...)
#if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
void ser_settimeouts(struct Serial *port, mtime_t rxtimeout, mtime_t txtimeout)
{
- port->rxtimeout = rxtimeout;
- port->txtimeout = txtimeout;
+ port->rxtimeout = ms_to_ticks(rxtimeout);
+ port->txtimeout = ms_to_ticks(txtimeout);
}
#endif /* CONFIG_SER_RXTIMEOUT || CONFIG_SER_TXTIMEOUT */
#if CONFIG_SER_RXTIMEOUT != -1
-/*!
+/**
* Discard input to resynchronize with remote end.
*
* Discard incoming data until the port stops receiving
*/
void ser_resync(struct Serial *port, mtime_t delay)
{
- mtime_t old_rxtimeout = port->rxtimeout;
+ mtime_t old_rxtimeout = ticks_to_ms(port->rxtimeout);
- ser_settimeouts(port, delay, port->txtimeout);
+ ser_settimeouts(port, delay, ticks_to_ms(port->txtimeout));
do
{
ser_setstatus(port, 0);
/* Restore port to an usable status */
ser_setstatus(port, 0);
- ser_settimeouts(port, old_rxtimeout, port->txtimeout);
+ ser_settimeouts(port, old_rxtimeout, ticks_to_ms(port->txtimeout));
}
#endif /* CONFIG_SER_RXTIMEOUT */
}
-/*!
+/**
* Flush both the RX and TX buffers.
*/
void ser_purge(struct Serial *port)
}
-/*!
+/**
* Wait until all pending output is completely
* transmitted to the other end.
*
void ser_drain(struct Serial *ser)
{
/*
- * Wait until the FIFO is empty, and then until the byte currently in
+ * Wait until the FIFO becomes empty, and then until the byte currently in
* the hardware register gets shifted out.
*/
while (!fifo_isempty(&ser->txfifo)
/* Give up timeslice to other processes. */
proc_switch();
#endif
+ wdt_reset();
}
}
-/*!
- * Initialize serial
+/**
+ * Initialize a serial port.
+ *
+ * \param unit Serial unit to open. Possible values are architecture dependant.
*/
struct Serial *ser_open(unsigned int unit)
{
}
-/*!
+/**
* Clean up serial port, disabling the associated hardware.
*/
void ser_close(struct Serial *port)
projects / bertos.git / blobdiff