]> git.sur5r.net Git - freertos/commitdiff
MicroBlaze demo now building with lwIP included - but will not link until the Etherne...
authorrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Sun, 24 Jul 2011 11:14:40 +0000 (11:14 +0000)
committerrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Sun, 24 Jul 2011 11:14:40 +0000 (11:14 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1500 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

13 files changed:
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOSConfig.h
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/api/sockets.c
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/core/ipv4/igmp.c
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/lwIP_Apps/lwIP_Apps.c
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/lwIP_Apps/lwipcfg_MicroBlaze.h
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/lwIP_Apps/lwipopts.h
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/netif/ethernetif.c
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/netif/include/arch/cc.h
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/netif/lwipcfg_EthernetLite.h [deleted file]
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/netif/sys_arch.c
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c
Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-full.c

index 7a9ca0c66bb35bb31ba20b6a7ac3336010eb258d..c911170fc145934f46f5545c51975dff24ac1ebe 100644 (file)
@@ -40,8 +40,6 @@
                                                                </option>\r
                                                                <option id="xilinx.gnu.compiler.dircategory.includes.788537379" name="Include Paths" superClass="xilinx.gnu.compiler.dircategory.includes" valueType="includePath">\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwIP/lwIP_Apps}&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwIP/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/MicroBlaze}&quot;"/>\r
                                                </toolChain>\r
                                        </folderInfo>\r
                                        <sourceEntries>\r
-                                               <entry excluding="serial.c|src/testperiph.c|ParTest.c|src/xuartlite_selftest_example.c|src/xtmrctr_selftest_example.c|src/xtmrctr_intr_example.c|src/xintc_tapp_example.c|src/xgpio_tapp_example.c|src/xgpio_intr_tapp_example.c|src/xemaclite_polled_example.c|src/xemaclite_intr_example.c|Demo_Source|RegisterTests.c|main-full.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
+                                               <entry excluding="lwIP|lwIP/lwIP_Apps/apps/httpserver_raw/fsdata.c|serial.c|src/testperiph.c|ParTest.c|src/xuartlite_selftest_example.c|src/xtmrctr_selftest_example.c|src/xtmrctr_intr_example.c|src/xintc_tapp_example.c|src/xgpio_tapp_example.c|src/xgpio_intr_tapp_example.c|src/xemaclite_polled_example.c|src/xemaclite_intr_example.c|Demo_Source|RegisterTests.c|main-full.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
                                        </sourceEntries>\r
                                </configuration>\r
                        </storageModule>\r
                                                                </option>\r
                                                                <option id="xilinx.gnu.compiler.dircategory.includes.1539819216" name="Include Paths" superClass="xilinx.gnu.compiler.dircategory.includes" valueType="includePath">\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwIP/netif/include}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwIP/include}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwIP/lwIP_Apps/apps/httpserver_raw}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwIP/lwIP_Apps}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwIP/include/ipv4}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/MicroBlaze}&quot;"/>\r
                                                        </tool>\r
                                                </toolChain>\r
                                        </folderInfo>\r
+                                       <fileInfo id="xilinx.gnu.mb.exe.debug.1890710697.1391169017.1608696955" name="fsdata.c" rcbsApplicability="disable" resourcePath="lwIP/lwIP_Apps/apps/httpserver_raw/fsdata.c" toolsToInvoke="xilinx.gnu.mb.c.toolchain.compiler.debug.1610218702.1428026378">\r
+                                               <tool id="xilinx.gnu.mb.c.toolchain.compiler.debug.1610218702.1428026378" name="MicroBlaze gcc compiler" superClass="xilinx.gnu.mb.c.toolchain.compiler.debug.1610218702"/>\r
+                                       </fileInfo>\r
                                        <sourceEntries>\r
