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

6 files changed, 694 insertions, 3 deletions

diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/.cproject b/demos/nil/NIL-STM32F051-DISCOVERY/.cproject
new file mode 100644
index 000000000..03d7ff75e
--- /dev/null
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/.cproject
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?fileVersion 4.0.0?>

+

+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

+	<storageModule moduleId="org.eclipse.cdt.core.settings">

+		<cconfiguration id="0.87736009">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.87736009" moduleId="org.eclipse.cdt.core.settings" name="Default">

+				<externalSettings/>

+				<extensions>

+					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>

+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+				</extensions>

+			</storageModule>

+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.87736009" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.87736009." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1294118206" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.1294118206.805393367" name=""/>

+							<builder command="mingw32-make" id="org.eclipse.cdt.build.core.settings.default.builder.744360857" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.686764108" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1629275092" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.760786311" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1369722403" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1713969351" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.883301168" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1732469280" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+						</toolChain>

+					</folderInfo>

+				</configuration>

+			</storageModule>

+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

+		</cconfiguration>

+	</storageModule>

+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

+		<project id="Nil.null.181931990" name="Nil"/>

+	</storageModule>

+	<storageModule moduleId="scannerConfiguration">

+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

+		<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">

+			<buildOutputProvider>

+				<openAction enabled="true" filePath=""/>

+				<parser enabled="true"/>

+			</buildOutputProvider>

+			<scannerInfoProvider id="specsFile">

+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

+				<parser enabled="true"/>

+			</scannerInfoProvider>

+		</profile>

+		<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">

+			<buildOutputProvider>

+				<openAction enabled="true" filePath=""/>

+				<parser enabled="true"/>

+			</buildOutputProvider>

+			<scannerInfoProvider id="makefileGenerator">

+				<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>

+				<parser enabled="true"/>

+			</scannerInfoProvider>

+		</profile>

+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">

+			<buildOutputProvider>

+				<openAction enabled="true" filePath=""/>

+				<parser enabled="true"/>

+			</buildOutputProvider>

+			<scannerInfoProvider id="specsFile">

+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

+				<parser enabled="true"/>

+			</scannerInfoProvider>

+		</profile>

+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">

+			<buildOutputProvider>

+				<openAction enabled="true" filePath=""/>

+				<parser enabled="true"/>

+			</buildOutputProvider>

+			<scannerInfoProvider id="specsFile">

+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>

+				<parser enabled="true"/>

+			</scannerInfoProvider>

+		</profile>

+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">

+			<buildOutputProvider>

+				<openAction enabled="true" filePath=""/>

+				<parser enabled="true"/>

+			</buildOutputProvider>

+			<scannerInfoProvider id="specsFile">

+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>

+				<parser enabled="true"/>

+			</scannerInfoProvider>

+		</profile>

+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">

+			<buildOutputProvider>

+				<openAction enabled="true" filePath=""/>

+				<parser enabled="true"/>

+			</buildOutputProvider>

+			<scannerInfoProvider id="specsFile">

+				<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>

+				<parser enabled="true"/>

+			</scannerInfoProvider>

+		</profile>

+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">

+			<buildOutputProvider>

+				<openAction enabled="true" filePath=""/>

+				<parser enabled="true"/>

+			</buildOutputProvider>

+			<scannerInfoProvider id="specsFile">

+				<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>

+				<parser enabled="true"/>

+			</scannerInfoProvider>

+		</profile>

+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">

+			<buildOutputProvider>

+				<openAction enabled="true" filePath=""/>

+				<parser enabled="true"/>

+			</buildOutputProvider>

+			<scannerInfoProvider id="specsFile">

+				<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>

+				<parser enabled="true"/>

+			</scannerInfoProvider>

+		</profile>

+		<scannerConfigBuildInfo instanceId="0.87736009">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

+			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">

+				<buildOutputProvider>

+					<openAction enabled="true" filePath=""/>

