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

5 files changed, 143 insertions, 10 deletions

diff --git a/os/hal/platforms/SPC560Pxx/hal_lld.c b/os/hal/platforms/SPC560Pxx/hal_lld.c
index 505b777de..72e16be4d 100644
--- a/os/hal/platforms/SPC560Pxx/hal_lld.c
+++ b/os/hal/platforms/SPC560Pxx/hal_lld.c
@@ -152,12 +152,12 @@ void spc_clock_init(void) {
 

   /* Enables the XOSC in order to check its functionality before proceeding

      with the initialization.*/

-/*  ME.DRUN.R = SPC5_ME_MC_SYSCLK_IRC | SPC5_ME_MC_IRCON | SPC5_ME_MC_XOSC0ON |           \

-              SPC5_ME_MC_CFLAON_NORMAL | SPC5_ME_MC_CFLAON_NORMAL |

-              SPC5_ME_MC_MVRON;

+  ME.DRUN.R = SPC5_ME_MC_SYSCLK_IRC    | SPC5_ME_MC_IRCON         |         \

+              SPC5_ME_MC_XOSC0ON       | SPC5_ME_MC_CFLAON_NORMAL |         \

+              SPC5_ME_MC_DFLAON_NORMAL | SPC5_ME_MC_MVRON;

   if (halSPCSetRunMode(SPC5_RUNMODE_DRUN) == CH_FAILED) {

     SPC5_CLOCK_FAILURE_HOOK();

-  }*/

+  }

 

   /* Initialization of the FMPLLs settings.*/

   CGM.FMPLL[0].CR.R = SPC5_FMPLL0_ODF |

diff --git a/os/hal/templates/pal_lld.c b/os/hal/templates/pal_lld.c
index b6030b06e..10e2ae482 100644
--- a/os/hal/templates/pal_lld.c
+++ b/os/hal/templates/pal_lld.c
@@ -55,6 +55,35 @@
 /* Driver exported functions.                                                */

 /*===========================================================================*/

 

+/**

+ * @brief   STM32 I/O ports configuration.

+ * @details Ports A-D(E, F, G, H) clocks enabled.

+ *

+ * @param[in] config    the STM32 ports configuration

+ *

+ * @notapi

+ */

+void _pal_lld_init(const PALConfig *config) {

+

+}

+

+/**

+ * @brief   Pads mode setup.

+ * @details This function programs a pads group belonging to the same port

+ *          with the specified mode.

+ *

+ * @param[in] port      the port identifier

+ * @param[in] mask      the group mask

+ * @param[in] mode      the mode

+ *

+ * @notapi

+ */

+void _pal_lld_setgroupmode(ioportid_t port,

+                           ioportmask_t mask,

+                           iomode_t mode) {

+

+}

+

 #endif /* HAL_USE_PAL */

 

 /** @} */

diff --git a/os/hal/templates/pal_lld.h b/os/hal/templates/pal_lld.h
index d6c898e8b..9e109e465 100644
--- a/os/hal/templates/pal_lld.h
+++ b/os/hal/templates/pal_lld.h
@@ -104,7 +104,7 @@ typedef uint32_t ioportid_t;
  *

  * @notapi

  */

-#define pal_lld_init(config)

+#define pal_lld_init(config) _pal_lld_init(config)

 

 /**

  * @brief   Reads the physical I/O port states.

@@ -114,7 +114,7 @@ typedef uint32_t ioportid_t;
  *

  * @notapi

  */

-#define pal_lld_readport(port)

+#define pal_lld_readport(port) 0

 

 /**

  * @brief   Reads the output latch.

@@ -126,7 +126,7 @@ typedef uint32_t ioportid_t;
  *

  * @notapi

  */

-#define pal_lld_readlatch(port)

+#define pal_lld_readlatch(port) 0

 

 /**

  * @brief   Writes a bits mask on a I/O port.

@@ -190,7 +190,7 @@ typedef uint32_t ioportid_t;
  *

  * @notapi

  */

-#define pal_lld_readgroup(port, mask, offset)

+#define pal_lld_readgroup(port, mask, offset) 0

 

 /**

  * @brief   Writes a group of bits.

@@ -206,7 +206,7 @@ typedef uint32_t ioportid_t;
  *

  * @notapi

  */

-#define pal_lld_writegroup(port, mask, offset, bits)

+#define pal_lld_writegroup(port, mask, offset, bits) (void)bits

 

 /**

  * @brief   Pads group mode setup.

@@ -238,7 +238,7 @@ typedef uint32_t ioportid_t;
  *

  * @notapi

  */

-#define pal_lld_readpad(port, pad)

+#define pal_lld_readpad(port, pad) PAL_LOW

 

 /**

  * @brief   Writes a logical state on an output pad.

@@ -312,6 +312,21 @@ typedef uint32_t ioportid_t;
  */

 #define pal_lld_setpadmode(port, pad, mode)

 

+#if !defined(__DOXYGEN__)

+extern const PALConfig pal_default_config;

+#endif

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void _pal_lld_init(const PALConfig *config);

+  void _pal_lld_setgroupmode(ioportid_t port,

+                             ioportmask_t mask,

+                             iomode_t mode);

+#ifdef __cplusplus

+}

+#endif

+

 #endif /* HAL_USE_PAL */

 

 #endif /* _PAL_LLD_H_ */

diff --git a/testhal/testbuild/.cproject b/testhal/testbuild/.cproject
new file mode 100644
index 000000000..1ce473e74
--- /dev/null
+++ b/testhal/testbuild/.cproject
@@ -0,0 +1,51 @@
+<?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.1422654280">

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

+				<externalSettings/>

+				<extensions>

+					<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.1422654280" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

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

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

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

+							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.1132293146" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

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

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

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1203508382" 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.106386392" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1290224010" 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.1153113286" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1073997695" 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="HAL-BUILD_TEST.null.1566225773" name="HAL-BUILD_TEST"/>

+	</storageModule>

+	<storageModule moduleId="scannerConfiguration">

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

+		<scannerConfigBuildInfo instanceId="0.1422654280">

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

+		</scannerConfigBuildInfo>

+	</storageModule>

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

+</cproject>

diff --git a/testhal/testbuild/.project b/testhal/testbuild/.project
new file mode 100644
index 000000000..177c31184
--- /dev/null
+++ b/testhal/testbuild/.project
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>HAL-BUILD_TEST</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

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

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

+			<arguments>

+			</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/boards/ST_STM32F4_DISCOVERY</locationURI>

+		</link>

+		<link>

+			<name>os</name>

+			<type>2</type>

+			<locationURI>CHIBIOS/os</locationURI>

+		</link>

+	</linkedResources>

+</projectDescription>