-                                               <entry excluding="src/xuartlite_selftest_example.c|src/xtmrctr_selftest_example.c|src/xtmrctr_intr_example.c|src/xintc_tapp_example.c|src/xgpio_tapp_example.c|src/xgpio_intr_tapp_example.c|src/xemaclite_polled_example.c|src/xemaclite_intr_example.c|src/testperiph.c|main-blinky.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
+                                               <entry excluding="lwIP/lwIP_Apps/apps/httpserver_raw/fsdata.c|src/xuartlite_selftest_example.c|src/xtmrctr_selftest_example.c|src/xtmrctr_intr_example.c|src/xintc_tapp_example.c|src/xgpio_tapp_example.c|src/xgpio_intr_tapp_example.c|src/xemaclite_polled_example.c|src/xemaclite_intr_example.c|src/testperiph.c|main-blinky.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
                                        </sourceEntries>\r
                                </configuration>\r
                        </storageModule>\r
index 7082a7dbcdfaa6343a4d43b71792e56d3d98d03b..c4397d99cd68f9652f3c3f59ee2bc40fa1a6b720 100644 (file)
 #define configMAX_PRIORITIES                   ( 6 )\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 64 * 1024 ) )\r
 #define configMAX_TASK_NAME_LEN                        ( 10 )\r
-#define configUSE_TRACE_FACILITY               0\r
+#define configUSE_TRACE_FACILITY               1\r
 #define configUSE_16_BIT_TICKS                 0\r
 #define configIDLE_SHOULD_YIELD                        1\r
 #define configUSE_MUTEXES                              1\r
 #define configQUEUE_REGISTRY_SIZE              0\r
-#define configGENERATE_RUN_TIME_STATS  0\r
 #define configCHECK_FOR_STACK_OVERFLOW 2\r
 #define configUSE_RECURSIVE_MUTEXES            1\r
 #define configUSE_MALLOC_FAILED_HOOK   1\r
@@ -132,6 +131,45 @@ to exclude the API function. */
 #define configASSERT( x ) if( ( x ) == 0 ) { portDISABLE_INTERRUPTS(); for( ;; ); }\r
        \r
 \r
+/* Run time stats gathering definitions.  The conditional compilation is to\r
+prevent the C syntax being included in assembly files. */\r
+#ifndef __ASSEMBLER__\r
+       unsigned long ulMainGetRunTimeCounterValue( void );\r
+       void vMainConfigureTimerForRunTimeStats( void );\r
+#endif\r
+#define configGENERATE_RUN_TIME_STATS  1\r
+#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vMainConfigureTimerForRunTimeStats()\r
+#define portGET_RUN_TIME_COUNTER_VALUE() ulMainGetRunTimeCounterValue()\r
+\r
+\r
+\r
+#define configLWIP_TASK_PRIORITY       ( configMAX_PRIORITIES - 2 )\r
+\r
+/* MAC address configuration. */\r
+#define configMAC_ADDR0        0x00\r
+#define configMAC_ADDR1        0x12\r
+#define configMAC_ADDR2        0x13\r
+#define configMAC_ADDR3        0x10\r
+#define configMAC_ADDR4        0x15\r
+#define configMAC_ADDR5        0x11\r
+\r
+/* IP address configuration. */\r
+#define configIP_ADDR0         192\r
+#define configIP_ADDR1         168\r
+#define configIP_ADDR2         0\r
+#define configIP_ADDR3         200\r
+\r
+/* Gateway IP address configuration. */\r
+#define configGW_IP_ADDR0      192\r
+#define configGW_IP_ADDR1      168\r
+#define configGW_IP_ADDR2      0\r
+#define configGW_IP_ADDR3      3\r
+\r
+/* Netmask configuration. */\r
+#define configNET_MASK0                255\r
+#define configNET_MASK1                255\r
+#define configNET_MASK2                255\r
+#define configNET_MASK3                0\r
 \r
 #endif /* FREERTOS_CONFIG_H */\r
 \r
