projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
[bertos.git]
/
drv
/
ser.c
diff --git
a/drv/ser.c
b/drv/ser.c
index 9b42a70dbfaf1a936684bbb26e4f736e033b0458..4da6c5bc7da2139237a0480d60e60cd767028ddb 100755
(executable)
--- a/
drv/ser.c
+++ b/
drv/ser.c
@@
-28,6
+28,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.22 2004/12/08 08:56:14 bernie
+ *#* Rename time_t to mtime_t.
+ *#*
*#* Revision 1.21 2004/11/16 18:10:13 bernie
*#* Add sanity checks for missing configuration parameters.
*#*
*#* Revision 1.21 2004/11/16 18:10:13 bernie
*#* Add sanity checks for missing configuration parameters.
*#*
@@
-151,7
+154,7
@@
int ser_putchar(int c, struct Serial *port)
if (fifo_isfull_locked(&port->txfifo))
{
#if CONFIG_SER_TXTIMEOUT != -1
if (fifo_isfull_locked(&port->txfifo))
{
#if CONFIG_SER_TXTIMEOUT != -1
- time_t start_time = timer_ticks();
+
m
time_t start_time = timer_ticks();
#endif
/* Attende finche' il buffer e' pieno... */
#endif
/* Attende finche' il buffer e' pieno... */
@@
-196,7
+199,7
@@
int ser_getchar(struct Serial *port)
if (fifo_isempty_locked(&port->rxfifo))
{
#if CONFIG_SER_RXTIMEOUT != -1
if (fifo_isempty_locked(&port->rxfifo))
{
#if CONFIG_SER_RXTIMEOUT != -1
- time_t start_time = timer_ticks();
+
m
time_t start_time = timer_ticks();
#endif
/* Wait while buffer is empty */
do
#endif
/* Wait while buffer is empty */
do
@@
-243,7
+246,7
@@
int ser_getchar_nowait(struct Serial *port)
#if CONFIG_SER_GETS
/*!
#if CONFIG_SER_GETS
/*!
- * Read a line long at most as size and put
s
it
+ * Read a line long at most as size and put it
* in buf.
* \return number of chars read or EOF in case
* of error.
* in buf.
* \return number of chars read or EOF in case
* of error.
@@
-369,7
+372,7
@@
int ser_printf(struct Serial *port, const char *format, ...)
#if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
#if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
-void ser_settimeouts(struct Serial *port,
time_t rxtimeout,
time_t txtimeout)
+void ser_settimeouts(struct Serial *port,
mtime_t rxtimeout, m
time_t txtimeout)
{
port->rxtimeout = rxtimeout;
port->txtimeout = txtimeout;
{
port->rxtimeout = rxtimeout;
port->txtimeout = txtimeout;
@@
-385,9
+388,9
@@
void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout)
*
* \note Serial errors are reset before and after executing the purge.
*/
*
* \note Serial errors are reset before and after executing the purge.
*/
-void ser_resync(struct Serial *port, time_t delay)
+void ser_resync(struct Serial *port,
m
time_t delay)
{
{
- time_t old_rxtimeout = port->rxtimeout;
+
m
time_t old_rxtimeout = port->rxtimeout;
ser_settimeouts(port, delay, port->txtimeout);
do
ser_settimeouts(port, delay, port->txtimeout);
do