timer_setSoftInt(): rename from timer_set_event_softint().

[bertos.git] / bertos / drv / ser.h

diff --git a/bertos/drv/ser.h b/bertos/drv/ser.h
index 0acf4b811d9d2804b096799fabb2511e21ce7158..d74c2235e94c3d70d31c9a249aad508c9c279bce 100644 (file)
--- a/bertos/drv/ser.h
+++ b/bertos/drv/ser.h
@@ -41,7 +41,7 @@
 #define DRV_SER_H
 
 #include <kern/kfile.h>
-#include <mware/fifobuf.h>
+#include <struct/fifobuf.h>
 #include <cfg/compiler.h>
 
 #if OS_HOSTED
@@ -162,7 +162,7 @@ typedef struct Serial
 #define KFT_SERIAL MAKE_ID('S', 'E', 'R', 'L')
 
 
-INLINE Serial * SERIALKFILE(KFile *fd)
+INLINE Serial * SERIAL_CAST(KFile *fd)
 {
        ASSERT(fd->_type == KFT_SERIAL);
        return (Serial *)fd;