]> rtime.felk.cvut.cz Git - rpp-test-sw.git/commitdiff
Merge branch 'eth'
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 10 Sep 2013 15:48:05 +0000 (17:48 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 10 Sep 2013 15:48:05 +0000 (17:48 +0200)
Conflicts:
rpp-lib

1  2 
.cproject
cmdproc/src/cmdproc_freertos_tms570.c
commands/cmd.c
rpp-lib

diff --cc .cproject
index 041c8618c5085ae11769e0ece2880962097da24e,7b1dc7841a39be07501725133492a3b2e9f386c5..40e9c32251129f672f1d579eb57c1276ace868bf
+++ b/.cproject
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
 -                              <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1456715682" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="Get version from git" prebuildStep="echo &quot;#define GIT_VERSION \&quot;$(shell git describe --always)\&quot;&quot; &gt; version.h">
 +                              <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1456715682" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="Get version from git" prebuildStep="$(MAKE) -f ../Makefile.version version.h">
                                        <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1456715682." name="/" resourcePath="">
-                                               <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.DebugToolchain.2124995458" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.linkerDebug.972405208">
-                                                       <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.546456820" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+                                               <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_5.0.exe.DebugToolchain.1749595625" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.0.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_5.0.exe.linkerDebug.1175282572">
+                                                       <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.250889567" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
                                                                <listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex R.TMS570LS3137"/>
                                                                <listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=be32"/>
                                                                <listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
index d81438759a7416e0becefff7f75ddac304a42b56,c2453a146f5158491ee53278523daa1d493b7d1f..ff3699a8991e47bd9692405e6d1480e1f7b1ead2
@@@ -61,8 -72,10 +62,9 @@@ void initCmdProc(unsigned portBASE_TYP
   * @param pvParameters Not used, task receives no parameters
   */
  void processCmd(void *pvParameters ) {
+       rpp_eth_init_postInit(0, NULL); /* post OS startup init of eth (LwIP) for application usage -- waits for a while, for auto-negotiation of ethernet speed and DHCP if used */
        for (;;) {
 +              rpp_sci_printf("--> ");
                cmd_processor_run(&cmd_io_std_line, cmd_list_main);
 -              if (prompt != NULL)
 -                      rpp_sci_printf("%s", prompt);
        }
  }
diff --cc commands/cmd.c
Simple merge
diff --cc rpp-lib
index 04ff82f4ee453572e4128cf949d7db9443b29ef0,a4d0cb921de99b9a39c4a96b570c5ec184e9c3e0..8104e5e3986083ee2e2743f5e87fc38d32e2efd6
+++ b/rpp-lib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 04ff82f4ee453572e4128cf949d7db9443b29ef0
 -Subproject commit a4d0cb921de99b9a39c4a96b570c5ec184e9c3e0
++Subproject commit 8104e5e3986083ee2e2743f5e87fc38d32e2efd6