From 838e63d1de3327c48c261b57c5d14260f44acc07 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sun, 17 Nov 2013 15:40:56 +0000 Subject: [PATCH] Add link to documentation page inside main_full() of the SAM4E demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2103 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../src/config/conf_eth.h | 30 ------------------- .../src/main_full.c | 2 ++ 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/conf_eth.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/conf_eth.h index 73e55cbaf..68418b116 100644 --- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/conf_eth.h +++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/conf_eth.h @@ -63,36 +63,6 @@ extern "C" { /** MAC PHY operation max retry count */ #define MAC_PHY_RETRY_MAX 1000000 -/** MAC address definition. The MAC address must be unique on the network. */ -#define ETHERNET_CONF_ETHADDR0 0x00 -#define ETHERNET_CONF_ETHADDR1 0x04 -#define ETHERNET_CONF_ETHADDR2 0x25 -#define ETHERNET_CONF_ETHADDR3 0x1C -#define ETHERNET_CONF_ETHADDR4 0xA0 -#define ETHERNET_CONF_ETHADDR5 0x02 - -/** WAN Address: 192.168.0.2 */ - -/* The IP address being used. */ -#define ETHERNET_CONF_IPADDR0 192 -#define ETHERNET_CONF_IPADDR1 168 -#define ETHERNET_CONF_IPADDR2 0 -#define ETHERNET_CONF_IPADDR3 2 - -/** WAN gateway: 192.168.0.250 */ - -/*! The gateway address being used. */ -#define ETHERNET_CONF_GATEWAY_ADDR0 192 -#define ETHERNET_CONF_GATEWAY_ADDR1 168 -#define ETHERNET_CONF_GATEWAY_ADDR2 0 -#define ETHERNET_CONF_GATEWAY_ADDR3 250 - -/** The network mask being used. */ -#define ETHERNET_CONF_NET_MASK0 255 -#define ETHERNET_CONF_NET_MASK1 255 -#define ETHERNET_CONF_NET_MASK2 255 -#define ETHERNET_CONF_NET_MASK3 0 - /** Ethernet MII/RMII mode */ #define ETH_PHY_MODE GMAC_PHY_MII diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main_full.c b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main_full.c index 7d9269e32..0774efa2e 100644 --- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main_full.c +++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main_full.c @@ -245,6 +245,8 @@ int main_full( void ) { xTimerHandle xTimer = NULL; + /* Usage instructions on http://www.FreeRTOS.org/Atmel_SAM4E_RTOS_Demo.html */ + /* Initialise the LCD and output a bitmap. The IP address will also be displayed on the LCD when it has been obtained. */ vInitialiseLCD(); -- 2.39.5