index e36012ce43b6624db66b2b85227f4030990cc956..7e82f3ca5dfb3a915c015425fa1cf44751282570 100644 (file)
@@ -2218,7 +2218,7 @@ lwip_setsockopt_internal(void *arg)
   case IPPROTO_UDPLITE:
     switch (optname) {
     case UDPLITE_SEND_CSCOV:
-      if ((*(int*)optval != 0) && ((*(int*)optval < 8)) || (*(int*)optval > 0xffff)) {
+      if ( ( (*(int*)optval != 0) && ((*(int*)optval < 8)) ) || (*(int*)optval > 0xffff)) {
         /* don't allow illegal values! */
         sock->conn->pcb.udp->chksum_len_tx = 8;
       } else {
@@ -2228,7 +2228,7 @@ lwip_setsockopt_internal(void *arg)
                   s, (*(int*)optval)) );
       break;
     case UDPLITE_RECV_CSCOV:
-      if ((*(int*)optval != 0) && ((*(int*)optval < 8)) || (*(int*)optval > 0xffff)) {
+      if ( ((*(int*)optval != 0) && ((*(int*)optval < 8)) ) || (*(int*)optval > 0xffff)) {
         /* don't allow illegal values! */
         sock->conn->pcb.udp->chksum_len_rx = 8;
       } else {
index 4e4405e16f9da0bc0b4ae646b224a812ff8882e6..a6a5de26aa8dd87ddb2ec42652c207292439fafe 100644 (file)
@@ -139,7 +139,6 @@ static struct igmp_group *igmp_lookup_group(struct netif *ifp, ip_addr_t *addr);
 static err_t  igmp_remove_group(struct igmp_group *group);
 static void   igmp_timeout( struct igmp_group *group);
 static void   igmp_start_timer(struct igmp_group *group, u8_t max_time);
-static void   igmp_stop_timer(struct igmp_group *group);
 static void   igmp_delaying_member(struct igmp_group *group, u8_t maxresp);
 static err_t  igmp_ip_output_if(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest, struct netif *netif);
 static void   igmp_send(struct igmp_group *group, u8_t type);
@@ -706,16 +705,6 @@ igmp_start_timer(struct igmp_group *group, u8_t max_time)
   group->timer = (LWIP_RAND() % (max_time - 1)) + 1;
 }
 
-/**
- * Stop a timer for an igmp_group
- *
- * @param group the igmp_group for which to stop the timer
- */
-static void
-igmp_stop_timer(struct igmp_group *group)
-{
-  group->timer = 0;
-}
 
 /**
  * Delaying membership report for a group if necessary
index bba110875de12c939356c88e9d5b203abc7d1be4..fcb9fa30ec3b8c6b1bea58f2d9b9243ee07876ff 100644 (file)
@@ -51,6 +51,9 @@
     licensing and training services.\r
 */\r
 \r
+/* Standard includes. */\r
+#include <string.h>\r
+\r
 /* lwIP core includes */\r
 #include "lwip/opt.h"\r
 #include "lwip/sys.h"\r
 \r
 /* applications includes */\r
 #include "apps/httpserver_raw/httpd.h"\r
-#include "apps/httpserver/httpserver-netconn.h"\r
-#include "apps/netio/netio.h"\r
-#include "apps/netbios/netbios.h"\r
-#include "apps/ping/ping.h"\r
-#include "apps/rtp/rtp.h"\r
-#include "apps/sntp/sntp.h"\r
-#include "apps/chargen/chargen.h"\r
-#include "apps/shell/shell.h"\r
-#include "apps/tcpecho/tcpecho.h"\r
-#include "apps/udpecho/udpecho.h"\r
-#include "apps/tcpecho_raw/echo.h"\r
-#include "apps/socket_examples/socket_examples.h"\r
-\r
-/* include the port-dependent configuration */\r
-#include "lwipcfg_msvc.h"\r
+\r
+\r
+#define LWIP_PORT_INIT_IPADDR(addr)   IP4_ADDR((addr), configIP_ADDR0, configIP_ADDR1, configIP_ADDR2, configIP_ADDR3 )\r
+#define LWIP_PORT_INIT_GW(addr)       IP4_ADDR((addr), configGW_IP_ADDR0, configGW_IP_ADDR1, configGW_IP_ADDR2, configGW_IP_ADDR3 )\r
+#define LWIP_PORT_INIT_NETMASK(addr)  IP4_ADDR((addr), configNET_MASK0,configNET_MASK1,configNET_MASK2,configNET_MASK3)\r
+\r
+/* remember to change this MAC address to suit your needs!\r
+   the last octet will be increased by netif->num for each netif */\r
+#define LWIP_MAC_ADDR_BASE            { configMAC_ADDR0, configMAC_ADDR1, configMAC_ADDR2, configMAC_ADDR3, configMAC_ADDR4, configMAC_ADDR5 }\r
+\r
+/* configuration for applications */\r
+\r
+#define LWIP_CHARGEN_APP              0\r
+#define LWIP_DNS_APP                  0\r
+#define LWIP_HTTPD_APP                1\r
 \r
 static struct netif netif;\r
 \r
@@ -128,13 +131,6 @@ extern err_t ethernetif_init( struct netif *netif );
 \r
        netif_set_default(netif_add(&netif, &ipaddr, &netmask, &gw, NULL, ethernetif_init, tcpip_input));\r
 \r
-       #if LWIP_NETIF_STATUS_CALLBACK\r
-               netif_set_status_callback(&netif, status_callback);\r
-       #endif /* LWIP_NETIF_STATUS_CALLBACK */\r
-       #if LWIP_NETIF_LINK_CALLBACK\r
-               netif_set_link_callback(&netif, link_callback);\r
-       #endif /* LWIP_NETIF_LINK_CALLBACK */\r
-\r
        netif_set_up( &netif );\r
        apps_init();\r
        http_set_ssi_handler( uslwIPAppsSSIHandler, pccSSITags, sizeof( pccSSITags ) / sizeof( char * ) );\r
@@ -146,64 +142,11 @@ static void apps_init( void )
 {\r
        /* Taken from the lwIP example code. */\r
        \r
-       #if LWIP_DNS_APP && LWIP_DNS\r
-               /* wait until the netif is up (for dhcp, autoip or ppp) */\r
-               sys_timeout(5000, dns_dorequest, NULL);\r
-       #endif /* LWIP_DNS_APP && LWIP_DNS */\r
-\r
-       #if LWIP_CHARGEN_APP && LWIP_SOCKET\r
-               chargen_init();\r
-       #endif /* LWIP_CHARGEN_APP && LWIP_SOCKET */\r
-\r
-       #if LWIP_PING_APP && LWIP_RAW && LWIP_ICMP\r
-               ping_init();\r
-       #endif /* LWIP_PING_APP && LWIP_RAW && LWIP_ICMP */\r
-\r
-       #if LWIP_NETBIOS_APP && LWIP_UDP\r
-               netbios_init();\r
-       #endif /* LWIP_NETBIOS_APP && LWIP_UDP */\r
-\r
        #if LWIP_HTTPD_APP && LWIP_TCP\r
        {\r
-               #ifdef LWIP_HTTPD_APP_NETCONN\r
-                       http_server_netconn_init();\r
-               #else /* LWIP_HTTPD_APP_NETCONN */\r
-                       httpd_init();\r
-               #endif /* LWIP_HTTPD_APP_NETCONN */\r
+               httpd_init();\r
        }\r
        #endif /* LWIP_HTTPD_APP && LWIP_TCP */\r
-\r
-       #if LWIP_NETIO_APP && LWIP_TCP\r
-               netio_init();\r
-       #endif /* LWIP_NETIO_APP && LWIP_TCP */\r
-\r
-       #if LWIP_RTP_APP && LWIP_SOCKET && LWIP_IGMP\r
-               rtp_init();\r
-       #endif /* LWIP_RTP_APP && LWIP_SOCKET && LWIP_IGMP */\r
-\r
-       #if LWIP_SNTP_APP && LWIP_SOCKET\r
-               sntp_init();\r
-       #endif /* LWIP_SNTP_APP && LWIP_SOCKET */\r
-\r
-       #if LWIP_SHELL_APP && LWIP_NETCONN\r
-               shell_init();\r
-       #endif /* LWIP_SHELL_APP && LWIP_NETCONN */\r
-\r
-       #if LWIP_TCPECHO_APP\r
-               #if LWIP_NETCONN && defined(LWIP_TCPECHO_APP_NETCONN)\r
-                       tcpecho_init();\r
-               #else /* LWIP_NETCONN && defined(LWIP_TCPECHO_APP_NETCONN) */\r
-                       echo_init();\r
-               #endif\r
-       #endif /* LWIP_TCPECHO_APP && LWIP_NETCONN */\r
-\r
-       #if LWIP_UDPECHO_APP && LWIP_NETCONN\r
-               udpecho_init();\r
-       #endif /* LWIP_UDPECHO_APP && LWIP_NETCONN */\r
-       \r
-       #if LWIP_SOCKET_EXAMPLES_APP && LWIP_SOCKET\r
-               socket_examples_init();\r
-       #endif /* LWIP_SOCKET_EXAMPLES_APP && LWIP_SOCKET */\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -221,11 +164,11 @@ extern char *pcMainGetTaskStatusMessage( void );
        switch( iIndex )\r
        {\r
                case ssiTASK_STATS_INDEX :\r
-                       vTaskList( pcBuffer );\r
+                       vTaskList( ( signed char * ) pcBuffer );\r
                        break;\r
 \r
                case ssiRUN_TIME_STATS_INDEX :\r
-                       vTaskGetRunTimeStats( pcBuffer );\r
+                       vTaskGetRunTimeStats( ( signed char * ) pcBuffer );\r
                        break;\r
        }\r
 \r
index fa35c3c99995040c99e81a57a42f6b20ed3a660c..f7109fad187322af24d3e6848e70178fdb5ffa3e 100644 (file)
@@ -1,46 +1,15 @@
-/**
- * Additional settings for the win32 port.
- * Copy this to lwipcfg_msvc.h and make the config changes you need.
- */
 
-/* configuration for this port */
-#define PPP_USERNAME  "Admin"
-#define PPP_PASSWORD  "pass"
-
-
-/** Define this to the GUID of the windows network adapter to use
- * or NOT define this if you want PACKET_LIB_ADAPTER_NR to be used */ 
-/*#define PACKET_LIB_ADAPTER_GUID       "00000000-0000-0000-0000-000000000000"*/
-/*#define PACKET_LIB_GET_ADAPTER_NETADDRESS(addr) IP4_ADDR((addr), 192,168,1,0)*/
-/*#define PACKET_LIB_QUIET*/
-
-#define LWIP_PORT_INIT_IPADDR(addr)   IP4_ADDR((addr), configIP_ADDR0,configIP_ADDR1,configIP_ADDR2,configIP_ADDR3)
-#define LWIP_PORT_INIT_GW(addr)       IP4_ADDR((addr), 192,168,0,3)
-#define LWIP_PORT_INIT_NETMASK(addr)  IP4_ADDR((addr), 255,255,255,0)
+#define LWIP_PORT_INIT_IPADDR(addr)   IP4_ADDR((addr), configIP_ADDR0, configIP_ADDR1, configIP_ADDR2, configIP_ADDR3 )
+#define LWIP_PORT_INIT_GW(addr)       IP4_ADDR((addr), configGW_IP_ADDR0, configGW_IP_ADDR1, configGW_IP_ADDR2, configGW_IP_ADDR3 )
+#define LWIP_PORT_INIT_NETMASK(addr)  IP4_ADDR((addr), configNET_MASK0,configNET_MASK1,configNET_MASK2,configNET_MASK3)
 
 /* remember to change this MAC address to suit your needs!
    the last octet will be increased by netif->num for each netif */
-#define LWIP_MAC_ADDR_BASE            {0x00,0x01,0x02,0x03,0x04,0x05}
+#define LWIP_MAC_ADDR_BASE            { configMAC_ADDR0, configMAC_ADDR1, configMAC_ADDR2, configMAC_ADDR3, configMAC_ADDR4, configMAC_ADDR5 }
 
 /* configuration for applications */
 
 #define LWIP_CHARGEN_APP              0
 #define LWIP_DNS_APP                  0
 #define LWIP_HTTPD_APP                1
-/* Set this to 1 to use the netconn http server,
- * otherwise the raw api server will be used. */
-/*#define LWIP_HTTPD_APP_NETCONN     */
-#define LWIP_NETBIOS_APP              0
-#define LWIP_NETIO_APP                0
-#define LWIP_PING_APP                 0
-#define LWIP_RTP_APP                  0
-#define LWIP_SHELL_APP                0
-#define LWIP_SNTP_APP                 0
-#define LWIP_SOCKET_EXAMPLES_APP      0
-#define LWIP_TCPECHO_APP              0
-/* Set this to 1 to use the netconn tcpecho server,
- * otherwise the raw api server will be used. */
-/*#define LWIP_TCPECHO_APP_NETCONN   */
-#define LWIP_UDPECHO_APP              0
-
 
index f19e933645ca9cf74e33f0817e32f0f149db8cc3..fb88549d38f01ee677ae23b029c63659be425c96 100644 (file)
@@ -43,9 +43,9 @@
 #define LWIP_SOCKET               (NO_SYS==0)
 #define LWIP_NETCONN              (NO_SYS==0)
 
-#define LWIP_IGMP                  1
+#define LWIP_IGMP                  0
 #define LWIP_ICMP                  1
-#define LWIP_SNMP                  1
+#define LWIP_SNMP                  0
 
 #define LWIP_DNS                   1
 
index e94f0339d1399922579d14ef26c5adde1b680ca4..527f26d7498a939f4ce1ed39062ccacc15d900d3 100644 (file)
@@ -51,9 +51,9 @@
     licensing and training services.\r
 */\r
 \r
-/* WinPCap includes. */\r
-#define HAVE_REMOTE\r
-#include "pcap.h"\r
+#if 0\r
+\r
+//_RB_\r
 \r
 /* FreeRTOS includes. */\r
 #include "FreeRTOS.h"\r
@@ -594,3 +594,5 @@ unsigned long ulNetMask;
        xTaskCreate( prvInterruptSimulator, ( signed char * ) "MAC_ISR", configMINIMAL_STACK_SIZE, NULL, configMAC_ISR_SIMULATOR_PRIORITY, NULL );\r
 }\r
 \r
+#endif\r
+\r
index 8c64b5d4309adaef1c202d58e51d20870975eea0..b504f71d823642fed0e8e434fa49ffa22d816735 100644 (file)
@@ -86,8 +86,7 @@ typedef u32_t sys_prot_t;
 #define SZT_F U32_F
 
 /* Compiler hints for packing structures */
-#define PACK_STRUCT_STRUCT
-#define PACK_STRUCT_USE_INCLUDES
+#define PACK_STRUCT_STRUCT __attribute__( (packed) )
 
 /* Plaform specific diagnostic output */
 #define LWIP_PLATFORM_DIAG(x)   do { printf x; } while(0)
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/netif/lwipcfg_EthernetLite.h b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/lwIP/netif/lwipcfg_EthernetLite.h
deleted file mode 100644 (file)
index a6b5208..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Additional settings for the win32 port.
- * Copy this to lwipcfg_msvc.h and make the config changes you need.
- */
-
-/* configuration for this port */
-#define PPP_USERNAME  "Admin"
-#define PPP_PASSWORD  "pass"
-
-/** Define this to the index of the windows network adapter to use */
-#define PACKET_LIB_ADAPTER_NR         2
-/** Define this to the GUID of the windows network adapter to use
- * or NOT define this if you want PACKET_LIB_ADAPTER_NR to be used */ 
-/*#define PACKET_LIB_ADAPTER_GUID       "00000000-0000-0000-0000-000000000000"*/
-/*#define PACKET_LIB_GET_ADAPTER_NETADDRESS(addr) IP4_ADDR((addr), 192,168,1,0)*/
-/*#define PACKET_LIB_QUIET*/
-
-#define LWIP_PORT_INIT_IPADDR(addr)   IP4_ADDR((addr), 192,168,0,200)
-#define LWIP_PORT_INIT_GW(addr)       IP4_ADDR((addr), 192,168,0,3)
-#define LWIP_PORT_INIT_NETMASK(addr)  IP4_ADDR((addr), 255,255,255,0)
-
-/* remember to change this MAC address to suit your needs!
-   the last octet will be increased by netif->num for each netif */
-#define LWIP_MAC_ADDR_BASE            {0x00,0x01,0x02,0x03,0x04,0x05}
-
-/* configuration for applications */
-
-#define LWIP_CHARGEN_APP              0
-#define LWIP_DNS_APP                  0
-#define LWIP_HTTPD_APP                1
-/* Set this to 1 to use the netconn http server,
- * otherwise the raw api server will be used. */
-/*#define LWIP_HTTPD_APP_NETCONN     */
-#define LWIP_NETBIOS_APP              0
-#define LWIP_NETIO_APP                0
-#define LWIP_PING_APP                 0
-#define LWIP_RTP_APP                  0
-#define LWIP_SHELL_APP                0
-#define LWIP_SNTP_APP                 0
-#define LWIP_SOCKET_EXAMPLES_APP      0
-#define LWIP_TCPECHO_APP              0
-/* Set this to 1 to use the netconn tcpecho server,
- * otherwise the raw api server will be used. */
-/*#define LWIP_TCPECHO_APP_NETCONN   */
-#define LWIP_UDPECHO_APP              0
index 4ac5542e916b9fc0a5036abe8e2518d3df3fb73d..3c4bfb73a59e84c95bf95742f659eab91dd7cef0 100644 (file)
@@ -597,7 +597,7 @@ int result;
  *---------------------------------------------------------------------------*/\r
 sys_prot_t sys_arch_protect(void)\r
 {\r
-       vPortEnterCritical();\r
+       taskENTER_CRITICAL();\r
        return 1;\r
 }\r
 \r
index 49986600022dc892f0955a4eaac6d5869ab25f4f..a68b78657b9c58ef14acede4f5cb898e12990b61 100644 (file)
@@ -533,3 +533,8 @@ unsigned long ulCSR;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
+/* These functions are not used by the Blinky build configuration.  However,\r
+they need to be defined because the Blinky and Full build configurations share\r
+a FreeRTOSConifg.h configuration file. */
+void vMainConfigureTimerForRunTimeStats( void ) {}\r
+unsigned long ulMainGetRunTimeCounterValue( void ) { return 1; }\r
index 07671179a91fb941c70624499ae6db2401d794a8..fcca9f59936dbebc4314ffbc83c7bcbb25665c12 100644 (file)
@@ -573,3 +573,30 @@ static void prvSetupHardware( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
+void vMainConfigureTimerForRunTimeStats( void )\r
+{\r
+unsigned long ulRunTimeStatsDivisor;\r
+\r
+       /* How many times does the counter counter increment in 10ms? */\r
+       ulRunTimeStatsDivisor = 0UL / 1000UL; //_RB_\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+unsigned long ulMainGetRunTimeCounterValue( void )\r
+{\r
+unsigned long ulReturn, ulCurrentCount;\r
+\r
+       ulCurrentCount = 0UL;\r
+       ulReturn = 0UL;\r
+\r
+       return ulReturn;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+char *pcMainGetTaskStatusMessage( void )\r
+{\r
+       return ( char * ) pcStatusMessage;\r
+}\r
+\r
+\r
+\r