Improvements to simulator IRQ detection.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11792 110e8d01-0319-4d1e-a829-52ad28d1bb01

2 files changed, 57 insertions, 41 deletions

diff --git a/demos/various/RT-Posix-Simulator/Makefile b/demos/various/RT-Posix-Simulator/Makefile
index bf2de06aa..58a7d2416 100755
--- a/demos/various/RT-Posix-Simulator/Makefile
+++ b/demos/various/RT-Posix-Simulator/Makefile
@@ -28,7 +28,7 @@ ifeq ($(USE_LDOPT),)
   USE_LDOPT = 

 endif

 

-# Enable this if you want link time optimizations (LTO)

+# Enable this if you want link time optimizations (LTO).

 ifeq ($(USE_LTO),)

   USE_LTO = no

 endif

@@ -65,6 +65,12 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

+CONFDIR  := ./cfg

+BUILDDIR := ./build

+DEPDIR   := ./.dep

+

+# Licensing files.

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

 # Startup files.

 # HAL-OSAL files (optional).

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

@@ -82,39 +88,50 @@ include $(CHIBIOS)/os/hal/lib/streams/streams.mk
 include $(CHIBIOS)/os/various/shell/shell.mk

 

 # C sources here.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

-       $(STREAMSSRC) \

-       $(SHELLSRC) \

        main.c

 

 # C++ sources here.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

-# List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+# List ASM source files here.

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(STREAMSINC) $(SHELLINC)

+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

 ##############################################################################

 

 ##############################################################################

+# Start of user section

+#

+

+# List all user C define here, like -D_DEBUG=1

+UDEFS = -DSIMULATOR

+

+# 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

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

+

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

 # Compiler settings

 #

 

-#TRGT = powerpc-eabi-

 TRGT = 

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

@@ -128,6 +145,7 @@ AS   = $(TRGT)gcc -x assembler-with-cpp
 AR   = $(TRGT)ar

 OD   = $(TRGT)objdump

 SZ   = $(TRGT)size

+HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 COV  = gcov

 

@@ -141,27 +159,5 @@ CPPWARN = -Wall -Wextra -Wundef
 # Compiler settings

 ##############################################################################

 

-###################cd ..###########################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS = -DSIMULATOR

-

-# 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

-##############################################################################

-

 RULESPATH = $(CHIBIOS)/os/common/startup/SIMIA32/compilers/GCC

 include $(RULESPATH)/rules.mk

diff --git a/demos/various/RT-Posix-Simulator/mcuconf.h b/demos/various/RT-Posix-Simulator/mcuconf.h
new file mode 100644
index 000000000..7bb95bca8
--- /dev/null
+++ b/demos/various/RT-Posix-Simulator/mcuconf.h
@@ -0,0 +1,20 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+#endif /* MCUCONF_H */