From fabf37a5ffd2eedb6d2ed48914399c0986717950 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Wed, 27 Jul 2011 16:54:57 +0000 Subject: [PATCH] Check in the MicroBlaze projects before copying them to create the version that uses the full Ethernet. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1520 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../SDKProjects/RTOSDemoSource/.cproject | 31 +++++++++++++++++-- .../CreateProjectDirectoryStructure.bat | 2 +- .../SDKProjects/RTOSDemoSource/main-full.c | 3 -- .../SDKProjects/RTOSDemoSource/serial.c | 4 +-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject index ac423a0b0..3d78ded57 100644 --- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject +++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject @@ -40,9 +40,14 @@ + diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat index 4153fd50e..6c5b434d2 100644 --- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat +++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat @@ -72,7 +72,7 @@ IF EXIST FreeRTOS_Source Goto END copy ..\..\..\Common\include\QPeek.h Demo_Source\include copy ..\..\..\Common\include\recmutex.h Demo_Source\include copy ..\..\..\Common\include\flop.h Demo_Source\include - copy ..\..\..\Common\include\flash.h Demo_Source\includeREM + copy ..\..\..\Common\include\flash.h Demo_Source\include copy ..\..\..\Common\include\comtest_strings.h Demo_Source\include copy ..\..\..\Common\include\serial.h Demo_Source\include copy ..\..\..\Common\include\comtest.h Demo_Source\include diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c index 059dfdd83..36c415932 100644 --- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c +++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c @@ -522,9 +522,6 @@ static long lCheckTimerStarted = pdFALSE; xTimerStart( xCheckTimer, mainDONT_BLOCK ); lCheckTimerStarted = pdTRUE; } - - extern void vTemp( void ); - vTemp(); } /*-----------------------------------------------------------*/ diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/serial.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/serial.c index 9d673a55e..f32e40a93 100644 --- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/serial.c +++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/serial.c @@ -154,12 +154,12 @@ portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, po } /*-----------------------------------------------------------*/ -void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned portBASE_TYPE uxStringLength ) +void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength ) { ( void ) pxPort; /* Output uxStringLength bytes starting from pcString. */ - XUartLite_Send( &xUartLiteInstance, ( unsigned char * ) pcString, uxStringLength ); + XUartLite_Send( &xUartLiteInstance, ( unsigned char * ) pcString, usStringLength ); } /*-----------------------------------------------------------*/ -- 2.39.5