From af78856c1817975ccf9e015f493422a794450351 Mon Sep 17 00:00:00 2001 From: batt Date: Mon, 20 Nov 2006 15:07:40 +0000 Subject: [PATCH] Revert unneeded locked functions. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@730 38d2e660-2303-0410-9eaa-f027e97ec537 --- drv/ser.c | 23 +++-------------------- drv/ser.h | 13 +++++++++++-- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/drv/ser.c b/drv/ser.c index 598ea885..e4e4c337 100755 --- a/drv/ser.c +++ b/drv/ser.c @@ -28,6 +28,9 @@ /*#* *#* $Log$ + *#* 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. *#* @@ -460,26 +463,6 @@ void ser_purge(struct Serial *port) fifo_flush_locked(&port->txfifo); } -/** - * Get status of port \c port. - */ -serstatus_t ser_getstatus(struct Serial *port) -{ - serstatus_t status; - ATOMIC(status = port->status); - - return status; -} - - -/** - * Set new \c port status. - */ -void ser_setstatus(struct Serial *port, serstatus_t status) -{ - ATOMIC(port->status = status); -} - /** * Wait until all pending output is completely diff --git a/drv/ser.h b/drv/ser.h index ae8e0b2a..27d49b40 100755 --- a/drv/ser.h +++ b/drv/ser.h @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.34 2006/11/20 15:07:40 batt + *#* Revert unneeded locked functions. + *#* *#* Revision 1.33 2006/11/17 17:03:58 batt *#* Implement ser_setstatus and ser_getstatus as functions to avoid race conditions. *#* @@ -303,7 +306,13 @@ extern void ser_drain(struct Serial *port); extern struct Serial *ser_open(unsigned int unit); extern void ser_close(struct Serial *port); -extern serstatus_t ser_getstatus(struct Serial *port); -extern void ser_setstatus(struct Serial *port, serstatus_t status); +/** + * \name Additional functions implemented as macros + * + * \{ + */ +#define ser_getstatus(h) ((h)->status) +#define ser_setstatus(h, x) ((h)->status = (x)) +/* \} */ #endif /* DRV_SER_H */ -- 2.25.1