From dfd631cb67bf200991186fb33f4b1d4ab708ca6e Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 20 Dec 2009 14:07:05 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1448
35acf78f-673a-0410-8e92-d51de3d6d3f4
---
boards/OLIMEX_LPC_P2148/board.mk | 10 +-
demos/ARM7-LPC214x-GCC-minimal/Makefile | 183 ------------
demos/ARM7-LPC214x-GCC-minimal/ch.ld | 101 -------
demos/ARM7-LPC214x-GCC-minimal/chconf.h | 464 ------------------------------
demos/ARM7-LPC214x-GCC-minimal/halconf.h | 96 -------
demos/ARM7-LPC214x-GCC-minimal/main.c | 81 ------
demos/ARM7-LPC214x-GCC-minimal/readme.txt | 18 --
demos/ARM7-LPC214x-GCC/Makefile | 37 +--
demos/ARM7-LPC214x-GCC/board.c | 90 ------
demos/ARM7-LPC214x-GCC/board.h | 77 -----
demos/ARM7-LPC214x-GCC/buzzer.c | 92 ------
demos/ARM7-LPC214x-GCC/buzzer.h | 35 ---
demos/ARM7-LPC214x-GCC/main.c | 85 +-----
demos/ARM7-LPC214x-GCC/mmcsd.c | 388 -------------------------
demos/ARM7-LPC214x-GCC/mmcsd.h | 66 -----
15 files changed, 34 insertions(+), 1789 deletions(-)
delete mode 100644 demos/ARM7-LPC214x-GCC-minimal/Makefile
delete mode 100644 demos/ARM7-LPC214x-GCC-minimal/ch.ld
delete mode 100644 demos/ARM7-LPC214x-GCC-minimal/chconf.h
delete mode 100644 demos/ARM7-LPC214x-GCC-minimal/halconf.h
delete mode 100644 demos/ARM7-LPC214x-GCC-minimal/main.c
delete mode 100644 demos/ARM7-LPC214x-GCC-minimal/readme.txt
delete mode 100644 demos/ARM7-LPC214x-GCC/board.c
delete mode 100644 demos/ARM7-LPC214x-GCC/board.h
delete mode 100644 demos/ARM7-LPC214x-GCC/buzzer.c
delete mode 100644 demos/ARM7-LPC214x-GCC/buzzer.h
delete mode 100644 demos/ARM7-LPC214x-GCC/mmcsd.c
delete mode 100644 demos/ARM7-LPC214x-GCC/mmcsd.h
diff --git a/boards/OLIMEX_LPC_P2148/board.mk b/boards/OLIMEX_LPC_P2148/board.mk
index e10d5d398..d41ed5dd4 100644
--- a/boards/OLIMEX_LPC_P2148/board.mk
+++ b/boards/OLIMEX_LPC_P2148/board.mk
@@ -1,6 +1,8 @@
-# List of all the board related files.
-BOARDSRC = ${CHIBIOS}/boards/OLIMEX_LPC_P2148/board.c \
- ${CHIBIOS}/boards/OLIMEX_LPC_P2148/buzzer.c
+# Board directory path
+BOARDPATH = ${CHIBIOS}/boards/OLIMEX_LPC_P2148/
+
+# List of all the mandatory board related files.
+BOARDSRC = ${BOARDPATH}/board.c
# Required include directories
-BOARDINC = ${CHIBIOS}/boards/OLIMEX_LPC_P2148
+BOARDINC = ${BOARDPATH}
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile b/demos/ARM7-LPC214x-GCC-minimal/Makefile
deleted file mode 100644
index 4fe00385d..000000000
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile
+++ /dev/null
@@ -1,183 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
- USE_OPT = -O2 -ggdb -fomit-frame-pointer -mabi=apcs-gnu -falign-functions=16
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
- USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
- USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
- USE_THUMB = no
-endif
-
-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
- USE_CURRP_CACHING = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Define linker script file here
-LDSCRIPT = ch.ld
-
-# Imported source files
-CHIBIOS = ../..
-include $(CHIBIOS)/boards/OLIMEX_LPC_P2148/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC214x/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARM7/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-#include $(CHIBIOS)/test/test.mk
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
- $(KERNSRC) \
- $(TESTSRC) \
- $(HALSRC) \
- $(PLATFORMSRC) \
- $(BOARDSRC) \
- main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-# option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-# option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-# option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-# option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM) \
- $(CHIBIOS)/os/ports/GCC/ARM7/LPC214x/vectors.s
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
- $(HALINC) $(PLATFORMINC) $(BOARDINC) \
- $(CHIBIOS)/os/various \
- $(CHIBIOS)/os/ports/GCC/ARM7/LPC214x
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU = arm7tdmi
-
-TRGT = arm-elf-
-CC = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-# runtime support makes code size explode.
-LD = $(TRGT)gcc
-#LD = $(TRGT)g++
-CP = $(TRGT)objcopy
-AS = $(TRGT)gcc -x assembler-with-cpp
-OD = $(TRGT)objdump
-HEX = $(CP) -O ihex
-BIN = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS =
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
diff --git a/demos/ARM7-LPC214x-GCC-minimal/ch.ld b/demos/ARM7-LPC214x-GCC-minimal/ch.ld
deleted file mode 100644
index 9dd4d388e..000000000
--- a/demos/ARM7-LPC214x-GCC-minimal/ch.ld
+++ /dev/null
@@ -1,101 +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/>.
-*/
-
-/*
- * LPC2148 memory setup.
- */
-__und_stack_size__ = 0x0004;
-__abt_stack_size__ = 0x0004;
-__fiq_stack_size__ = 0x0010;
-__irq_stack_size__ = 0x0080;
-__svc_stack_size__ = 0x0004;
-__sys_stack_size__ = 0x0400;
-__stacks_total_size__ = __und_stack_size__ + __abt_stack_size__ + __fiq_stack_size__ + __irq_stack_size__ + __svc_stack_size__ + __sys_stack_size__;
-
-MEMORY
-{
- flash : org = 0x00000000, len = 512k - 12k
- ram : org = 0x40000200, len = 32k - 0x200 - 288
-}
-
-__ram_start__ = ORIGIN(ram);
-__ram_size__ = LENGTH(ram);
-__ram_end__ = __ram_start__ + __ram_size__;
-__dma_start__ = 0x7FD00000;
-__dma_size__ = 8k;
-__dma_end__ = 0x7FD00000 + __dma_size__;
-
-SECTIONS
-{
- . = 0;
-
- .text : ALIGN(16) SUBALIGN(16)
- {
- _text = .;
- KEEP(*(vectors))
- *(.text)
- *(.text.*);
- *(.rodata);
- *(.rodata.*);
- *(.glue_7t);
- *(.glue_7);
- *(.gcc*);
- *(.ctors);
- *(.dtors);
- . = ALIGN(4);
- _etext = .;
- } > flash
-
- _textdata = _etext;
-
- .data :
- {
- _data = .;
- *(.data)
- . = ALIGN(4);
- *(.data.*)
- . = ALIGN(4);
- *(.ramtext)
- . = ALIGN(4);
- _edata = .;
- } > ram AT > flash
-
- .bss :
- {
- _bss_start = .;
- *(.bss)
- . = ALIGN(4);
- *(.bss.*)
- . = ALIGN(4);
- *(COMMON)
- . = ALIGN(4);
- _bss_end = .;
- } > ram
-
- /DISCARD/ :
- {
- *(.eh_*)
- }
-}
-
-PROVIDE(end = .);
-_end = .;
-
-__heap_base__ = _end;
-__heap_end__ = __ram_end__ - __stacks_total_size__;
diff --git a/demos/ARM7-LPC214x-GCC-minimal/chconf.h b/demos/ARM7-LPC214x-GCC-minimal/chconf.h
deleted file mode 100644
index 460ee004a..000000000
--- a/demos/ARM7-LPC214x-GCC-minimal/chconf.h
+++ /dev/null
@@ -1,464 +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 templates/chconf.h
- * @brief Configuration file template.
- * @addtogroup config
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/* Kernel parameters. */
-/*===========================================================================*/
-
-/**
- * @brief System tick frequency.
- * @details Frequency of the system timer that drives the system ticks. This
- * setting also defines the system tick time unit.
- */
-#if !defined(CH_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY 1000
-#endif
-
-/**
- * @brief Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- * threads before preemption occurs. Setting this value to zero
- * disables the round robin mechanism.
- *
- * @note Disabling round robin makes the kernel more compact and generally
- * faster but forbids multiple threads at the same priority level.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM 20
-#endif
-
-/**
- * @brief Nested locks.
- * @details If enabled then the use of nested @p chSysLock() / @p chSysUnlock()
- * operations is allowed.<br>
- * For performance and code size reasons the recommended setting
- * is to leave this option disabled.<br>
- * You may use this option if you need to merge ChibiOS/RT with
- * external libraries that require nested lock/unlock operations.
- *
- * @note The default is @p FALSE.
- */
-#if !defined(CH_USE_NESTED_LOCKS) || defined(__DOXYGEN__)
-#define CH_USE_NESTED_LOCKS FALSE
-#endif
-
-/**
- * @brief Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- * then the whole available RAM is used. The core memory is made
- * available to the heap allocator and/or can be used directly through
- * the simplified core memory allocator.
- *
- * @note In order to let the OS manage the whole RAM the linker script must
- * provide the @p __heap_base__ and @p __heap_end__ symbols.
- * @note Requires @p CH_USE_COREMEM.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_MEMCORE_SIZE 0
-#endif
-
-/*===========================================================================*/
-/* Performance options. */
-/*===========================================================================*/
-
-/**
- * @brief OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- * is used when two possible implementations exist.
- *
- * @note This is not related to the compiler optimization options.
- * @note The default is @p TRUE.
- */
-#if !defined(CH_OPTIMIZE_SPEED) || defined(__DOXYGEN__)
-#define CH_OPTIMIZE_SPEED FALSE
-#endif
-
-/**
- * @brief Exotic optimization.
- * @details If defined then a CPU register is used as storage for the global
- * @p currp variable. Caching this variable in a register greatly
- * improves both space and time OS efficiency. A side effect is that
- * one less register has to be saved during the context switch
- * resulting in lower RAM usage and faster context switch.
- *
- * @note This option is only usable with the GCC compiler and is only useful
- * on processors with many registers like ARM cores.
- * @note If this option is enabled then ALL the libraries linked to the
- * ChibiOS/RT code <b>must</b> be recompiled with the GCC option @p
- * -ffixed-@<reg@>.
- * @note This option must be enabled in the Makefile, it is listed here for
- * documentation only.
- */
-#if defined(__DOXYGEN__)
-#define CH_CURRP_REGISTER_CACHE "reg"
-#endif
-
-/*===========================================================================*/
-/* Subsystem options. */
-/*===========================================================================*/
-
-/**
- * @brief Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- * the kernel.
- *
- * @note The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT FALSE
-#endif
-
-/**
- * @brief Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES FALSE
-#endif
-
-/**
- * @brief Semaphores queuing mode.
- * @details If enabled then the threads are enqueued on semaphores by
- * priority rather than in FIFO order.
- *
- * @note The default is @p FALSE. Enable this if you have special requirements.
- * @note Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES_PRIORITY FALSE
-#endif
-
-/**
- * @brief Atomic semaphore API.
- * @details If enabled then the semaphores the @p chSemWaitSignal() API
- * is included in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW FALSE
-#endif
-
-/**
- * @brief Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES FALSE
-#endif
-
-/**
- * @brief Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS FALSE
-#endif
-
-/**
- * @brief Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- * specification are included in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT FALSE
-#endif
-
-/**
- * @brief Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS FALSE
-#endif
-
-/**
- * @brief Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- * are included in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT FALSE
-#endif
-
-/**
- * @brief Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES FALSE
-#endif
-
-/**
- * @brief Synchronous Messages queuing mode.
- * @details If enabled then messages are served by priority rather than in
- * FIFO order.
- *
- * @note The default is @p FALSE. Enable this if you have special requirements.
- * @note Requires @p CH_USE_MESSAGES.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY FALSE
-#endif
-
-/**
- * @brief Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- * included in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES FALSE
-#endif
-
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES FALSE
-#endif
-
-/**
- * @brief Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE FALSE
-#endif
-
-/**
- * @brief Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_COREMEM and either @p CH_USE_MUTEXES or
- * @p CH_USE_SEMAPHORES.
- * @note Mutexes are recommended.
- */
-#if !defined(CH_USE_HEAP) || defined(__DOXYGEN__)
-#define CH_USE_HEAP FALSE
-#endif
-
-/**
- * @brief C-runtime allocator.
- * @details If enabled the the heap allocator APIs just wrap the C-runtime
- * @p malloc() and @p free() functions.
- *
- * @note The default is @p FALSE.
- * @note Requires @p CH_USE_HEAP.
- * @note The C-runtime may or may not require @p CH_USE_COREMEM, see the
- * appropriate documentation.
- */
-#if !defined(CH_USE_MALLOC_HEAP) || defined(__DOXYGEN__)
-#define CH_USE_MALLOC_HEAP FALSE
-#endif
-
-/**
- * @brief Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS FALSE
-#endif
-
-/**
- * @brief Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_WAITEXIT.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC FALSE
-#endif
-
-/*===========================================================================*/
-/* Debug options. */
-/*===========================================================================*/
-
-/**
- * @brief Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- * parameters are activated.
- *
- * @note The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS FALSE
-#endif
-
-/**
- * @brief Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- * activated. This includes consistency checks inside the kernel,
- * runtime anomalies and port-defined checks.
- *
- * @note The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS FALSE
-#endif
-
-/**
- * @brief Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- * activated.
- *
- * @note The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE FALSE
-#endif
-
-/**
- * @brief Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note The default is @p FALSE.
- * @note The stack check is performed in a architecture/port dependent way. It
- * may not be implemented or some ports.
- */
-#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK FALSE
-#endif
-
-/**
- * @brief Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- * value when a thread is created. This can be useful for the
- * runtime measurement of the used stack.
- *
- * @note The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#define CH_DBG_FILL_THREADS FALSE
-#endif
-
-/**
- * @brief Debug option, threads profiling.
- * @details If enabled then a field is added to the @p Thread structure that
- * counts the system ticks occurred while executing the thread.
- *
- * @note The default is @p TRUE.
- * @note This debug option is defaulted to TRUE because it is required by
- * some test cases into the test suite.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING FALSE
-#endif
-
-/*===========================================================================*/
-/* Kernel hooks. */
-/*===========================================================================*/
-
-/**
- * @brief Threads descriptor structure hook.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS \
-struct { \
- /* Add threads custom fields here.*/ \
-};
-#endif
-
-/**
- * @brief Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @note It is invoked from within @p chThdInit() and implicitily from all
- * the threads creation APIs.
- */
-#if !defined(THREAD_EXT_INIT) || defined(__DOXYGEN__)
-#define THREAD_EXT_INIT(tp) { \
- /* Add threads initialization code here.*/ \
-}
-#endif
-
-/**
- * @brief Threads finalization hook.
- * @details User finalization code added to the @p chThdExit() API.
- *
- * @note It is inserted into lock zone.
- * @note It is also invoked when the threads simply return in order to
- * terminate.
- */
-#if !defined(THREAD_EXT_EXIT) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT(tp) { \
- /* Add threads finalization code here.*/ \
-}
-#endif
-
-/**
- * @brief Idle Loop hook.
- * @details This hook is continuously invoked by the idle thread loop.
- */
-#if !defined(IDLE_LOOP_HOOK) || defined(__DOXYGEN__)
-#define IDLE_LOOP_HOOK() { \
- /* Idle loop code here.*/ \
-}
-#endif
-
-#endif /* _CHCONF_H_ */
-
-/** @} */
diff --git a/demos/ARM7-LPC214x-GCC-minimal/halconf.h b/demos/ARM7-LPC214x-GCC-minimal/halconf.h
deleted file mode 100644
index 63afdace0..000000000
--- a/demos/ARM7-LPC214x-GCC-minimal/halconf.h
+++ /dev/null
@@ -1,96 +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 templates/halconf.h
- * @brief HAL configuration header.
- * @addtogroup HAL_CONF
- * @{
- */
-
-/*
- * HAL configuration file, this file allows to enable or disable the various
- * device drivers from your application. You may also use this file in order
- * to change the device drivers settings found in the low level drivers
- * headers, just define here the new settings and those will override the
- * defaults defined in the LLD headers.
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-/**
- * @brief Enables the PAL subsystem.
- */
-#if !defined(CH_HAL_USE_PAL) || defined(__DOXYGEN__)
-#define CH_HAL_USE_PAL TRUE
-#endif
-
-/**
- * @brief Enables the ADC subsystem.
- */
-#if !defined(CH_HAL_USE_ADC) || defined(__DOXYGEN__)
-#define CH_HAL_USE_ADC FALSE
-#endif
-
-/**
- * @brief Enables the CAN subsystem.
- */
-#if !defined(CH_HAL_USE_CAN) || defined(__DOXYGEN__)
-#define CH_HAL_USE_CAN FALSE
-#endif
-
-/**
- * @brief Enables the MAC subsystem.
- */
-#if !defined(CH_HAL_USE_MAC) || defined(__DOXYGEN__)
-#define CH_HAL_USE_MAC FALSE
-#endif
-
-/**
- * @brief Enables the PWM subsystem.
- */
-#if !defined(CH_HAL_USE_PWM) || defined(__DOXYGEN__)
-#define CH_HAL_USE_PWM FALSE
-#endif
-
-/**
- * @brief Enables the SERIAL subsystem.
- */
-#if !defined(CH_HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define CH_HAL_USE_SERIAL FALSE
-#endif
-
-/**
- * @brief Enables the SPI subsystem.
- */
-#if !defined(CH_HAL_USE_SPI) || defined(__DOXYGEN__)
-#define CH_HAL_USE_SPI FALSE
-#endif
-
-/**
- * @brief Enables the MMC_SPI subsystem.
- */
-#if !defined(CH_HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define CH_HAL_USE_MMC_SPI FALSE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/demos/ARM7-LPC214x-GCC-minimal/main.c b/demos/ARM7-LPC214x-GCC-minimal/main.c
deleted file mode 100644
index 940e77b5e..000000000
--- a/demos/ARM7-LPC214x-GCC-minimal/main.c
+++ /dev/null
@@ -1,81 +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/>.
-*/
-
-#include "ch.h"
-#include "hal.h"
-
-/*
- * Red LEDs blinker thread, times are in milliseconds.
- */
-static WORKING_AREA(waThread1, 128);
-static msg_t Thread1(void *arg) {
-
- (void)arg;
- while (TRUE) {
- palClearPort(IOPORT1, PAL_PORT_BIT(PA_LED2));
- chThdSleepMilliseconds(200);
- palSetPort(IOPORT1, PAL_PORT_BIT(PA_LED1) | PAL_PORT_BIT(PA_LED2));
- chThdSleepMilliseconds(800);
- palClearPort(IOPORT1, PAL_PORT_BIT(PA_LED1));
- chThdSleepMilliseconds(200);
- palSetPort(IOPORT1, PAL_PORT_BIT(PA_LED1) | PAL_PORT_BIT(PA_LED2));
- chThdSleepMilliseconds(800);
- }
- return 0;
-}
-
-/*
- * Yellow LED blinker thread, times are in milliseconds.
- */
-static WORKING_AREA(waThread2, 128);
-static msg_t Thread2(void *arg) {
-
- (void)arg;
- while (TRUE) {
- palClearPad(IOPORT1, PA_LEDUSB);
- chThdSleepMilliseconds(200);
- palSetPad(IOPORT1, PA_LEDUSB);
- chThdSleepMilliseconds(300);
- }
- return 0;
-}
-
-/*
- * Entry point, note, the main() function is already a thread in the system
- * on entry.
- */
-int main(int argc, char **argv) {
-
- (void)argc;
- (void)argv;
-
- /*
- * Creates the blinker threads.
- */
- chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
- chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO, Thread2, NULL);
-
- /*
- * Normal main() thread activity, in this demo it does nothing except
- * sleeping in a loop.
- */
- while (TRUE)
- chThdSleepMilliseconds(1000);
- return 0;
-}
diff --git a/demos/ARM7-LPC214x-GCC-minimal/readme.txt b/demos/ARM7-LPC214x-GCC-minimal/readme.txt
deleted file mode 100644
index 363cd8dde..000000000
--- a/demos/ARM7-LPC214x-GCC-minimal/readme.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-*****************************************************************************
-** ChibiOS/RT port for ARM7TDMI LPC214X. **
-*****************************************************************************
-
-** TARGET **
-
-The demo runs on an Olimex LPC-P2148 board. The port on other boards or other
-members of the LPC2000 family should be an easy task.
-
-** The Demo **
-
-This is a minimal demo, it just blinks the leds on the board by using multiple
-threads, most subsystems are disabled.
-
-** Build Procedure **
-
-The demo was built using the YAGARTO toolchain but any toolchain based on GCC
-and GNU userspace programs will work.
diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index 9d44185a4..a1056cbd7 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -44,22 +44,22 @@ LDSCRIPT = ch.ld
# Imported source files
CHIBIOS = ../..
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/hal/platforms/LPC214x/platform.mk
-include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk
-include ${CHIBIOS}/os/kernel/kernel.mk
-include ${CHIBIOS}/test/test.mk
+include $(CHIBIOS)/boards/OLIMEX_LPC_P2148/board.mk
+include $(CHIBIOS)/os/hal/platforms/LPC214x/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/ports/GCC/ARM7/port.mk
+include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/test/test.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
-CSRC = ${PORTSRC} \
- ${KERNSRC} \
- ${TESTSRC} \
- ${HALSRC} \
- ${PLATFORMSRC} \
- ${CHIBIOS}/os/hal/platforms/LPC214x/lpc214x_ssp.c \
- ${CHIBIOS}/os/various/evtimer.c \
- board.c buzzer.c mmcsd.c main.c
+CSRC = $(PORTSRC) \
+ $(KERNSRC) \
+ $(TESTSRC) \
+ $(HALSRC) \
+ $(PLATFORMSRC) \
+ $(BOARDSRC) \
+ main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -87,11 +87,12 @@ TCPPSRC =
# List ASM source files here
ASMSRC = $(PORTASM) \
- ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x/vectors.s
+ $(CHIBIOS)/os/ports/GCC/ARM7/LPC214x/vectors.s
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
- ${CHIBIOS}/os/various \
- ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x
+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+ $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+ $(CHIBIOS)/os/various \
+ $(CHIBIOS)/os/ports/GCC/ARM7/LPC214x
#
# Project, sources and paths
@@ -179,4 +180,4 @@ ULIBS =
# End of user defines
##############################################################################
-include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
diff --git a/demos/ARM7-LPC214x-GCC/board.c b/demos/ARM7-LPC214x-GCC/board.c
deleted file mode 100644
index f81d2329a..000000000
--- a/demos/ARM7-LPC214x-GCC/board.c
+++ /dev/null
@@ -1,90 +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/>.
-*/
-
-#include "ch.h"
-#include "hal.h"
-
-#include "lpc214x_ssp.h"
-#include "mmcsd.h"
-#include "buzzer.h"
-
-#define VAL_TC0_PRESCALER 0
-
-/*
- * Timer 0 IRQ handling here.
- */
-static CH_IRQ_HANDLER(T0IrqHandler) {
-
- CH_IRQ_PROLOGUE();
- T0IR = 1; /* Clear interrupt on match MR0. */
-
- chSysLockFromIsr();
- chSysTimerHandlerI();
- chSysUnlockFromIsr();
-
- VICVectAddr = 0;
- CH_IRQ_EPILOGUE();
-}
-
-/*
- * Early initialization code.
- * This initialization is performed just after reset before BSS and DATA
- * segments initialization.
- */
-void hwinit0(void) {
-
- lpc214x_clock_init();
-}
-
-/*
- * Late initialization code.
- * This initialization is performed after BSS and DATA segments initialization
- * and before invoking the main() function.
- */
-void hwinit1(void) {
-
- /*
- * HAL initialization.
- */
- halInit();
-
- /*
- * System Timer initialization, 1ms intervals.
- */
- SetVICVector(T0IrqHandler, 0, SOURCE_Timer0);
- VICIntEnable = INTMASK(SOURCE_Timer0);
- TC *timer = T0Base;
- timer->TC_PR = VAL_TC0_PRESCALER;
- timer->TC_MR0 = (PCLK / CH_FREQUENCY) / (VAL_TC0_PRESCALER + 1);
- timer->TC_MCR = 3; /* Interrupt and clear TC on match MR0. */
- timer->TC_TCR = 2; /* Reset counter and prescaler. */
- timer->TC_TCR = 1; /* Timer enabled. */
-
- /*
- * Other subsystems.
- */
- ssp_init();
- InitMMC();
- InitBuzzer();
-
- /*
- * ChibiOS/RT initialization.
- */
- chSysInit();
-}
diff --git a/demos/ARM7-LPC214x-GCC/board.h b/demos/ARM7-LPC214x-GCC/board.h
deleted file mode 100644
index b66ce235d..000000000
--- a/demos/ARM7-LPC214x-GCC/board.h
+++ /dev/null
@@ -1,77 +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/>.
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-#define BOARD_OLIMEX_LCP_P2148
-
-/*
- * The following values are implementation dependent. You may change them in
- * order to match your HW.
- */
-#define FOSC 12000000
-#define CCLK 48000000
-#define PCLK 12000000
-
-/*
- * Pins configuration for Olimex LPC-P2148.
- *
- * PINSEL0
- * P0 P0 P0 P0 P0 P0 RXD TXD SSE MOS MIS SCK SDA SCL RXD TXD
- * 15 14 13 12 11 10 1 1 L0 I0 O0 0 0 0 0 0
- * 00 00 00 00 00 00 01 01 01 01 01 01 01 01 01 01
- * IN IN OUT OUT OUT OUT -- -- -- -- -- -- -- -- -- --
- * 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0
- *
- * PINSEL1
- * P0 AD P0 P0 -- -- AO -- VB P0 P0 P0 MOS MIS SCK P0
- * 31 03 29 28 -- -- UT -- US 22 21 20 I1 O1 1 16
- * 00 01 00 00 00 00 10 00 01 00 00 00 10 10 10 00
- * OUT -- OUT OUT -- -- -- -- -- OUT OUT OUT -- -- -- IN
- * 1 0 1 1 0 0 0 0 0 1 1 1 0 0 0 0
- *
- * PINSEL2
- * -- -- -- -- -- -- -- -- -- -- -- -- -- -- GP DBG --
- * -- -- -- -- -- -- -- -- -- -- -- -- -- -- IO --
- * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0 1 00
- * -- -- -- -- -- -- -- -- -- -- -- -- -- -- IN -- --
- */
-#define VAL_PINSEL0 0x00055555
-#define VAL_PINSEL1 0x100840A8
-#define VAL_PINSEL2 0x00000004
-#define VAL_FIO0DIR 0xB0703C00
-#define VAL_FIO1DIR 0x00000000
-#define VAL_FIO0PIN 0xFFFFFFFF
-#define VAL_FIO1PIN 0xFFFFFFFF
-
-#define PA_LED1 10
-#define PA_LED2 11
-#define PA_BUZZ1 12
-#define PA_BUZZ2 13
-#define PA_BSL 14
-#define PA_BUTTON1 15
-#define PA_BUTTON2 16
-#define PA_SSEL1 20
-#define PA_LEDUSB 31
-
-#define PB_WP1 24
-#define PB_CP1 25
-
-#endif /* _BOARD_H_ */
diff --git a/demos/ARM7-LPC214x-GCC/buzzer.c b/demos/ARM7-LPC214x-GCC/buzzer.c
deleted file mode 100644
index 2e7c0bd98..000000000
--- a/demos/ARM7-LPC214x-GCC/buzzer.c
+++ /dev/null
@@ -1,92 +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/>.
-*/
-
-/*
- * Buzzer driver for Olimex LPC-P2148.
- * Uses the timer 1 for wave generation and a Virtual Timer for the sound
- * duration.
- * The driver also generates an event when the sound is done and the buzzer
- * goes silent.
- */
-
-#include "ch.h"
-#include "hal.h"
-
-#include "buzzer.h"
-
-EventSource BuzzerSilentEventSource;
-
-#define StartCounter(t) ((t)->TC_EMR = 0xF1, (t)->TC_TCR = 1)
-#define StopCounter(t) ((t)->TC_EMR = 0, (t)->TC_TCR = 2)
-
-void InitBuzzer(void) {
-
- chEvtInit(&BuzzerSilentEventSource);
-
- /*
- * Switches P0.12 and P0.13 to MAT1.0 and MAT1.1 functions.
- * Enables Timer1 clock.
- */
- PINSEL0 &= 0xF0FFFFFF;
- PINSEL0 |= 0x0A000000;
- PCONP = (PCONP & PCALL) | PCTIM1;
-
- /*
- * Timer setup.
- */
- TC *tc = T1Base;
- StopCounter(tc);
- tc->TC_CTCR = 0; // Clock source is PCLK.
- tc->TC_PR = 0; // Prescaler disabled.
- tc->TC_MCR = 2; // Clear TC on match MR0.
-}
-
-static void stop(void *p) {
-
- StopCounter((TC *)p);
- chEvtBroadcastI(&BuzzerSilentEventSource);
-}
-
-void PlaySound(int freq, systime_t duration) {
- static VirtualTimer bvt;
- TC *tc = T1Base;
-
- chSysLock();
-
- if (chVTIsArmedI(&bvt)) { // If a sound is already being played
- chVTResetI(&bvt); // then aborts it.
- StopCounter(tc);
- }
-
- tc->TC_MR0 = tc->TC_MR1 = (PCLK / (freq * 2));
- StartCounter(tc);
- chVTSetI(&bvt, duration, stop, tc);
-
- chSysUnlock();
-}
-
-void PlaySoundWait(int freq, systime_t duration) {
- TC *tc = T1Base;
-
- StopCounter(tc);
- tc->TC_MR0 = tc->TC_MR1 = (PCLK / (freq * 2));
- StartCounter(tc);
- chThdSleep(duration);
- StopCounter(tc);
-}
diff --git a/demos/ARM7-LPC214x-GCC/buzzer.h b/demos/ARM7-LPC214x-GCC/buzzer.h
deleted file mode 100644
index 734cb1a44..000000000
--- a/demos/ARM7-LPC214x-GCC/buzzer.h
+++ /dev/null
@@ -1,35 +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/>.
-*/
-
-#ifndef _BUZZER_H_
-#define _BUZZER_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- void InitBuzzer(void);
- void PlaySound(int freq, systime_t duration);
- void PlaySoundWait(int freq, systime_t duration);
-#ifdef __cplusplus
-}
-#endif
-
-extern EventSource BuzzerSilentEventSource;
-
-#endif /* _BUZZER_H_ */
diff --git a/demos/ARM7-LPC214x-GCC/main.c b/demos/ARM7-LPC214x-GCC/main.c
index d0a69b3d7..00aca0ec7 100644
--- a/demos/ARM7-LPC214x-GCC/main.c
+++ b/demos/ARM7-LPC214x-GCC/main.c
@@ -20,10 +20,6 @@
#include "ch.h"
#include "hal.h"
#include "test.h"
-#include "evtimer.h"
-
-#include "mmcsd.h"
-#include "buzzer.h"
#define BOTH_BUTTONS (PAL_PORT_BIT(PA_BUTTON1) | PAL_PORT_BIT(PA_BUTTON2))
@@ -63,73 +59,11 @@ static msg_t Thread2(void *arg) {
return 0;
}
-static WORKING_AREA(waTestThread, 128);
-
-/*
- * Executed as event handler at 500mS intervals.
- */
-static void TimerHandler(eventid_t id) {
-
- (void)id;
- if (!(palReadPort(IOPORT1) & BOTH_BUTTONS)) {
- Thread *tp = chThdCreateStatic(waTestThread, sizeof(waTestThread),
- NORMALPRIO, TestThread, &SD1);
- chThdWait(tp);
- PlaySound(500, MS2ST(100));
- }
- else {
- if (!palReadPad(IOPORT1, PA_BUTTON1))
- PlaySound(1000, MS2ST(100));
- if (!palReadPad(IOPORT1, PA_BUTTON2)) {
- sdWrite(&SD1, (uint8_t *)"Hello World!\r\n", 14);
- PlaySound(2000, MS2ST(100));
- }
- }
-}
-
-/*
- * Plays sounds when a MMC/SD card is inserted, then initializes the MMC
- * driver and reads a sector.
- */
-static void InsertHandler(eventid_t id) {
- static uint8_t rwbuf[512];
- MMCCSD data;
-
- (void)id;
- PlaySoundWait(1000, MS2ST(100));
- PlaySoundWait(2000, MS2ST(100));
- if (mmcInit())
- return;
- /* Card ready, do stuff.*/
- if (mmcGetSize(&data))
- return;
- if (mmcRead(rwbuf, 0))
- return;
- PlaySound(440, MS2ST(200));
-}
-
-/*
- * Plays sounds when a MMC/SD card is removed.
- */
-static void RemoveHandler(eventid_t id) {
-
- (void)id;
- PlaySoundWait(2000, MS2ST(100));
- PlaySoundWait(1000, MS2ST(100));
-}
-
/*
* Entry point, note, the main() function is already a thread in the system
* on entry.
*/
int main(int argc, char **argv) {
- static const evhandler_t evhndl[] = {
- TimerHandler,
- InsertHandler,
- RemoveHandler
- };
- static EvTimer evt;
- struct EventListener el0, el1, el2;
(void)argc;
(void)argv;
@@ -149,16 +83,15 @@ int main(int argc, char **argv) {
}
/*
- * Normal main() activity, in this demo it serves events generated by
- * various sources.
+ * Normal main() thread activity, in this demo it does nothing except
+ * sleeping in a loop and check the buttons state.
*/
- evtInit(&evt, MS2ST(500)); /* Initializes an event timer object. */
- evtStart(&evt); /* Starts the event timer. */
- chEvtRegister(&evt.et_es, &el0, 0); /* Registers on the timer event source. */
- mmcStartPolling(); /* Starts the MMC connector polling. */
- chEvtRegister(&MMCInsertEventSource, &el1, 1);
- chEvtRegister(&MMCRemoveEventSource, &el2, 2);
- while (TRUE) /* Just serve events. */
- chEvtDispatch(evhndl, chEvtWaitOne(ALL_EVENTS));
+ while (TRUE) {
+ if (!palReadPad(IOPORT1, PA_BUTTON1))
+ sdWrite(&SD1, (uint8_t *)"Hello World!\r\n", 14);
+ if (!palReadPad(IOPORT1, PA_BUTTON2))
+ TestThread(&SD1);
+ chThdSleepMilliseconds(500);
+ }
return 0;
}
diff --git a/demos/ARM7-LPC214x-GCC/mmcsd.c b/demos/ARM7-LPC214x-GCC/mmcsd.c
deleted file mode 100644
index 220d9c88a..000000000
--- a/demos/ARM7-LPC214x-GCC/mmcsd.c
+++ /dev/null
@@ -1,388 +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/>.
-*/
-
-#include "ch.h"
-#include "hal.h"
-
-#include "lpc214x_ssp.h"
-#include "mmcsd.h"
-
-EventSource MMCInsertEventSource, MMCRemoveEventSource;
-
-static VirtualTimer vt;
-static int cnt;
-
-/*
- * Subsystem initialization.
- */
-void InitMMC(void) {
-
- chEvtInit(&MMCInsertEventSource);
- chEvtInit(&MMCRemoveEventSource);
- cnt = POLLING_INTERVAL;
-}
-
-void tmrfunc(void *par) {
-
- (void)par;
- if (cnt) {
- if (!palReadPad(IOPORT2, PB_CP1)) {
- if (!--cnt)
- chEvtBroadcastI(&MMCInsertEventSource);
- }
- else
- cnt = POLLING_INTERVAL;
- }
- else {
- if (palReadPad(IOPORT2, PB_CP1)) {
- cnt = POLLING_INTERVAL;
- chEvtBroadcastI(&MMCRemoveEventSource);
- }
- }
- chVTSetI(&vt, 10, tmrfunc, NULL);
-}
-
-/*
- * Starts the card polling service.
- */
-void mmcStartPolling(void) {
-
- chSysLock();
-
- if (!chVTIsArmedI(&vt)) {
- chVTSetI(&vt, 10, tmrfunc, NULL);
- cnt = POLLING_INTERVAL;
- }
-
- chSysUnlock();
-}
-
-/*
- * Stops the card polling service.
- */
-void mmcStopPolling(void) {
-
- chSysLock();
-
- if (chVTIsArmedI(&vt)) {
- chVTResetI(&vt);
- cnt = POLLING_INTERVAL;
- }
-
- chSysUnlock();
-}
-
-/*
- * Returns TRUE if the card is safely inserted in the reader.
- */
-bool_t mmcCardInserted (void) {
-
- return cnt == 0;
-}
-
-static void wait(void) {
- int i;
- uint8_t buf[4];
-
- for (i = 0; i < 16; i++) {
- sspRW(buf, NULL, 1);
- if (buf[0] == 0xFF)
- break;
- }
- /* Looks like it is a loooong wait.*/
- while (TRUE) {
- sspRW(buf, NULL, 1);
- if (buf[0] == 0xFF)
- break;
-#ifdef NICE_WAITING
- chThdSleep(1); /* Trying to be nice with the other threads.*/
-#endif
- }
-}
-
-static void sendhdr(uint8_t cmd, uint32_t arg) {
- uint8_t buf[6];
-
- /*
- * Wait for the bus to become idle if a write operation was in progress.
- */
- wait();
-
- buf[0] = 0x40 | cmd;
- buf[1] = arg >> 24;
- buf[2] = arg >> 16;
- buf[3] = arg >> 8;
- buf[4] = arg;
- buf[5] = 0x95; /* Valid for CMD0 ingnored by other commands. */
- sspRW(NULL, buf, 6);
-}
-
-static uint8_t recvr1(void) {
- int i;
- uint8_t r1[1];
-
- for (i = 0; i < 9; i++) {
- sspRW(r1, NULL, 1);
- if (r1[0] != 0xFF)
- return r1[0];
- }
- return 0xFF; /* Timeout.*/
-}
-
-static bool_t getdata(uint8_t *buf, uint32_t n) {
- int i;
-
- for (i = 0; i < MMC_WAIT_DATA; i++) {
- sspRW(buf, NULL, 1);
- if (buf[0] == 0xFE) {
- sspRW(buf, NULL, n);
- sspRW(NULL, NULL, 2); /* CRC ignored.*/
- return FALSE;
- }
- }
- return TRUE; /* Timeout.*/
-}
-
-/*
- * Initializes a card after the power up by selecting the SPI mode.
- */
-bool_t mmcInit(void) {
-
- /*
- * Starting initialization with slow clock mode.
- */
- ssp_setup(254, CR0_DSS8BIT | CR0_FRFSPI | CR0_CLOCKRATE(0), 0);
-
- /*
- * SPI mode selection.
- */
- sspRW(NULL, NULL, 16); /* 128 clock pulses without ~CS asserted. */
- int i = 0;
- while (TRUE) {
- if (mmcSendCommand(CMDGOIDLE, 0) == 0x01)
- break;
- if (++i >= CMD0_RETRY)
- return TRUE;
- chThdSleep(10);
- }
-
- /*
- * Initialization.
- */
- i = 0;
- while (TRUE) {
- uint8_t b = mmcSendCommand(CMDINIT, 0);
- if (b == 0x00)
- break;
- if (b != 0x01)
- return TRUE;
- if (++i >= CMD1_RETRY)
- return TRUE;
- chThdSleep(10);
- }
-
- /*
- * Full speed.
- */
- ssp_setup(2, CR0_DSS8BIT | CR0_FRFSPI | CR0_CLOCKRATE(0), 0);
- return FALSE;
-}
-
-/*
- * Sends a simple command and returns a R1-type response.
- */
-uint8_t mmcSendCommand(uint8_t cmd, uint32_t arg) {
- uint8_t r1;
-
- sspAcquireBus();
- sendhdr(cmd, arg);
- r1 = recvr1();
- sspReleaseBus();
- return r1;
-}
-
-/*
- * Reads the card info record.
- * @param data the pointer to a \p MMCCSD structure
- * @return \p TRUE if an error happened
- */
-bool_t mmcGetSize(MMCCSD *data) {
- uint8_t buf[16];
-
- sspAcquireBus();
- sendhdr(CMDREADCSD, 0);
- if (recvr1() != 0x00) {
- sspReleaseBus();
- return TRUE;
- }
- if (getdata(buf, 16)) {
- sspReleaseBus();
- return TRUE;
- }
- sspReleaseBus();
-
- /* csize * multiplier */
- data->csize = (((buf[6] & 3) << 10) | (buf[7] << 2) | (buf[8] >> 6)) *
- (1 << (2 + (((buf[9] & 3) << 1) | (buf[10] >> 7))));
- data->rdblklen = 1 << (buf[5] & 15);
- return FALSE;
-}
-
-/*
- * Reads a block.
- * @param blknum the block number
- * @param buf the pointer to the read buffer
- * @return \p TRUE if an error happened
- */
-bool_t mmcRead(uint8_t *buf, uint32_t blknum) {
-
- sspAcquireBus();
- sendhdr(CMDREAD, blknum << 9);
- if (recvr1() != 0x00) {
- sspReleaseBus();
- return TRUE;
- }
- if (getdata(buf, 512)) {
- sspReleaseBus();
- return TRUE;
- }
- sspReleaseBus();
- return FALSE;
-}
-
-/*
- * Reads multiple blocks.
- * @param blknum the initial block
- * @param n the number of blocks
- * @param buf the pointer to the read buffer
- * @return \p TRUE if an error happened
- */
-bool_t mmcReadMultiple(uint8_t *buf, uint32_t blknum, uint32_t n) {
- static const uint8_t stopcmd[] = {0x40 | CMDSTOP, 0, 0, 0, 0, 1, 0xFF};
-
- sspAcquireBus();
- sendhdr(CMDREADMULTIPLE, blknum << 9);
- if (recvr1() != 0x00) {
- sspReleaseBus();
- return TRUE;
- }
- while (n) {
- if (getdata(buf, 512)) {
- sspReleaseBus();
- return TRUE;
- }
- buf += 512;
- n--;
- }
- sspRW(NULL, (uint8_t *)stopcmd, sizeof(stopcmd));
- if (recvr1() != 0x00) {
- sspReleaseBus();
- return TRUE;
- }
- sspReleaseBus();
- return FALSE;
-}
-
-/*
- * Writes a block.
- * @param blknum the block number
- * @param buf the pointer to the write buffer
- * @return \p TRUE if an error happened
- * @note The function DOES NOT wait for the SPI bus to become free after
- * sending the data, the bus check is done before sending commands to
- * the card, this allows to not make useless busy waiting. The invoking
- * thread can do other things while the data is being written.
- */
-bool_t mmcWrite(uint8_t *buf, uint32_t blknum) {
- static const uint8_t start[] = {0xFF, 0xFE};
- uint8_t b[4];
-
- sspAcquireBus();
- sendhdr(CMDWRITE, blknum << 9);
- if (recvr1() != 0x00) {
- sspReleaseBus();
- return TRUE;
- }
- sspRW(NULL, (uint8_t *)start, 2); /* Data prologue.*/
- sspRW(NULL, buf, 512); /* Data.*/
- sspRW(NULL, NULL, 2); /* CRC ignored in this version.*/
- sspRW(b, NULL, 1);
- sspReleaseBus();
- if ((b[0] & 0x1F) != 0x05)
- return TRUE;
- return FALSE;
-}
-
-/*
- * Writes multiple blocks.
- * @param blknum the initial block
- * @param n the number of blocks
- * @param buf the pointer to the write buffer
- * @return \p TRUE if an error happened
- * @note The function DOES NOT wait for the SPI bus to become free after
- * sending the data, the bus check is done before sending commands to
- * the card, this allows to not make useless busy waiting. The invoking
- * thread can do other things while the data is being written.
- */
-bool_t mmcWriteMultiple(uint8_t *buf, uint32_t blknum, uint32_t n) {
- static const uint8_t start[] = {0xFF, 0xFC},
- stop[] = {0xFD, 0xFF};
- uint8_t b[4];
-
- sspAcquireBus();
- sendhdr(CMDWRITEMULTIPLE, blknum << 9);
- if (recvr1() != 0x00) {
- sspReleaseBus();
- return TRUE;
- }
- while (n) {
- sspRW(NULL, (uint8_t *)start, sizeof(start)); /* Data prologue.*/
- sspRW(NULL, buf, 512); /* Data.*/
- sspRW(NULL, NULL, 2); /* CRC ignored in this version.*/
- sspRW(b, NULL, 1);
- if ((b[0] & 0x1F) != 0x05) {
- sspReleaseBus();
- return TRUE;
- }
- wait();
- buf += 512;
- n--;
- }
- sspRW(NULL, (uint8_t *)stop, sizeof(stop)); /* Stops the transfer.*/
- sspReleaseBus();
- return FALSE;
-}
-
-/*
- * Makes sure that pending operations are completed before returning.
- */
-void mmcSynch(void) {
- uint8_t buf[4];
-
- sspAcquireBus();
- while (TRUE) {
- sspRW(buf, NULL, 1);
- if (buf[0] == 0xFF)
- break;
-#ifdef NICE_WAITING
- chThdSleep(1); /* Trying to be nice with the other threads.*/
-#endif
- }
- sspReleaseBus();
-}
diff --git a/demos/ARM7-LPC214x-GCC/mmcsd.h b/demos/ARM7-LPC214x-GCC/mmcsd.h
deleted file mode 100644
index d7ab4b348..000000000
--- a/demos/ARM7-LPC214x-GCC/mmcsd.h
+++ /dev/null
@@ -1,66 +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/>.
-*/
-
-#ifndef _MMCSD_H_
-#define _MMCSD_H_
-
-#define NICE_WAITING
-
-#define CMD0_RETRY 10
-#define CMD1_RETRY 100
-#define POLLING_INTERVAL 10
-#define MMC_WAIT_DATA 10000
-
-#define CMDGOIDLE 0
-#define CMDINIT 1
-#define CMDREADCSD 9
-#define CMDSTOP 12
-#define CMDREAD 17
-#define CMDREADMULTIPLE 18
-#define CMDWRITE 24
-#define CMDWRITEMULTIPLE 25
-
-typedef struct {
- uint32_t csize;
- uint32_t rdblklen;
-} MMCCSD;
-
-extern EventSource MMCInsertEventSource, MMCRemoveEventSource;
-
-#ifdef __cplusplus
-}
-#endif
- void InitMMC(void);
-
- bool_t mmcInit(void);
- void mmcStartPolling(void);
- void mmcStopPolling(void);
- bool_t mmcCardInserted (void);
- uint8_t mmcSendCommand(uint8_t cmd, uint32_t arg);
- bool_t mmcGetSize(MMCCSD *data);
- bool_t mmcRead(uint8_t *buf, uint32_t blknum);
- bool_t mmcReadMultiple(uint8_t *buf, uint32_t blknum, uint32_t n);
- bool_t mmcWrite(uint8_t *buf, uint32_t blknum);
- bool_t mmcWriteMultiple(uint8_t *buf, uint32_t blknum, uint32_t n);
- void mmcSynch(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MMCSD_H_*/
--
cgit v1.2.3