diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-08-19 11:56:05 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-08-19 11:56:05 +0000 |
commit | 5b043b62ef7b758c2f52b9619027854900493de8 (patch) | |
tree | 353d2bf4593e7c15dde0c245c9d0ebe67c0a9f3c | |
parent | 5db63fe5d2cce3f0e6419bc2e2b0d01de0a7c7db (diff) | |
download | ChibiOS-5b043b62ef7b758c2f52b9619027854900493de8.tar.gz ChibiOS-5b043b62ef7b758c2f52b9619027854900493de8.tar.bz2 ChibiOS-5b043b62ef7b758c2f52b9619027854900493de8.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1078 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r-- | os/kernel/include/ch.h | 1 | ||||
-rw-r--r-- | os/kernel/include/serial.h | 217 | ||||
-rw-r--r-- | os/kernel/kernel.mk | 3 |
3 files changed, 2 insertions, 219 deletions
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index 0584b167e..8ce6b5f44 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -81,7 +81,6 @@ #include "inline.h"
#include "queues.h"
#include "channels.h"
-#include "serial.h"
#include "debug.h"
#endif /* _CH_H_ */
diff --git a/os/kernel/include/serial.h b/os/kernel/include/serial.h deleted file mode 100644 index deaca3d97..000000000 --- a/os/kernel/include/serial.h +++ /dev/null @@ -1,217 +0,0 @@ -/*
- ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
-
- This file is part of ChibiOS/RT.
-
- ChibiOS/RT is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/RT is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file serial.h
- * @brief Serial Drivers macros and structures.
- * @addtogroup Serial
- * @{
- */
-
-#ifndef _SERIAL_H_
-#define _SERIAL_H_
-
-#if CH_USE_SERIAL_FULLDUPLEX
-
-/** No pending conditions.*/
-#define SD_NO_ERROR 0
-/** Connection happened.*/
-#define SD_CONNECTED 1
-/** Disconnection happened.*/
-#define SD_DISCONNECTED 2
-/** Parity error happened.*/
-#define SD_PARITY_ERROR 4
-/** Framing error happened.*/
-#define SD_FRAMING_ERROR 8
-/** Overflow happened.*/
-#define SD_OVERRUN_ERROR 16
-/** Break detected.*/
-#define SD_BREAK_DETECTED 32
-
-/** Serial Driver condition flags type.*/
-typedef uint8_t dflags_t;
-
-/**
- * @brief @p FullDuplexDriver specific methods.
- */
-struct _full_duplex_driver_methods {
-};
-
-/**
- * @brief @p FullDuplexDriver specific data.
- */
-struct _full_duplex_driver_data {
- /**
- * Input queue, incoming data can be read from this input queue by
- * using the queues APIs.
- */
- InputQueue iqueue;
- /**
- * Output queue, outgoing data can be written to this output queue by
- * using the queues APIs.
- */
- OutputQueue oqueue;
- /**
- * Status Change @p EventSource. This event is generated when one or more
- * condition flags change.
- */
- EventSource sevent;
- /**
- * I/O driver status flags.
- */
- dflags_t flags;
-};
-
-/**
- * @brief @p FullDuplexDriver virtual methods table.
- */
-struct FullDuplexDriverVMT {
- /**
- * @p BaseChannel class inherited methods.
- */
- struct _base_channel_methods m0;
- /**
- * @p BaseAsynchronousChannel class inherited methods.
- */
- struct _base_asynchronous_channel_methods m1;
- /**
- * @p FullDuplexDriver specific methods.
- */
- struct _full_duplex_driver_methods m2;
-};
-
-/**
- * @extends BaseAsynchronousChannel
- *
- * @brief Full duplex serial driver class.
- * @details This class extends @p GenericSerialDriver by adding physical I/O
- * queues.
- */
-typedef struct {
- /**
- * Virtual Methods Table.
- */
- const struct FullDuplexDriverVMT *vmt;
- /**
- * @p BaseChannel class inherited data.
- */
- struct _base_channel_data d0;
- /**
- * @p BaseAsynchronousChannel class inherited data.
- */
- struct _base_asynchronous_channel_data d1;
- /**
- * @p FullDuplexDriver specific data.
- */
- struct _full_duplex_driver_data d2;
-} FullDuplexDriver;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- void chFDDInit(FullDuplexDriver *sd,
- uint8_t *ib, size_t isize, qnotify_t inotify,
- uint8_t *ob, size_t osize, qnotify_t onotify);
- void chFDDIncomingDataI(FullDuplexDriver *sd, uint8_t b);
- msg_t chFDDRequestDataI(FullDuplexDriver *sd);
- void chFDDAddFlagsI(FullDuplexDriver *sd, dflags_t mask);
- dflags_t chFDDGetAndClearFlags(FullDuplexDriver *sd);
-#ifdef __cplusplus
-}
-#endif
-
-/**
- * @brief Direct output check on a @p FullDuplexDriver. - * @details This function bypasses the indirect access to the channel and
- * checks directly the output queue. This is faster but cannot
- * be used to check different channels implementations.
- * @see chIOPutWouldBlock()
- */
-#define chFDDPutWouldBlock(sd) chOQIsFull(&(sd)->d2.oqueue)
-
-/**
- * @brief Direct input check on a @p FullDuplexDriver.
- * @details This function bypasses the indirect access to the channel and
- * checks directly the input queue. This is faster but cannot
- * be used to check different channels implementations.
- * @see chIOGetWouldBlock()
- */
-#define chFDDGetWouldBlock(sd) chIQIsEmpty(&(sd)->d2.iqueue)
-
-/**
- * @brief Direct blocking write to a @p FullDuplexDriver.
- * @details This function bypasses the indirect access to the channel and
- * writes directly on the output queue. This is faster but cannot
- * be used to write to different channels implementations.
- * @see chIOPut()
- */
-#define chFDDPut(sd, b) chOQPut(&(sd)->d2.oqueue, b)
-
-/**
- * @brief Direct blocking write on a @p FullDuplexDriver with timeout
- * specification.
- * @details This function bypasses the indirect access to the channel and
- * writes directly on the output queue. This is faster but cannot
- * be used to write to different channels implementations.
- * @see chIOPutTimeout()
- */
-#define chFDDPutTimeout(sd, b, t) chOQPutTimeout(&(sd)->d2.iqueue, b, t)
-
-/**
- * @brief Direct blocking read from a @p FullDuplexDriver.
- * @details This function bypasses the indirect access to the channel and
- * reads directly from the input queue. This is faster but cannot
- * be used to read from different channels implementations.
- * @see chIOGet()
- */
-#define chFDDGet(sd) chIQGet(&(sd)->d2.iqueue)
-
-/**
- * @brief Direct blocking read from a @p FullDuplexDriver with timeout
- * specification.
- * @details This function bypasses the indirect access to the channel and
- * reads directly from the input queue. This is faster but cannot
- * be used to read from different channels implementations.
- * @see chIOGetTimeout()
- */
-#define chFDDGetTimeout(sd, t) chIQGetTimeout(&(sd)->d2.iqueue, t)
-
-/**
- * @brief Direct non-blocking write to a @p FullDuplexDriver.
- * @details This function bypasses the indirect access to the channel and
- * writes directly to the output queue. This is faster but cannot
- * be used to write from different channels implementations.
- * @see chIOWrite()
- */
-#define chFDDWrite(sd, b, n) chOQWrite(&(sd)->d2.oqueue, b, n)
-
-/**
- * @brief Direct non-blocking read on a @p FullDuplexDriver.
- * @details This function bypasses the indirect access to the channel and
- * reads directly from the input queue. This is faster but cannot
- * be used to read from different channels implementations.
- * @see chIORead()
- */
-#define chFDDRead(sd, b, n) chIQRead(&(sd)->d2.iqueue, b, n)
-
-#endif /* CH_USE_SERIAL_FULLDUPLEX */
-
-#endif /* _SERIAL_H_ */
-
-/** @} */
diff --git a/os/kernel/kernel.mk b/os/kernel/kernel.mk index 29644a5a9..3d87bc85f 100644 --- a/os/kernel/kernel.mk +++ b/os/kernel/kernel.mk @@ -7,7 +7,8 @@ KERNSRC = ../../os/kernel/src/chsys.c ../../os/kernel/src/chdebug.c \ ../../os/kernel/src/chcond.c ../../os/kernel/src/chevents.c \
../../os/kernel/src/chmsg.c ../../os/kernel/src/chmboxes.c \
../../os/kernel/src/chqueues.c ../../os/kernel/src/chheap.c \
- ../../os/kernel/src/chmempools.c ../../os/kernel/src/chserial.c
+ ../../os/kernel/src/chmempools.c
+# ../../os/kernel/src/chserial.c
# Required include directories
KERNINC = ../../os/kernel/include
|