git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1106 35acf78f-673a-0410-8e92-d51de3d6d3f4
parent
6b9e823237
commit
4682722567
|
@ -232,16 +232,6 @@
|
|||
#define CH_USE_QUEUES TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the full duplex serial driver APIs are included in the
|
||||
* kernel.
|
||||
* @note The default is @p TRUE.
|
||||
* @note Requires @p CH_USE_QUEUES.
|
||||
*/
|
||||
#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
|
||||
#define CH_USE_SERIAL_FULLDUPLEX TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the memory heap allocator APIs are included in the kernel.
|
||||
* @note The default is @p TRUE.
|
||||
|
|
|
@ -232,16 +232,6 @@
|
|||
#define CH_USE_QUEUES TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the full duplex serial driver APIs are included in the
|
||||
* kernel.
|
||||
* @note The default is @p TRUE.
|
||||
* @note Requires @p CH_USE_QUEUES.
|
||||
*/
|
||||
#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
|
||||
#define CH_USE_SERIAL_FULLDUPLEX TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the memory heap allocator APIs are included in the kernel.
|
||||
* @note The default is @p TRUE.
|
||||
|
|
|
@ -232,16 +232,6 @@
|
|||
#define CH_USE_QUEUES TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the full duplex serial driver APIs are included in the
|
||||
* kernel.
|
||||
* @note The default is @p TRUE.
|
||||
* @note Requires @p CH_USE_QUEUES.
|
||||
*/
|
||||
#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
|
||||
#define CH_USE_SERIAL_FULLDUPLEX TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the memory heap allocator APIs are included in the kernel.
|
||||
* @note The default is @p TRUE.
|
||||
|
|
|
@ -232,16 +232,6 @@
|
|||
#define CH_USE_QUEUES FALSE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the full duplex serial driver APIs are included in the
|
||||
* kernel.
|
||||
* @note The default is @p TRUE.
|
||||
* @note Requires @p CH_USE_QUEUES.
|
||||
*/
|
||||
#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
|
||||
#define CH_USE_SERIAL_FULLDUPLEX FALSE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the memory heap allocator APIs are included in the kernel.
|
||||
* @note The default is @p TRUE.
|
||||
|
|
|
@ -232,16 +232,6 @@
|
|||
#define CH_USE_QUEUES TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the full duplex serial driver APIs are included in the
|
||||
* kernel.
|
||||
* @note The default is @p TRUE.
|
||||
* @note Requires @p CH_USE_QUEUES.
|
||||
*/
|
||||
#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
|
||||
#define CH_USE_SERIAL_FULLDUPLEX TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the memory heap allocator APIs are included in the kernel.
|
||||
* @note The default is @p TRUE.
|
||||
|
|
|
@ -89,7 +89,8 @@ include ../../test/test.mk
|
|||
SRC = ${PORTSRC} \
|
||||
${KERNSRC} \
|
||||
${TESTSRC} \
|
||||
../../os/ports/GCC/AVR/avr_serial.c \
|
||||
../../os/io/serial.c \
|
||||
../../os/io/platforms/AVR/serial_lld.c \
|
||||
../../os/various/evtimer.c \
|
||||
board.c main.c
|
||||
|
||||
|
@ -125,7 +126,10 @@ DEBUG = dwarf-2
|
|||
# Each directory must be seperated by a space.
|
||||
# Use forward slashes for directory separators.
|
||||
# For a directory that has spaces, enclose it in quotes.
|
||||
EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC)e ../../os/various
|
||||
EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \
|
||||
../../os/io \
|
||||
../../os/io/platforms/AVR \
|
||||
../../os/various
|
||||
|
||||
|
||||
# Compiler flag to set the C Standard level.
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
*/
|
||||
|
||||
#include <ch.h>
|
||||
#include <serial.h>
|
||||
|
||||
#include "board.h"
|
||||
#include "avr_serial.h"
|
||||
|
||||
CH_IRQ_HANDLER(TIMER0_COMP_vect) {
|
||||
|
||||
|
@ -71,9 +71,9 @@ void hwinit(void) {
|
|||
/*
|
||||
* Timer 0 setup.
|
||||
*/
|
||||
TCCR0A = (1 << WGM01) | (0 << WGM00) | // CTC mode.
|
||||
TCCR0A = (1 << WGM01) | (0 << WGM00) | // CTC mode.
|
||||
(0 << COM0A1) | (0 << COM0A0) | // OC0A disabled (normal I/O).
|
||||
(0 << CS02) | (1 << CS01) | (1 << CS00); // CLK/64 clock source.
|
||||
(0 << CS02) | (1 << CS01) | (1 << CS00); // CLK/64 clock source.
|
||||
OCR0A = F_CPU / 64 / CH_FREQUENCY - 1;
|
||||
TCNT0 = 0; // Reset counter.
|
||||
TIFR0 = (1 << OCF0A); // Reset pending (if any).
|
||||
|
@ -82,5 +82,5 @@ void hwinit(void) {
|
|||
/*
|
||||
* Other initializations.
|
||||
*/
|
||||
serial_init();
|
||||
sdInit();
|
||||
}
|
||||
|
|
|
@ -232,16 +232,6 @@
|
|||
#define CH_USE_QUEUES TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the full duplex serial driver APIs are included in the
|
||||
* kernel.
|
||||
* @note The default is @p TRUE.
|
||||
* @note Requires @p CH_USE_QUEUES.
|
||||
*/
|
||||
#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
|
||||
#define CH_USE_SERIAL_FULLDUPLEX TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the memory heap allocator APIs are included in the kernel.
|
||||
* @note The default is @p TRUE.
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
*/
|
||||
|
||||
#include <ch.h>
|
||||
#include <serial.h>
|
||||
#include <evtimer.h>
|
||||
#include <avr_serial.h>
|
||||
|
||||
#include <avr/io.h>
|
||||
|
||||
|
@ -41,7 +41,7 @@ static void TimerHandler(eventid_t id) {
|
|||
msg_t TestThread(void *p);
|
||||
|
||||
if (!(PORTE & PORTE_BUTTON))
|
||||
TestThread(&SER2);
|
||||
TestThread(&SD2);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
|
@ -59,6 +59,11 @@ int main(int argc, char **argv) {
|
|||
*/
|
||||
chSysInit();
|
||||
|
||||
/*
|
||||
* Activates the serial driver 2 using the driver default configuration.
|
||||
*/
|
||||
sdStart(&SD2, NULL);
|
||||
|
||||
/*
|
||||
* Event Timer initialization.
|
||||
*/
|
||||
|
|
|
@ -89,9 +89,10 @@ include ../../test/test.mk
|
|||
SRC = ${PORTSRC} \
|
||||
${KERNSRC} \
|
||||
${TESTSRC} \
|
||||
../../os/ports/GCC/AVR/avr_serial.c \
|
||||
../../os/io/serial.c \
|
||||
../../os/io/platforms/AVR/serial_lld.c \
|
||||
../../os/various/evtimer.c \
|
||||
board.c lcd.c main.c
|
||||
board.c main.c
|
||||
|
||||
|
||||
# List C++ source files here. (C dependencies are automatically generated.)
|
||||
|
@ -125,7 +126,10 @@ DEBUG = dwarf-2
|
|||
# Each directory must be seperated by a space.
|
||||
# Use forward slashes for directory separators.
|
||||
# For a directory that has spaces, enclose it in quotes.
|
||||
EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC)e ../../os/various
|
||||
EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \
|
||||
../../os/io \
|
||||
../../os/io/platforms/AVR \
|
||||
../../os/various
|
||||
|
||||
|
||||
# Compiler flag to set the C Standard level.
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
*/
|
||||
|
||||
#include <ch.h>
|
||||
#include <serial.h>
|
||||
|
||||
#include "board.h"
|
||||
#include "avr_serial.h"
|
||||
|
||||
CH_IRQ_HANDLER(TIMER0_COMP_vect) {
|
||||
|
||||
|
@ -82,5 +82,5 @@ void hwinit(void) {
|
|||
/*
|
||||
* Other initializations.
|
||||
*/
|
||||
serial_init();
|
||||
sdInit();
|
||||
}
|
||||
|
|
|
@ -232,16 +232,6 @@
|
|||
#define CH_USE_QUEUES TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the full duplex serial driver APIs are included in the
|
||||
* kernel.
|
||||
* @note The default is @p TRUE.
|
||||
* @note Requires @p CH_USE_QUEUES.
|
||||
*/
|
||||
#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
|
||||
#define CH_USE_SERIAL_FULLDUPLEX TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the memory heap allocator APIs are included in the kernel.
|
||||
* @note The default is @p TRUE.
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
*/
|
||||
|
||||
#include <ch.h>
|
||||
#include <serial.h>
|
||||
#include <evtimer.h>
|
||||
#include <avr_serial.h>
|
||||
|
||||
#include <avr/io.h>
|
||||
|
||||
|
@ -43,7 +43,7 @@ static void TimerHandler(eventid_t id) {
|
|||
msg_t TestThread(void *p);
|
||||
|
||||
if (!(PINA & PORTA_BUTTON1))
|
||||
TestThread(&SER2);
|
||||
TestThread(&SD2);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
|
@ -61,6 +61,11 @@ int main(int argc, char **argv) {
|
|||
*/
|
||||
chSysInit();
|
||||
|
||||
/*
|
||||
* Activates the serial driver 2 using the driver default configuration.
|
||||
*/
|
||||
sdStart(&SD2, NULL);
|
||||
|
||||
/*
|
||||
* This initialization requires the OS already active because it uses delay
|
||||
* APIs inside.
|
||||
|
|
|
@ -232,16 +232,6 @@
|
|||
#define CH_USE_QUEUES TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the full duplex serial driver APIs are included in the
|
||||
* kernel.
|
||||
* @note The default is @p TRUE.
|
||||
* @note Requires @p CH_USE_QUEUES.
|
||||
*/
|
||||
#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
|
||||
#define CH_USE_SERIAL_FULLDUPLEX TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* If specified then the memory heap allocator APIs are included in the kernel.
|
||||
* @note The default is @p TRUE.
|
||||
|
|
Loading…
Reference in New Issue