+					<parser enabled="true"/>

+				</buildOutputProvider>

+				<scannerInfoProvider id="specsFile">

+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

+					<parser enabled="true"/>

+				</scannerInfoProvider>

+			</profile>

+			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">

+				<buildOutputProvider>

+					<openAction enabled="true" filePath=""/>

+					<parser enabled="true"/>

+				</buildOutputProvider>

+				<scannerInfoProvider id="makefileGenerator">

+					<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>

+					<parser enabled="true"/>

+				</scannerInfoProvider>

+			</profile>

+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">

+				<buildOutputProvider>

+					<openAction enabled="true" filePath=""/>

+					<parser enabled="true"/>

+				</buildOutputProvider>

+				<scannerInfoProvider id="specsFile">

+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

+					<parser enabled="true"/>

+				</scannerInfoProvider>

+			</profile>

+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">

+				<buildOutputProvider>

+					<openAction enabled="true" filePath=""/>

+					<parser enabled="true"/>

+				</buildOutputProvider>

+				<scannerInfoProvider id="specsFile">

+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>

+					<parser enabled="true"/>

+				</scannerInfoProvider>

+			</profile>

+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">

+				<buildOutputProvider>

+					<openAction enabled="true" filePath=""/>

+					<parser enabled="true"/>

+				</buildOutputProvider>

+				<scannerInfoProvider id="specsFile">

+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>

+					<parser enabled="true"/>

+				</scannerInfoProvider>

+			</profile>

+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">

+				<buildOutputProvider>

+					<openAction enabled="true" filePath=""/>

+					<parser enabled="true"/>

+				</buildOutputProvider>

+				<scannerInfoProvider id="specsFile">

+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

+					<parser enabled="true"/>

+				</scannerInfoProvider>

+			</profile>

+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">

+				<buildOutputProvider>

+					<openAction enabled="true" filePath=""/>

+					<parser enabled="true"/>

+				</buildOutputProvider>

+				<scannerInfoProvider id="specsFile">

+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>

+					<parser enabled="true"/>

+				</scannerInfoProvider>

+			</profile>

+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">

+				<buildOutputProvider>

+					<openAction enabled="true" filePath=""/>

+					<parser enabled="true"/>

+				</buildOutputProvider>

+				<scannerInfoProvider id="specsFile">

+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>

+					<parser enabled="true"/>

+				</scannerInfoProvider>

+			</profile>

+		</scannerConfigBuildInfo>

+	</storageModule>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+</cproject>

diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/.project b/demos/nil/NIL-STM32F051-DISCOVERY/.project
new file mode 100644
index 000000000..041565660
--- /dev/null
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/.project
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>NIL-STM32F051-DISCOVERY</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

+			<triggers>clean,full,incremental,</triggers>

+			<arguments>

+				<dictionary>

+					<key>?name?</key>

+					<value></value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.append_environment</key>

+					<value>true</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>

+					<value>all</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.buildArguments</key>

+					<value></value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.buildCommand</key>

+					<value>mingw32-make</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>

+					<value>clean</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.contents</key>

+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>

+					<value>false</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>

+					<value>true</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>

+					<value>true</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>

+					<value>all</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.stopOnError</key>

+					<value>true</value>

+				</dictionary>

+				<dictionary>

+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>

+					<value>false</value>

+				</dictionary>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

+			<triggers>full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.cdt.core.cnature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

+	</natures>

+	<linkedResources>

+		<link>

+			<name>board</name>

+			<type>2</type>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F0_DISCOVERY</locationURI>

+		</link>

+		<link>

+			<name>os</name>

+			<type>2</type>

+			<locationURI>CHIBIOS/os</locationURI>

+		</link>

+	</linkedResources>

+</projectDescription>

diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
new file mode 100644
index 000000000..47e3d2f8c
--- /dev/null
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
@@ -0,0 +1,209 @@
+##############################################################################

