diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-11-04 10:59:39 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-11-04 10:59:39 +0000 |
| commit | 3d2ebf13f5b01f802fae0afec8651cde4c121be8 (patch) | |
| tree | 60ea13bd6873e9d2402c2152343d5167307019d0 /os/hal | |
| parent | 8d459a2883886b0750198fc370ce02cd0f4228df (diff) | |
| download | ChibiOS-3d2ebf13f5b01f802fae0afec8651cde4c121be8.tar.gz ChibiOS-3d2ebf13f5b01f802fae0afec8651cde4c121be8.tar.bz2 ChibiOS-3d2ebf13f5b01f802fae0afec8651cde4c121be8.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6414 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/include/hal_channels.h | 4 | ||||
| -rw-r--r-- | os/hal/include/hal_streams.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/os/hal/include/hal_channels.h b/os/hal/include/hal_channels.h index 06198b5e1..ddcc44e41 100644 --- a/os/hal/include/hal_channels.h +++ b/os/hal/include/hal_channels.h @@ -143,7 +143,7 @@ typedef struct { *
* @api
*/
-#define chnWrite(ip, bp, n) streamSequentialStreamWrite(ip, bp, n)
+#define chnWrite(ip, bp, n) streamWrite(ip, bp, n)
/**
* @brief Channel blocking write with timeout.
@@ -177,7 +177,7 @@ typedef struct { *
* @api
*/
-#define chnRead(ip, bp, n) streamSequentialStreamRead(ip, bp, n)
+#define chnRead(ip, bp, n) streamRead(ip, bp, n)
/**
* @brief Channel blocking read with timeout.
diff --git a/os/hal/include/hal_streams.h b/os/hal/include/hal_streams.h index d19b49a8d..e18a7e461 100644 --- a/os/hal/include/hal_streams.h +++ b/os/hal/include/hal_streams.h @@ -90,6 +90,8 @@ typedef struct { _base_sequential_stream_data
} BaseSequentialStream;
+#endif /* !defined(_CHIBIOS_RT_)*/
+
/**
* @name Macro Functions (BaseSequentialStream)
* @{
@@ -107,7 +109,7 @@ typedef struct { *
* @api
*/
-#define streamSequentialStreamWrite(ip, bp, n) ((ip)->vmt->write(ip, bp, n))
+#define streamWrite(ip, bp, n) ((ip)->vmt->write(ip, bp, n))
/**
* @brief Sequential Stream read.
@@ -122,7 +124,7 @@ typedef struct { *
* @api
*/
-#define streamSequentialStreamRead(ip, bp, n) ((ip)->vmt->read(ip, bp, n))
+#define streamRead(ip, bp, n) ((ip)->vmt->read(ip, bp, n))
/**
* @brief Sequential Stream blocking byte write.
@@ -138,7 +140,7 @@ typedef struct { *
* @api
*/
-#define streamSequentialStreamPut(ip, b) ((ip)->vmt->put(ip, b))
+#define streamPut(ip, b) ((ip)->vmt->put(ip, b))
/**
* @brief Sequential Stream blocking byte read.
@@ -152,11 +154,9 @@ typedef struct { *
* @api
*/
-#define streamSequentialStreamGet(ip) ((ip)->vmt->get(ip))
+#define streamGet(ip) ((ip)->vmt->get(ip))
/** @} */
-#endif /* !defined(_CHIBIOS_RT_)*/
-
#endif /* _HAL_STREAMS_H_ */
/** @} */
|