projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add whence parameter to seek; change from char * to void * read/write input buffers.
[bertos.git]
/
drv
/
ser.c
diff --git
a/drv/ser.c
b/drv/ser.c
index 8c95a9d774c85b1c107e165d7a5867be5033f8fc..f18a7006769f164dff0db3c8a06a9e1fb4af01a1 100755
(executable)
--- a/
drv/ser.c
+++ b/
drv/ser.c
@@
-28,6
+28,9
@@
/*#*
*#* $Log$
/*#*
*#* $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.37 2007/06/07 14:35:12 batt
*#* Merge from project_ks.
*#*
@@
-140,9
+143,7
@@
#include "ser.h"
#include "ser.h"
-#if CONFIG_WATCHDOG
- #include "wdt.h"
-#endif
+#include "wdt.h"
#include "ser_p.h"
#include <mware/formatwr.h>
#include "ser_p.h"
#include <mware/formatwr.h>
@@
-209,9
+210,7
@@
int ser_putchar(int c, struct Serial *port)
/* Attende finche' il buffer e' pieno... */
do
{
/* Attende finche' il buffer e' pieno... */
do
{
-#if CONFIG_WATCHDOG
wdt_reset();
wdt_reset();
-#endif
#if CONFIG_KERNEL && CONFIG_KERN_SCHED
/* Give up timeslice to other processes. */
proc_switch();
#if CONFIG_KERNEL && CONFIG_KERN_SCHED
/* Give up timeslice to other processes. */
proc_switch();
@@
-256,9
+255,7
@@
int ser_getchar(struct Serial *port)
/* Wait while buffer is empty */
do
{
/* Wait while buffer is empty */
do
{
-#if CONFIG_WATCHDOG
wdt_reset();
wdt_reset();
-#endif
#if CONFIG_KERNEL && CONFIG_KERN_SCHED
/* Give up timeslice to other processes. */
proc_switch();
#if CONFIG_KERNEL && CONFIG_KERN_SCHED
/* Give up timeslice to other processes. */
proc_switch();
@@
-505,9
+502,7
@@
void ser_drain(struct Serial *ser)
/* Give up timeslice to other processes. */
proc_switch();
#endif
/* Give up timeslice to other processes. */
proc_switch();
#endif
- #if CONFIG_WATCHDOG
wdt_reset();
wdt_reset();
- #endif
}
}
}
}