fixed some paths in makefiles

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

13 files changed, 12 insertions, 16 deletions

diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile
index b720144f4..48a66b249 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile
@@ -96,9 +96,6 @@ CSRC = $(PORTSRC) \
        $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/hal/lib/streams/memstreams.c \

-       $(CHIBIOS)/os/hal/lib/streams/chprintf.c \

        main.c

 

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

diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile
index 4f20569a9..d6839bd05 100644
--- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile
@@ -135,7 +135,7 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths

diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile
index 8e87a7212..8653fa10e 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile
@@ -137,7 +137,7 @@ ASMSRC = $(PORTASM)
 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

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

          $(CHIBIOS)/os/various/devices_lib/accel \

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths

diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile
index d8f029d0e..b5baf594a 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile
@@ -141,7 +141,7 @@ ASMSRC = $(PORTASM)
 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
          $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
          $(LWINC) $(FATFSINC) \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various
 
 #
 # Project, sources and paths
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile
index b9f550e11..f7f573db6 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile
@@ -135,8 +135,7 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various/devices_lib/accel \

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths

diff --git a/demos/various/RT-Win32-Simulator/Makefile b/demos/various/RT-Win32-Simulator/Makefile
index 5723fb09f..8c6e0105b 100644
--- a/demos/various/RT-Win32-Simulator/Makefile
+++ b/demos/various/RT-Win32-Simulator/Makefile
@@ -84,7 +84,7 @@ ASRC =
 # List all user directories here

 UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

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

-          $(CHIBIOS)/os/various

+          $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 # List the user directory to look for the libraries here

 ULIBDIR =

diff --git a/os/hal/lib/streams/chprintf.c b/os/hal/lib/streams/chprintf.c
index 336a86e17..5f4ae4f87 100644
--- a/os/hal/lib/streams/chprintf.c
+++ b/os/hal/lib/streams/chprintf.c
@@ -321,7 +321,7 @@ int chsnprintf(char *str, size_t size, const char *fmt, ...) {
   msObjectInit(&ms, (uint8_t *)str, size_wo_nul, 0);

 

   /* Performing the print operation using the common code.*/

-  chp = (BaseSequentialStream *)&ms;

+  chp = (BaseSequentialStream *)(void *)&ms;

   va_start(ap, fmt);

   retval = chvprintf(chp, fmt, ap);

   va_end(ap);

diff --git a/testhal/STM32/STM32F0xx/USB_CDC/Makefile b/testhal/STM32/STM32F0xx/USB_CDC/Makefile
index 0bca6f985..cb542feea 100644
--- a/testhal/STM32/STM32F0xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F0xx/USB_CDC/Makefile
@@ -130,7 +130,7 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F1xx/USB_CDC/Makefile b/testhal/STM32/STM32F1xx/USB_CDC/Makefile
index 2d6594793..06437122b 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F1xx/USB_CDC/Makefile
@@ -135,7 +135,7 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F30x/USB_CDC/Makefile b/testhal/STM32/STM32F30x/USB_CDC/Makefile
index b54a31026..2bf4559d8 100644
--- a/testhal/STM32/STM32F30x/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F30x/USB_CDC/Makefile
@@ -135,7 +135,7 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F37x/USB_CDC/Makefile b/testhal/STM32/STM32F37x/USB_CDC/Makefile
index 53ea39d43..2a42e1f02 100644
--- a/testhal/STM32/STM32F37x/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F37x/USB_CDC/Makefile
@@ -135,7 +135,7 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F4xx/RTC/Makefile b/testhal/STM32/STM32F4xx/RTC/Makefile
index 14b700a8c..9eb7f4c8f 100644
--- a/testhal/STM32/STM32F4xx/RTC/Makefile
+++ b/testhal/STM32/STM32F4xx/RTC/Makefile
@@ -137,7 +137,7 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F4xx/USB_CDC/Makefile b/testhal/STM32/STM32F4xx/USB_CDC/Makefile
index 0db62b01f..b3791977f 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_CDC/Makefile
@@ -135,7 +135,7 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various

+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths