projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove free pool of timers; use user-provided Timer structure instead
[bertos.git]
/
drv
/
ser.c
diff --git
a/drv/ser.c
b/drv/ser.c
index 1ec4927c753cd2ca0dff8c502b7a7b0751c0188a..1adda23b20404e10f4e5986690146af33df3316c 100755
(executable)
--- a/
drv/ser.c
+++ b/
drv/ser.c
@@
-28,6
+28,12
@@
/*
* $Log$
/*
* $Log$
+ * Revision 1.6 2004/06/07 15:56:28 aleph
+ * Remove cast-as-lvalue extension abuse
+ *
+ * Revision 1.5 2004/06/06 16:41:44 bernie
+ * ser_putchar(): Use fifo_push_locked() to fix potential race on 8bit processors.
+ *
* Revision 1.4 2004/06/03 11:27:09 bernie
* Add dual-license information.
*
* Revision 1.4 2004/06/03 11:27:09 bernie
* Add dual-license information.
*
@@
-96,7
+102,7
@@
int ser_putchar(int c, struct Serial *port)
while (fifo_isfull_locked(&port->txfifo));
}
while (fifo_isfull_locked(&port->txfifo));
}
- fifo_push(&port->txfifo, (unsigned char)c);
+ fifo_push
_locked
(&port->txfifo, (unsigned char)c);
/* (re)trigger tx interrupt */
port->hw->table->enabletxirq(port->hw);
/* (re)trigger tx interrupt */
port->hw->table->enabletxirq(port->hw);
@@
-251,12
+257,16
@@
int ser_print(struct Serial *port, const char *s)
* \brief Write a buffer 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.
+ *
+ * \todo Optimize with fifo_pushblock()
*/
*/
-int ser_write(struct Serial *port, const void *buf, size_t len)
+int ser_write(struct Serial *port, const void *
_
buf, size_t len)
{
{
+ const char *buf = _buf;
+
while (len--)
{
while (len--)
{
- if (ser_putchar(*
((const char *)buf)
++, port) == EOF)
+ if (ser_putchar(*
buf
++, port) == EOF)
return EOF;
}
return 0;
return EOF;
}
return 0;