X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Demo%2FWizNET_DEMO_GCC_ARM7%2Fmain.c;h=812e8f95980dbdb0770ba4ac30079edae9689713;hb=2dcf856f46260926cb5df11ab7c9c9c326536005;hp=57f444647989cb790bb18983bfd284de7e8e2128;hpb=f65dcf1286f623b98e34761c07498b3033b112b8;p=freertos diff --git a/Demo/WizNET_DEMO_GCC_ARM7/main.c b/Demo/WizNET_DEMO_GCC_ARM7/main.c index 57f444647..812e8f959 100644 --- a/Demo/WizNET_DEMO_GCC_ARM7/main.c +++ b/Demo/WizNET_DEMO_GCC_ARM7/main.c @@ -1,50 +1,54 @@ /* - FreeRTOS.org V4.8.0 - Copyright (C) 2003-2008 Richard Barry. - - This file is part of the FreeRTOS.org distribution. - - FreeRTOS.org is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd. + - FreeRTOS.org is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + *************************************************************************** + * * + * FreeRTOS tutorial books are available in pdf and paperback. * + * Complete, revised, and edited pdf reference manuals are also * + * available. * + * * + * Purchasing FreeRTOS documentation will not only help you, by * + * ensuring you get running as quickly as possible and with an * + * in-depth knowledge of how to use FreeRTOS, it will also help * + * the FreeRTOS project to continue with its mission of providing * + * professional grade, cross platform, de facto standard solutions * + * for microcontrollers - completely free of charge! * + * * + * >>> See http://www.FreeRTOS.org/Documentation for details. <<< * + * * + * Thank you for using FreeRTOS, and thank you for your support! * + * * + *************************************************************************** - You should have received a copy of the GNU General Public License - along with FreeRTOS.org; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - A special exception to the GPL can be applied should you wish to distribute - a combined work that includes FreeRTOS.org, without being obliged to provide - the source code for any proprietary components. See the licensing section - of http://www.FreeRTOS.org for full details of how and when the exception - can be applied. + This file is part of the FreeRTOS distribution. - *************************************************************************** - *************************************************************************** - * * - * SAVE TIME AND MONEY! We can port FreeRTOS.org to your own hardware, * - * and even write all or part of your application on your behalf. * - * See http://www.OpenRTOS.com for details of the services we provide to * - * expedite your project. * - * * - *************************************************************************** - *************************************************************************** + FreeRTOS is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License (version 2) as published by the + Free Software Foundation AND MODIFIED BY the FreeRTOS exception. + >>>NOTE<<< The modification to the GPL is included to allow you to + distribute a combined work that includes FreeRTOS without being obliged to + provide the source code for proprietary components outside of the FreeRTOS + kernel. FreeRTOS is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. You should have received a copy of the GNU General Public + License and the FreeRTOS license exception along with FreeRTOS; if not it + can be viewed here: http://www.freertos.org/a00114.html and also obtained + by writing to Richard Barry, contact details for whom are available on the + FreeRTOS WEB site. - Please ensure to read the configuration and relevant port sections of the - online documentation. + 1 tab == 4 spaces! - http://www.FreeRTOS.org - Documentation, latest information, license and - contact details. + http://www.FreeRTOS.org - Documentation, latest information, license and + contact details. - http://www.SafeRTOS.com - A version that is certified for use in safety - critical systems. + http://www.SafeRTOS.com - A version that is certified for use in safety + critical systems. - http://www.OpenRTOS.com - Commercial support, development, porting, - licensing and training services. + http://www.OpenRTOS.com - Commercial support, development, porting, + licensing and training services. */ /* @@ -92,25 +96,25 @@ /*-----------------------------------------------------------*/ /* Constants to setup the PLL. */ -#define mainPLL_MUL_4 ( ( unsigned portCHAR ) 0x0003 ) -#define mainPLL_DIV_1 ( ( unsigned portCHAR ) 0x0000 ) -#define mainPLL_ENABLE ( ( unsigned portCHAR ) 0x0001 ) -#define mainPLL_CONNECT ( ( unsigned portCHAR ) 0x0003 ) -#define mainPLL_FEED_BYTE1 ( ( unsigned portCHAR ) 0xaa ) -#define mainPLL_FEED_BYTE2 ( ( unsigned portCHAR ) 0x55 ) -#define mainPLL_LOCK ( ( unsigned portLONG ) 0x0400 ) +#define mainPLL_MUL_4 ( ( unsigned char ) 0x0003 ) +#define mainPLL_DIV_1 ( ( unsigned char ) 0x0000 ) +#define mainPLL_ENABLE ( ( unsigned char ) 0x0001 ) +#define mainPLL_CONNECT ( ( unsigned char ) 0x0003 ) +#define mainPLL_FEED_BYTE1 ( ( unsigned char ) 0xaa ) +#define mainPLL_FEED_BYTE2 ( ( unsigned char ) 0x55 ) +#define mainPLL_LOCK ( ( unsigned long ) 0x0400 ) /* Constants to setup the MAM. */ -#define mainMAM_TIM_3 ( ( unsigned portCHAR ) 0x03 ) -#define mainMAM_MODE_FULL ( ( unsigned portCHAR ) 0x02 ) +#define mainMAM_TIM_3 ( ( unsigned char ) 0x03 ) +#define mainMAM_MODE_FULL ( ( unsigned char ) 0x02 ) /* Constants to setup the peripheral bus. */ -#define mainBUS_CLK_FULL ( ( unsigned portCHAR ) 0x01 ) +#define mainBUS_CLK_FULL ( ( unsigned char ) 0x01 ) /* Constants to setup I/O and processor. */ -#define mainBUS_CLK_FULL ( ( unsigned portCHAR ) 0x01 ) -#define mainLED_TO_OUTPUT ( ( unsigned portLONG ) 0xff0000 ) -#define mainJTAG_PORT ( ( unsigned portLONG ) 0x3E0000UL ) +#define mainBUS_CLK_FULL ( ( unsigned char ) 0x01 ) +#define mainLED_TO_OUTPUT ( ( unsigned long ) 0xff0000 ) +#define mainJTAG_PORT ( ( unsigned long ) 0x3E0000UL ) /* Priorities for the demo application tasks. */ #define mainLED_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 ) @@ -122,7 +126,7 @@ /* Flash rates of the on board LED to indicate the health of the system. */ #define mainNO_ERROR_DELAY ( 3000 ) #define mainERROR_DELAY ( 500 ) -#define mainON_BOARD_LED_BIT ( ( unsigned portLONG ) 0x80 ) +#define mainON_BOARD_LED_BIT ( ( unsigned long ) 0x80 ) /*-----------------------------------------------------------*/ @@ -150,7 +154,7 @@ static void prvMainCheckOtherTasksAreStillRunning( void ); /*-----------------------------------------------------------*/ /* Flag set by prvMainCheckOtherTasksAreStillExecuting(). */ -portLONG lErrorInTask = pdFALSE; +long lErrorInTask = pdFALSE; /* * Application entry point: @@ -171,8 +175,8 @@ int main( void ) vStartIntegerMathTasks( tskIDLE_PRIORITY ); /* Start the WEB server task and the error check task. */ - xTaskCreate( vHTTPServerTask, ( signed portCHAR * ) "HTTP", configMINIMAL_STACK_SIZE, NULL, mainHTTP_TASK_PRIORITY, NULL ); - xTaskCreate( prvErrorChecks, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainERROR_CHECK_PRIORITY, NULL ); + xTaskCreate( vHTTPServerTask, ( signed char * ) "HTTP", configMINIMAL_STACK_SIZE, NULL, mainHTTP_TASK_PRIORITY, NULL ); + xTaskCreate( prvErrorChecks, ( signed char * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainERROR_CHECK_PRIORITY, NULL ); /* Now all the tasks have been started - start the scheduler. @@ -271,7 +275,7 @@ static void prvMainCheckOtherTasksAreStillRunning( void ) void prvToggleOnBoardLED( void ) { -unsigned portLONG ulState; +unsigned long ulState; ulState = GPIO0_IOPIN; if( ulState & mainON_BOARD_LED_BIT )