+# Build global options

+# NOTE: Can be overridden externally.

+#

+

+# Compiler options here.

+ifeq ($(USE_OPT),)

+  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

+endif

+

+# C specific options here (added to USE_OPT).

+ifeq ($(USE_COPT),)

+  USE_COPT = 

+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 = yes

+endif

+

+# Enable this if you want to see the full log while compiling.

+ifeq ($(USE_VERBOSE_COMPILE),)

+  USE_VERBOSE_COMPILE = no

+endif

+

+#

+# Build global options

+##############################################################################

+

+##############################################################################

+# Architecture or project specific options

+#

+

+# Enable this if you really want to use the STM FWLib.

+ifeq ($(USE_FWLIB),)

+  USE_FWLIB = no

+endif

+

+#

+# Architecture or project specific options

+##############################################################################

+

+##############################################################################

+# Project, sources and paths

+#

+

+# Define project name here

+PROJECT = ch

+

+# Imported source files and paths

+CHIBIOS = ../../..

+#include $(CHIBIOS)/os/hal/hal.mk

+#include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

+#include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/nil/nil.mk

+#include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

+#include $(CHIBIOS)/test/test.mk

+

+# Define linker script file here

+LDSCRIPT= $(PORTLD)/STM32F051x8.ld

+

+# C sources that can be compiled in ARM or THUMB mode depending on the global

+# setting.

+CSRC = $(PORTSRC) \

+       $(KERNSRC) \

+       $(TESTSRC) \

+       $(HALSRC) \

+       $(OSALSRC) \

+       $(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)

+

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(CHIBIOS)/os/various

+

+#

+# Project, sources and paths

+##############################################################################

+

+##############################################################################

+# Compiler settings

+#

+

+MCU  = cortex-m0

+

+#TRGT = arm-elf-

+TRGT = arm-none-eabi-

+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

+##############################################################################

+

+ifeq ($(USE_FWLIB),yes)

+  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

+  CSRC += $(STM32SRC)

+  INCDIR += $(STM32INC)

+  USE_OPT += -DUSE_STDPERIPH_DRIVER

+endif

+

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/main.c b/demos/nil/NIL-STM32F051-DISCOVERY/main.c
new file mode 100644
index 000000000..5fcf9da8c
--- /dev/null
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/main.c
@@ -0,0 +1,81 @@
+/*

+    Nil RTOS - Copyright (C) 2012 Giovanni Di Sirio.

+

+    This file is part of Nil RTOS.

+

+    Nil RTOS 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.

+

+    Nil RTOS 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 "nil.h"

+#include "hwinit.h"

+

+/*

+ * Thread 1.

+ */

+NIL_WORKING_AREA(waThread1, 128);

+NIL_THREAD(Thread1, arg) {

+

+  (void)arg;

+

+  while (true) {

+    gpioSetPad(GPIOC, GPIOC_LED4);

+    nilThdSleepMilliseconds(500);

+    gpioClearPad(GPIOC, GPIOC_LED4);

+    nilThdSleepMilliseconds(500);

+  }

+}

+

+/*

+ * Thread 2.

+ */

+NIL_WORKING_AREA(waThread2, 128);

+NIL_THREAD(Thread2, arg) {

+

+  (void)arg;

+

+  while (true) {

+    gpioSetPad(GPIOC, GPIOC_LED3);

+    nilThdSleepMilliseconds(250);

+    gpioClearPad(GPIOC, GPIOC_LED3);

+    nilThdSleepMilliseconds(250);

+  }

+}

+

+/*

+ * Threads static table, one entry per thread. The number of entries must

+ * match NIL_CFG_NUM_THREADS.

+ */

+NIL_THREADS_TABLE_BEGIN()

+  NIL_THREADS_TABLE_ENTRY("thread1", Thread1, NULL, waThread1, sizeof(waThread1))

