diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-05-08 19:02:16 +0000 | 
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-05-08 19:02:16 +0000 | 
| commit | 8f8b7f2c69575736da9004c8dc45c770b0f08c48 (patch) | |
| tree | 0243a04b338f3e562d32135413ae47ea2fdc3779 | |
| parent | 2a2b5fd348d9fcb9c1c996ea6e7ea7d362f0e9c4 (diff) | |
| download | ChibiOS-8f8b7f2c69575736da9004c8dc45c770b0f08c48.tar.gz ChibiOS-8f8b7f2c69575736da9004c8dc45c770b0f08c48.tar.bz2 ChibiOS-8f8b7f2c69575736da9004c8dc45c770b0f08c48.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4177 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/hal.dox | 10 | ||||
| -rw-r--r-- | os/hal/include/io_block.h | 10 | ||||
| -rw-r--r-- | os/kernel/kernel.dox | 23 | ||||
| -rw-r--r-- | os/kernel/src/chqueues.c | 2 | 
4 files changed, 25 insertions, 20 deletions
| diff --git a/os/hal/hal.dox b/os/hal/hal.dox index 62e9585ac..4e21f3940 100644 --- a/os/hal/hal.dox +++ b/os/hal/hal.dox @@ -81,3 +81,13 @@   *
   * @ingroup IO
   */
 +
 +/**
 + * @defgroup IO_CHANNEL Abstract I/O Channels
 + * @ingroup IO
 + */
 +
 +/**
 + * @defgroup IO_BLOCK Abstract I/O Block Device
 + * @ingroup IO
 + */
 diff --git a/os/hal/include/io_block.h b/os/hal/include/io_block.h index ebfa608b3..b12ae4588 100644 --- a/os/hal/include/io_block.h +++ b/os/hal/include/io_block.h @@ -167,8 +167,8 @@ typedef struct {   *
   * @api
   */
 -#define blkRead(ip, startblk, buffer, n)                                    \
 -  ((ip)->vmt->read(ip, startblk, buffer, n))
 +#define blkRead(ip, startblk, buf, n)                                       \
 +  ((ip)->vmt->read(ip, startblk, buf, n))
  /**
   * @brief   Writes one or more blocks.
 @@ -184,8 +184,8 @@ typedef struct {   *
   * @api
   */
 -#define blkWrite(ip, startblk, buffer, n)                                   \
 -  ((ip)->vmt->write(ip, startblk, buffer, n))
 +#define blkWrite(ip, startblk, buf, n)                                      \
 +  ((ip)->vmt->write(ip, startblk, buf, n))
  /**
   * @brief   Ensures write synchronization.
 @@ -200,7 +200,7 @@ typedef struct {   * @brief   Returns a media information structure.
   *
   * @param[in] ip        pointer to a @p BaseBlockDevice or derived class
 - * @param[out] bdpi     pointer to a @p BlockDeviceInfo structure
 + * @param[out] bdip     pointer to a @p BlockDeviceInfo structure
   *
   * @api
   */
 diff --git a/os/kernel/kernel.dox b/os/kernel/kernel.dox index 1c0f03f8c..321194e92 100644 --- a/os/kernel/kernel.dox +++ b/os/kernel/kernel.dox @@ -110,6 +110,11 @@   */
  /**
 + * @defgroup io_queues I/O Queues
 + * @ingroup synchronization
 + */
 +
 +/**
   * @defgroup memory Memory Management
   * @details Memory Management services.
   * @ingroup kernel
 @@ -136,29 +141,19 @@   */
   /**
 - * @defgroup io_support I/O Support
 - * @details I/O related services.
 + * @defgroup streams Streams and Files
 + * @details Stream and Files interfaces.
   * @ingroup kernel
   */
  /**
   * @defgroup data_streams Abstract Sequential Streams
 - * @ingroup io_support
 + * @ingroup streams
   */
  /**
   * @defgroup data_files Abstract File Streams
 - * @ingroup io_support
 - */
 -
 -/**
 - * @defgroup io_channels Abstract I/O Channels
 - * @ingroup io_support
 - */
 - 
 -/**
 - * @defgroup io_queues I/O Queues
 - * @ingroup io_support
 + * @ingroup streams
   */
  /**
 diff --git a/os/kernel/src/chqueues.c b/os/kernel/src/chqueues.c index 3e9ea24f9..adb5dd807 100644 --- a/os/kernel/src/chqueues.c +++ b/os/kernel/src/chqueues.c @@ -37,7 +37,7 @@   *            together.
   *          .
   *          I/O queues are usually used as an implementation layer for the I/O
 - *          channels interface, also see @ref io_channels.
 + *          channels interface, also see @ref IO_CHANNEL.
   * @pre     In order to use the I/O queues the @p CH_USE_QUEUES option must
   *          be enabled in @p chconf.h.
   * @{
 | 
