chprintf and streams are now part of the HAL library.

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

10 files changed, 19 insertions, 58 deletions

diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject b/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject
index a1d0ba157..914646b39 100644
--- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject
+++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?>

-

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

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

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

 		<cconfiguration id="0.114656749">

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

diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/.cproject b/demos/STM32/NIL-STM32F303-DISCOVERY/.cproject
index a32ef55e6..80e5e6c26 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/.cproject
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?>

-

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

+<?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">

@@ -42,6 +40,8 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

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

 	</storageModule>

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

+	<storageModule moduleId="refreshScope"/>

 	<storageModule moduleId="scannerConfiguration">

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

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

@@ -54,16 +54,6 @@
 				<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=""/>

@@ -94,36 +84,6 @@
 				<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">

@@ -208,6 +168,4 @@
 			</profile>

 		</scannerConfigBuildInfo>

 	</storageModule>

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

-	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile
index b0b36edb2..b720144f4 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile
@@ -97,7 +97,8 @@ CSRC = $(PORTSRC) \
        $(PLATFORMSRC) \

        $(BOARDSRC) \

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

-       $(CHIBIOS)/os/various/chprintf.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-MAPLEMINI/Makefile b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile
index 43e141ff8..ffc408a30 100644
--- a/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile
+++ b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile
@@ -109,7 +109,8 @@ CSRC = $(PORTSRC) \
        $(PLATFORMSRC) \

        $(BOARDSRC) \

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

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

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

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

        usbcfg.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 fac6c60c9..4f20569a9 100644
--- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile
@@ -102,7 +102,8 @@ CSRC = $(PORTSRC) \
        $(PLATFORMSRC) \

        $(BOARDSRC) \

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

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

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

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

        usbcfg.c main.c

 

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

diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject b/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject
index 1dd60e086..ad4a2d0ab 100644
--- a/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject
+++ b/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?>

-

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

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

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

 		<cconfiguration id="0.603687198">

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

diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
index 8d16de8c1..9b0322826 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
@@ -104,7 +104,8 @@ CSRC = $(PORTSRC) \
        $(BOARDSRC) \
        $(CHIBIOS)/os/various/devices_lib/accel/lis302dl.c \
        $(CHIBIOS)/os/various/shell.c \
-       $(CHIBIOS)/os/various/chprintf.c \
+       $(CHIBIOS)/os/hal/lib/streams/memstreams.c \
+       $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
        $(CHIBIOS)/os/various/syscalls.c \
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile
index c8fefbd85..8e87a7212 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile
@@ -103,7 +103,8 @@ CSRC = $(PORTSRC) \
        $(BOARDSRC) \

        $(CHIBIOS)/os/various/devices_lib/accel/lis302dl.c \

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

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

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

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

        usbcfg.c main.c

 

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

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 e4cc74c07..d8f029d0e 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile
@@ -106,7 +106,8 @@ CSRC = $(PORTSRC) \
        $(LWSRC) \
        $(FATFSSRC) \
        $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/chprintf.c \
+       $(CHIBIOS)/os/hal/lib/streams/memstreams.c \
+       $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
        $(CHIBIOS)/os/various/shell.c \
        web/web.c main.c
 
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile
index 453a2f150..b9f550e11 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile
@@ -102,7 +102,8 @@ CSRC = $(PORTSRC) \
        $(PLATFORMSRC) \

        $(BOARDSRC) \

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

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

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

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

        usbcfg.c main.c

 

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