andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7040 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2014-07-17 10:42:54 +00:00
parent 6fd6d0670e
commit 25069afdb7
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demos/SPC5/NIL-SPC560D-EVB/Makefile
View File

@ -76,10 +76,10 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../.. CHIBIOS = ../../..
#include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
#include $(CHIBIOS)/os/hal/boards/ST_EVB_SPC560D/board.mk include $(CHIBIOS)/os/hal/boards/ST_EVB_SPC560D/board.mk
#include $(CHIBIOS)/os/hal/ports/SPC5/SPC560Dxx/platform.mk include $(CHIBIOS)/os/hal/ports/SPC5/SPC560Dxx/platform.mk
#include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk
include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/nil/ports/e200/compilers/GCC/mk/port_spc560dxx.mk include $(CHIBIOS)/os/nil/ports/e200/compilers/GCC/mk/port_spc560dxx.mk
#include $(CHIBIOS)/test/nil/test.mk #include $(CHIBIOS)/test/nil/test.mk

5
demos/SPC5/NIL-SPC560D-EVB/main.c
View File

@ -15,7 +15,7 @@
*/ */
#include "nil.h" #include "nil.h"
//#include "hal.h" #include "hal.h"
//#include "test.h" //#include "test.h"
#if 0 #if 0
@ -95,7 +95,6 @@ static THD_FUNCTION(Thread1, arg) {
(void)arg; (void)arg;
while (TRUE) { while (TRUE) {
#if 0
unsigned i; unsigned i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -152,8 +151,6 @@ static THD_FUNCTION(Thread1, arg) {
palSetPort(PORT_E, PAL_PORT_BIT(PE_LED1) | PAL_PORT_BIT(PE_LED2) | palSetPort(PORT_E, PAL_PORT_BIT(PE_LED1) | PAL_PORT_BIT(PE_LED2) |
PAL_PORT_BIT(PE_LED3) | PAL_PORT_BIT(PE_LED4)); PAL_PORT_BIT(PE_LED3) | PAL_PORT_BIT(PE_LED4));
#endif
chThdSleepMilliseconds(500);
} }
} }

8
os/hal/include/hal_queues.h
View File

@ -47,7 +47,7 @@
/** /**
* @brief Type of a generic I/O queue structure. * @brief Type of a generic I/O queue structure.
*/ */
typedef struct io_queue_t io_queue_t; typedef struct io_queue io_queue_t;
/** @brief Queue notification callback type.*/ /** @brief Queue notification callback type.*/
typedef void (*qnotify_t)(io_queue_t *qp); typedef void (*qnotify_t)(io_queue_t *qp);
@ -61,7 +61,7 @@ typedef void (*qnotify_t)(io_queue_t *qp);
* lock zone (see <b>I-Locked</b> and <b>S-Locked</b> states in * lock zone (see <b>I-Locked</b> and <b>S-Locked</b> states in
* @ref system_states) and is non-blocking. * @ref system_states) and is non-blocking.
*/ */
struct io_queue_t { struct io_queue {
threads_queue_t q_waiting; /**< @brief Waiting thread. */ threads_queue_t q_waiting; /**< @brief Waiting thread. */
size_t q_counter; /**< @brief Resources counter. */ size_t q_counter; /**< @brief Resources counter. */
uint8_t *q_buffer; /**< @brief Pointer to the queue buffer.*/ uint8_t *q_buffer; /**< @brief Pointer to the queue buffer.*/
@ -365,6 +365,10 @@ extern "C" {
} }
#endif #endif
/* Types provided for backward compatibility, deprecated use.*/
typedef io_queue_t GenericQueue;
typedef input_queue_t InputQueue;
typedef output_queue_t OutputQueue;
#else /* defined(_CHIBIOS_RT_) && CH_USE_QUEUES */ #else /* defined(_CHIBIOS_RT_) && CH_USE_QUEUES */

4
os/hal/osal/nil/osal.h
View File

@ -135,6 +135,10 @@
/* Module data structures and types. */ /* Module data structures and types. */
/*===========================================================================*/ /*===========================================================================*/
/* Temporary types provided for ChibiOS 2.x compatibility.*/
typedef bool bool_t;
#define OSAL_FREQUENCY OSAL_ST_FREQUENCY
#if 0 #if 0
/** /**
* @brief Type of a system status word. * @brief Type of a system status word.