X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fser.c;h=4a2c923d1971729cf67ff31b74b18bb59e50c969;hb=f35b6066ecdeffcc8998dd566b5246bdcf43c548;hp=65a333daf746d21da6ee54fb19b8bc0583147c35;hpb=7bc87271c5cf15a352dadef1c425b808aab5d35e;p=bertos.git

diff --git a/bertos/drv/ser.c b/bertos/drv/ser.c
index 65a333da..4a2c923d 100644
--- a/bertos/drv/ser.c
+++ b/bertos/drv/ser.c
@@ -28,7 +28,6 @@
  *
  * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
- *
  * -->
  *
  * \brief Buffered serial I/O driver
@@ -53,38 +52,33 @@
 
 #include "ser.h"
 #include "wdt.h"
+#include "timer.h"
 #include "ser_p.h"
 
 #include "cfg/cfg_ser.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
 #include <cfg/debug.h>
 
 #include <mware/formatwr.h>
 
-#include <string.h> /* memset */
+#include <cpu/power.h> /* cpu_relax() */
+
+#include <string.h> /* memset() */
 
 /*
  * Sanity check for config parameters required by this module.
  */
-#if !defined(CONFIG_KERNEL) || ((CONFIG_KERNEL != 0) && CONFIG_KERNEL != 1)
-	#error CONFIG_KERNEL must be set to either 0 or 1 in config.h
+#if !defined(CONFIG_KERN) || ((CONFIG_KERN != 0) && CONFIG_KERN != 1)
+	#error CONFIG_KERN must be set to either 0 or 1 in cfg_kern.h
 #endif
 #if !defined(CONFIG_SER_RXTIMEOUT)
-	#error CONFIG_SER_TXTIMEOUT missing in config.h
+	#error CONFIG_SER_TXTIMEOUT missing in cfg_ser.h
 #endif
 #if !defined(CONFIG_SER_RXTIMEOUT)
-	#error CONFIG_SER_RXTIMEOUT missing in config.h
+	#error CONFIG_SER_RXTIMEOUT missing in cfg_ser.h
 #endif
 #if !defined(CONFIG_SER_DEFBAUDRATE)
-	#error CONFIG_SER_DEFBAUDRATE missing in config.h
-#endif
-
-#if CONFIG_KERNEL
-	#include <kern/proc.h>
-#endif
-
-#if CONFIG_SER_TXTIMEOUT != -1 || CONFIG_SER_RXTIMEOUT != -1
-	#include <drv/timer.h>
+	#error CONFIG_SER_DEFBAUDRATE missing in cfg_ser.h
 #endif
 
 
@@ -113,11 +107,8 @@ static int ser_putchar(int c, struct Serial *port)
 		/* Wait while buffer is full... */
 		do
 		{
-			wdt_reset();
-#if CONFIG_KERNEL && CONFIG_KERN_SCHED
-			/* Give up timeslice to other processes. */
-			proc_switch();
-#endif
+			cpu_relax();
+
 #if CONFIG_SER_TXTIMEOUT != -1
 			if (timer_clock() - start_time >= port->txtimeout)
 			{
@@ -158,14 +149,12 @@ static int ser_getchar(struct Serial *port)
 
 		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
+			cpu_relax();
+
 #if CONFIG_SER_RXTIMEOUT != -1
 			if (timer_clock() - start_time >= port->rxtimeout)
 			{
@@ -252,45 +241,33 @@ static size_t ser_write(struct KFile *fd, const void *_buf, size_t size)
 #if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
 void ser_settimeouts(struct Serial *fd, mtime_t rxtimeout, mtime_t txtimeout)
 {
-	fd->rxtimeout = ms_to_ticks(rxtimeout);
-	fd->txtimeout = ms_to_ticks(txtimeout);
+	#if CONFIG_SER_RXTIMEOUT != -1
+		fd->rxtimeout = ms_to_ticks(rxtimeout);
+	#else
+		(void)rxtimeout;
+	#endif
+
+	#if CONFIG_SER_TXTIMEOUT != -1
+		fd->txtimeout = ms_to_ticks(txtimeout);
+	#else
+		(void)txtimeout;
+	#endif
 }
 #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
- * characters for at least \a delay milliseconds.
- *
- * \note Serial errors are reset before and after executing the purge.
+ * Set the baudrate for the serial port
  */
-void ser_resync(struct Serial *fd, mtime_t delay)
-{
-	mtime_t old_rxtimeout = ticks_to_ms(fd->rxtimeout);
-
-	ser_settimeouts(fd, delay, ticks_to_ms(fd->txtimeout));
-	do
-	{
-		ser_setstatus(fd, 0);
-		ser_getchar(fd);
-	}
-	while (!(ser_getstatus(fd) & SERRF_RXTIMEOUT));
-
-	/* Restore port to an usable status */
-	ser_setstatus(fd, 0);
-	ser_settimeouts(fd, old_rxtimeout, ticks_to_ms(fd->txtimeout));
-}
-#endif /* CONFIG_SER_RXTIMEOUT */
-
-
 void ser_setbaudrate(struct Serial *fd, unsigned long rate)
 {
 	fd->hw->table->setBaudrate(fd->hw, rate);
 }
 
 
+/**
+ * Set the parity for the \a fd serial port
+ */
 void ser_setparity(struct Serial *fd, int parity)
 {
 	fd->hw->table->setParity(fd->hw, parity);
@@ -354,13 +331,7 @@ static int ser_flush(struct KFile *fd)
 	 */
 	while (!fifo_isempty(&fds->txfifo)
 	       || fds->hw->table->txSending(fds->hw))
-	{
-		#if CONFIG_KERNEL && CONFIG_KERN_SCHED
-			/* Give up timeslice to other processes. */
-			proc_switch();
-		#endif
-			wdt_reset();
-	}
+		cpu_relax();
 	return 0;
 }
 
@@ -445,6 +416,8 @@ static struct KFile *ser_reopen(struct KFile *fd)
 
 /**
  * Init serial driver for \a unit.
+ *
+ * Use values SER_UARTn as values for \a unit.
  */
 void ser_init(struct Serial *fds, unsigned int unit)
 {
@@ -511,6 +484,8 @@ static size_t spimaster_write(struct KFile *fd, const void *buf, size_t size)
 /**
  * Init SPI serial driver \a unit in master mode.
  *
+ * Use SER_SPIn for \a unit parameter.
+ *
  * This interface implements the SPI master protocol over a serial SPI
  * driver. This is needed because normal serial driver send/receive data
  * at the same time. SPI slaves like memories and other peripherals