From 0ea70884315783b984267165b333405217a5f953 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sun, 11 Dec 2011 10:23:01 +0000 Subject: [PATCH] Changes necessary in the Win32/lwiP project to use the updated command console files. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1654 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/WIN32-MSVC-lwIP/WIN32.suo | Bin 104960 -> 104960 bytes Demo/WIN32-MSVC-lwIP/main.c | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Demo/WIN32-MSVC-lwIP/WIN32.suo b/Demo/WIN32-MSVC-lwIP/WIN32.suo index e782e64f7e23d3f3fb542df6b54006b8af4dbe14..05a748979c55d34f38b6b0af75ad1809893b1aa9 100644 GIT binary patch delta 3539 zcmb7Hc~p~E7XR)?2#Ya<5D@}m43Sc+G%U5Qk*%#LNQztCYGU0$MbrpN5hDjFRn(A+ zdD;P`h>ThXfl!!s&~cfu)w-akLp$Peuwz?KYb|xqQ#}ZCUx3m1qjS!@@J{l!`|k3) zzx%K@O0A93x;r8)!f(Y_Aqj`My$mm7irX8o9QV3?CGYS(8qx6aC2$i2!P?-=l}JU& zhoT@j3#Ar!&qqMh)DXO4oG~(m==lREbiX4_42R& zNn+XD8!?lQyW?$x3YP?}fr+JW`Z@m@G*;pp7Z-;29h*vnw%^Fv7M$i_oGigaYSd?Q|*rMWT0FUbMPFyz}Ac94|>vZ*MPVjjfZM<=)Y~s*^}O z`%XD66K8o!{QC!832jpDOcs{_(N)ujxTOnOY|v&1!p2?6Xw8(N%pOh~7T|}bb`;AC ztCmQx;MzErmjY_kuaKhlMi`4Ngt1uZFJnjM!dp0Lc?j6>%*AbZKSKq_5Q?MOdI?1M z3IY!h*Pee5Rb7x%H5T;@h(F9NbKmTVV5Ex z7~i%?eeMbg!USQV@EY|*VVSdc6-Y4ZY73Us1!LAaDOQ`#v(_w-k?LlIvRBZyKfu00 z%XC{wfVKuqw|++7pHsg;TmE6sO~7-KNT(&Y)y;DpNssTl!D-1a@qj~Ezwu2pmS>{=u^KBK z3N-G`WjZ+-s4063JN7HEy;+6+BStxjAR7;qsj!O`QGB3yI`=JhG6|VE1C6Uf?0Mvx zEfDN9>^SR=3iEu-W*WGK^*5!kq^_cwVUQ! z)EIO0JoQOcABfmtGO`jS#9+ix9@7>Kz8H)RPY$4Uf|gb9CsR+wj&)iNlmNz?!_jzB zfu}FlK*2K*-Oo^fU%#i4tE!}U_EIvmxD1nB3I<2NVaZGr0N!Xbsh|tb{4^Vvv^t!Q zV;R2ex|uL(EmA`z!h`L7xHr5n6-N=x%;u?~!l&=8Bc-%er({g~BGmX~3LAt7;T`Q;P*0W~(tXRfURDDa_~5VCC~c0UC^Z|Ie6Jq(Fr&1npOBC|^cGcG+wzX+VPXo4IndZ(Vl;ZFkw_!KdJJ#CgXq=jx9fPrzuvCC?KWu?o z7P$xZl7VWB{XybP`!Q35TDdAQWr^{IPbDjM` z9pqtY`)r=Gtb8!|(^doR&U3*hy+ld7U%|LXJMnI(3hn>8fprhQ5!C{o`6PgrqREDB zaEiyC!9hwPR+ofRk8NBUJ;Wlj3`llEI51(-OgH>`c z{E?1V5Vp@Bp7?&fI4pWg_n1P>yxs5HlB7@MR8m;eP)NqI%5VzNQ0pZg~dV+ag0USOx7>!=bNDat_crh?uDe8 zs~B@a+EsNac0S+LsV5+S0)%eKcZRZz{*-E zftmP=J(yYTq*!nXM1aV4ZiEPC&4SaSev6|FKK75M{R8cpdaUwYQ1df^^JWU;maES8 zoDE5?u2@>jLVh0qe>@XOa=Ng>g=h7UkG`sI+Hz~-Dp+|rt^1_N!+(4|%n~UX*oZPP zJogA_Y{(_2%wY9;$YJ_yc%4_MGbQ2V82*eo*2lcoB7gS^8t$VaHiWpT|gx;x1V}r**qigy!suTDDE%O2GoZIplP-gGB|%N zzy*Pvh(p+-?XZ#egcsAP1C` z08|B9G?K&L$$9yrDEaBUU+t8{vtruj1)OaNvo0goWAM{}!k!s@fF zzK!uhrEc1=>omnP3KunpqQ+BcA1u-FDc<;Y67^i0n=~UjYD~(^ISFVqtAFEFsBbER T&)p?5I!E!ARg;J-{WAUy0A1s+ delta 3764 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 BTzLQh diff --git a/Demo/WIN32-MSVC-lwIP/main.c b/Demo/WIN32-MSVC-lwIP/main.c index 76e8b285a..82239b677 100644 --- a/Demo/WIN32-MSVC-lwIP/main.c +++ b/Demo/WIN32-MSVC-lwIP/main.c @@ -125,8 +125,8 @@ extern void lwIPAppsInit( void *pvArguments ); xRunTimeStats command definitions respectively. These functions are not necessarily reentrant! They must be used from one task only - or at least by only one task at a time. */ -static portBASE_TYPE prvTaskStatsCommand( signed char *pcWriteBuffer, size_t xWriteBufferLen ); -static portBASE_TYPE prvRunTimeStatsCommand( signed char *pcWriteBuffer, size_t xWriteBufferLen ); +static portBASE_TYPE prvTaskStatsCommand( signed char *pcWriteBuffer, size_t xWriteBufferLen, const signed char * pcCommandString ); +static portBASE_TYPE prvRunTimeStatsCommand( signed char *pcWriteBuffer, size_t xWriteBufferLen, const signed char * pcCommandString ); /* The string that latches the current demo status. */ static char *pcStatusMessage = "All tasks running without error"; @@ -145,6 +145,7 @@ static const xCommandLineInput xRunTimeStats = "run-time-stats", "run-time-stats: Displays a table showing how much processing time each FreeRTOS task has used\r\n", prvRunTimeStatsCommand, + 0 }; /* Structure that defines the "task-stats" command line command. */ @@ -153,6 +154,7 @@ static const xCommandLineInput xTaskStats = "task-stats", "task-stats: Displays a table showing the state of each FreeRTOS task\r\n", prvTaskStatsCommand, + 0 }; /*-----------------------------------------------------------*/ @@ -316,14 +318,16 @@ unsigned long ulReturn; } /*-----------------------------------------------------------*/ -static portBASE_TYPE prvTaskStatsCommand( signed char *pcWriteBuffer, size_t xWriteBufferLen ) +static portBASE_TYPE prvTaskStatsCommand( signed char *pcWriteBuffer, size_t xWriteBufferLen, const signed char * pcCommandString ) { const char *const pcHeader = "Task State Priority Stack #\r\n************************************************\r\n"; configASSERT( pcWriteBuffer ); - /* This function assumes the buffer length is adequate. */ + /* This function assumes the buffer length is adequate and does not look + for parameters. */ ( void ) xWriteBufferLen; + ( void ) pcCommandString; /* Generate a table of task stats. */ strcpy( pcWriteBuffer, pcHeader ); @@ -335,14 +339,16 @@ const char *const pcHeader = "Task State Priority Stack #\r\n******** } /*-----------------------------------------------------------*/ -static portBASE_TYPE prvRunTimeStatsCommand( signed char *pcWriteBuffer, size_t xWriteBufferLen ) +static portBASE_TYPE prvRunTimeStatsCommand( signed char *pcWriteBuffer, size_t xWriteBufferLen, const signed char * pcCommandString ) { const char * const pcHeader = "Task Abs Time % Time\r\n****************************************\r\n"; configASSERT( pcWriteBuffer ); - /* This function assumes the buffer length is adequate. */ + /* This function assumes the buffer length is adequate and does not look + for parameters. */ ( void ) xWriteBufferLen; + ( void ) pcCommandString; /* Generate a table of task stats. */ strcpy( pcWriteBuffer, pcHeader ); -- 2.39.5