+  NIL_THREADS_TABLE_ENTRY("thread2", Thread2, NULL, waThread2, sizeof(waThread2))

+NIL_THREADS_TABLE_END()

+

+/*

+ * Application entry point.

+ */

+int main(void) {

+

+  /*

+   * System initializations:

+   * - HW specific initialization.

+   * - Nil RTOS initialization.

+   */

+  hwInit();

+  nilSysInit();

+

+  /* This is now the idle thread loop, you may perform here a low priority

+     task but you must never try to sleep or wait in this loop.*/

+  while (true) {

+  }

+}

diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h b/demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h
new file mode 100644
index 000000000..d6d73fad8
--- /dev/null
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h
@@ -0,0 +1,99 @@
+/*

+    Nil RTOS - Copyright (C) 2012 Giovanni Di Sirio.

+

+    This file is part of Nil RTOS.

+

+    Nil RTOS 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.

+

+    Nil RTOS 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    nilconf.h

+ * @brief   Configuration file template.

+ * @details A copy of this file must be placed in each project directory, it

+ *          contains the application specific kernel settings.

+ *

+ * @addtogroup config

+ * @details Kernel related settings and hooks.

+ * @{

+ */

+

+#ifndef _NILCONF_H_

+#define _NILCONF_H_

+

+/**

+ * @brief   Number of user threads in the application.

+ * @note    This number is not inclusive of the idle thread which is

+ *          Implicitly handled.

+ */

+#define NIL_CFG_NUM_THREADS                 2

+

+/**

+ * @brief   System tick frequency.

+ */

+#define NIL_CFG_FREQUENCY                   50000

+

+/**

+ * @brief   Time delta constant for the tick-less mode.

+ * @note    If this value is zero then the system uses the classic

+ *          periodic tick. This value represents the minimum number

+ *          of ticks that is safe to specify in a timeout directive.

+ *          The value one is not valid, timeouts are rounded up to

+ *          this value.

+ */

+#define NIL_CFG_TIMEDELTA                   2

+

+/**

+ * @brief   System assertions.

+ */

+#define NIL_CFG_ENABLE_ASSERTS              FALSE

+

+/**

+ * @brief   Threads descriptor structure extension.

+ * @details User fields added to the end of the @p thread_t structure.

+ */

+#define NIL_CFG_THREAD_EXT_FIELDS                                           \

+  /* Add threads custom fields here.*/

+

+/**

+ * @brief   Threads initialization hook.

+ */

+#define NIL_CFG_THREAD_EXT_INIT_HOOK(tr) {                                  \

+  /* Add custom threads initialization code here.*/                         \

+}

+

+/**

+ * @brief   Idle thread enter hook.

+ * @note    This hook is invoked within a critical zone, no OS functions

+ *          should be invoked from here.

+ * @note    This macro can be used to activate a power saving mode.

+ */

+#define NIL_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @brief   Idle thread leave hook.

+ * @note    This hook is invoked within a critical zone, no OS functions

+ *          should be invoked from here.

+ * @note    This macro can be used to deactivate a power saving mode.

+ */

+#define NIL_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

+

+/*===========================================================================*/

+/* Port-specific settings (override port settings defaulted in nilcore.h).   */

+/*===========================================================================*/

+

+#endif  /* _NILCONF_H_ */

+

+/** @} */

diff --git a/os/nil/nil.mk b/os/nil/nil.mk
index 9e46f1c02..51f0e8083 100644
--- a/os/nil/nil.mk
+++ b/os/nil/nil.mk
@@ -1,5 +1,5 @@
-# List of all the Nil RTOS kernel files.

-KERNSRC = ${NILRTOS}/os/kernel/nil.c

+# List of all the ChibiOS/NIL kernel files.

+KERNSRC = ${CHIBIOS}/os/nil/src/nil.c

 

 # Required include directories

-KERNINC = ${NILRTOS}/os/kernel

+KERNINC = ${CHIBIOS}/os/nil/include