diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-12-11 14:29:58 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-12-11 14:29:58 +0000 |
commit | 0d094bec0505fdf1d203c3207a35271ceeda2f8b (patch) | |
tree | c9d3ad4db7d0b531c3165c8104391b8d8a4a3155 /os | |
parent | 7009a64a034902d1fd22682c9a1de68153cce042 (diff) | |
download | ChibiOS-0d094bec0505fdf1d203c3207a35271ceeda2f8b.tar.gz ChibiOS-0d094bec0505fdf1d203c3207a35271ceeda2f8b.tar.bz2 ChibiOS-0d094bec0505fdf1d203c3207a35271ceeda2f8b.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7569 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r-- | os/hal/include/hal_queues.h | 6 | ||||
-rw-r--r-- | os/hal/src/mmc_spi.c | 7 | ||||
-rw-r--r-- | os/hal/src/serial_usb.c | 4 | ||||
-rw-r--r-- | os/nil/include/nil.h | 30 |
4 files changed, 33 insertions, 14 deletions
diff --git a/os/hal/include/hal_queues.h b/os/hal/include/hal_queues.h index b9516c984..2153aa104 100644 --- a/os/hal/include/hal_queues.h +++ b/os/hal/include/hal_queues.h @@ -49,7 +49,11 @@ */
typedef struct io_queue io_queue_t;
-/** @brief Queue notification callback type.*/
+/**
+ * @brief Queue notification callback type.
+ *
+ * @param[in] qp the queue pointer.
+ */
typedef void (*qnotify_t)(io_queue_t *qp);
/**
diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c index babbf80ad..d7ffcbab4 100644 --- a/os/hal/src/mmc_spi.c +++ b/os/hal/src/mmc_spi.c @@ -289,11 +289,12 @@ static uint8_t send_command_R3(MMCDriver *mmcp, uint8_t cmd, uint32_t arg, * @brief Reads the CSD.
*
* @param[in] mmcp pointer to the @p MMCDriver object
- * @param[out] csd pointer to the CSD buffer
+ * @param[out] cmd command
+ * @param[out] cxd pointer to the CSD/CID buffer
*
* @return The operation status.
- * @retval HAL_SUCCESS the operation succeeded.
- * @retval HAL_FAILED the operation failed.
+ * @retval HAL_SUCCESS the operation succeeded.
+ * @retval HAL_FAILED the operation failed.
*
* @notapi
*/
diff --git a/os/hal/src/serial_usb.c b/os/hal/src/serial_usb.c index ea941cbcd..09b529cae 100644 --- a/os/hal/src/serial_usb.c +++ b/os/hal/src/serial_usb.c @@ -107,6 +107,8 @@ static const struct SerialUSBDriverVMT vmt = { /**
* @brief Notification of data removed from the input queue.
+ *
+ * @param[in] qp the queue pointer.
*/
static void inotify(io_queue_t *qp) {
size_t n, maxsize;
@@ -138,6 +140,8 @@ static void inotify(io_queue_t *qp) { /**
* @brief Notification of data inserted into the output queue.
+ *
+ * @param[in] qp the queue pointer.
*/
static void onotify(io_queue_t *qp) {
size_t n;
diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h index 556eeceb0..0ed960588 100644 --- a/os/nil/include/nil.h +++ b/os/nil/include/nil.h @@ -284,11 +284,16 @@ extern stkalign_t __main_thread_stack_base__, __main_thread_stack_end__; typedef struct port_intctx intctx_t;
/**
- * @brief Type of a structure representing a counting semaphore.
+ * @brief Type of a structure representing a semaphore.
*/
-typedef struct {
+typedef struct nil_semaphore semaphore_t;
+
+/**
+ * @brief Structure representing a counting semaphore.
+ */
+struct nil_semaphore {
volatile cnt_t cnt; /**< @brief Semaphore counter. */
-} semaphore_t;
+};
/**
* @brief Thread function.
@@ -301,11 +306,6 @@ typedef void (*tfunc_t)(void *); typedef struct nil_thread_cfg thread_config_t;
/**
- * @brief Type of a structure representing a thread.
- */
-typedef struct nil_thread thread_t;
-
-/**
* @brief Structure representing a thread static configuration.
*/
struct nil_thread_cfg {
@@ -317,6 +317,11 @@ struct nil_thread_cfg { };
/**
+ * @brief Type of a structure representing a thread.
+ */
+typedef struct nil_thread thread_t;
+
+/**
* @brief Type of a thread reference.
*/
typedef thread_t * thread_reference_t;
@@ -351,11 +356,16 @@ struct nil_thread { };
/**
+ * @brief Type of a structure representing the system.
+ */
+typedef struct nil_system nil_system_t;
+
+/**
* @brief System data structure.
* @note This structure contain all the data areas used by the OS except
* stacks.
*/
-typedef struct {
+struct nil_system {
/**
* @brief Pointer to the running thread.
*/
@@ -396,7 +406,7 @@ typedef struct { */
const char * volatile dbg_panic_msg;
#endif
-} nil_system_t;
+};
/*===========================================================================*/
/* Module macros. */
|