X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fser.h;h=d74c2235e94c3d70d31c9a249aad508c9c279bce;hb=9d38debd0d2b2eaeeeec7f82d7c39e749ac729e5;hp=c560aa5c58927d496eb013477ea7921e0ea63154;hpb=c22fe24a0da896a52dbc3882390ec18a440ef56a;p=bertos.git

diff --git a/bertos/drv/ser.h b/bertos/drv/ser.h
index c560aa5c..d74c2235 100644
--- a/bertos/drv/ser.h
+++ b/bertos/drv/ser.h
@@ -27,21 +27,21 @@
  * the GNU General Public License.
  *
  * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
+ * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
  * \brief High level serial I/O API
  *
  * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #ifndef DRV_SER_H
 #define DRV_SER_H
 
 #include <kern/kfile.h>
-#include <mware/fifobuf.h>
+#include <struct/fifobuf.h>
 #include <cfg/compiler.h>
 
 #if OS_HOSTED
@@ -120,6 +120,9 @@ extern const char * const serial_errors[8];
 /** Serial handle structure */
 typedef struct Serial
 {
+	/** Serial have a KFile struct implementation **/
+	KFile fd;
+
 	/** Physical port number */
 	unsigned int unit;
 
@@ -152,11 +155,6 @@ typedef struct Serial
 	struct SerialHardware* hw;
 } Serial;
 
-typedef struct KFileSerial
-{
-	KFile fd;
-	Serial *ser;
-} KFileSerial;
 
 /**
  * ID for serial.
@@ -164,26 +162,26 @@ typedef struct KFileSerial
 #define KFT_SERIAL MAKE_ID('S', 'E', 'R', 'L')
 
 
-INLINE KFileSerial * KFILESERIAL(KFile *fd)
+INLINE Serial * SERIAL_CAST(KFile *fd)
 {
 	ASSERT(fd->_type == KFT_SERIAL);
-	return (KFileSerial *)fd;
+	return (Serial *)fd;
 }
 
 /* Function prototypes */
 //extern int ser_getchar_nowait(struct Serial *port);
 
-void ser_setbaudrate(struct KFileSerial *fd, unsigned long rate);
-void ser_setparity(struct KFileSerial *fd, int parity);
-void ser_settimeouts(struct KFileSerial *fd, mtime_t rxtimeout, mtime_t txtimeout);
-void ser_resync(struct KFileSerial *fd, mtime_t delay);
-int ser_getchar_nowait(struct KFileSerial *fd);
-
-void ser_purgeRx(struct KFileSerial *fd);
-void ser_purgeTx(struct KFileSerial *fd);
-void ser_purge(struct KFileSerial *fd);
-void ser_init(struct KFileSerial *fds, unsigned int unit);
-void spimaster_init(KFileSerial *fds, unsigned int unit);
+void ser_setbaudrate(struct Serial *fd, unsigned long rate);
+void ser_setparity(struct Serial *fd, int parity);
+void ser_settimeouts(struct Serial *fd, mtime_t rxtimeout, mtime_t txtimeout);
+void ser_resync(struct Serial *fd, mtime_t delay);
+int ser_getchar_nowait(struct Serial *fd);
+
+void ser_purgeRx(struct Serial *fd);
+void ser_purgeTx(struct Serial *fd);
+void ser_purge(struct Serial *fd);
+void ser_init(struct Serial *fds, unsigned int unit);
+void spimaster_init(Serial *fds, unsigned int unit);
 
 
 /**