Few commented out changes to the libs made, plus setting default IP t…

…o 192.168.1.14
jmgiacalone · Sep 23, 2013 · cc3200b · cc3200b
1 parent 65e4a59
commit cc3200b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/EMAC/conf_eth.h b/EMAC/conf_eth.h
@@ -74,14 +74,14 @@
 /* The IP address being used. */
 #define ETHERNET_CONF_IPADDR0                         192
 #define ETHERNET_CONF_IPADDR1                         168
-#define ETHERNET_CONF_IPADDR2                         0
+#define ETHERNET_CONF_IPADDR2                         1
 #define ETHERNET_CONF_IPADDR3                         14
 
 /** WAN gateway: 192.168.0.1 */
 /** 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_ADDR2                   1
 #define ETHERNET_CONF_GATEWAY_ADDR3                   1
 
 /** The network mask being used. */

diff --git a/Lwip/lwip/src/sam/netif/ethernetif.c b/Lwip/lwip/src/sam/netif/ethernetif.c
@@ -67,6 +67,8 @@
 #include "conf_eth.h"
 
 #include "SamNonDuePin.h"
+
+//void my_ethernetif_input(void * pvParameters);
 //#include "gpio.h"
 
 /** Define those to better describe your network interface */
@@ -380,31 +382,31 @@ void ethernetif_input(void * pvParameters)
 	struct netif      *netif = (struct netif *)pvParameters;
 	struct pbuf       *p;
 
-#ifdef FREERTOS_USED
-	for( ;; ) {
-		do {
-#endif
+//#ifdef FREERTOS_USED
+//	for( ;; ) {
+//		do {
+//#endif
 			/* move received packet into a new pbuf */
 			p = low_level_input( netif );
 			if( p == NULL ) {
-#ifdef FREERTOS_USED
-				/* No packet could be read.  Wait a for an interrupt to tell us
-				there is more data available. */
-				vTaskDelay(100);
-			}
-		}while( p == NULL );
-#else
+//#ifdef FREERTOS_USED
+//				/* No packet could be read.  Wait a for an interrupt to tell us
+//				there is more data available. */
+//				vTaskDelay(100);
+//			}
+//		}while( p == NULL );
+//#else
 				return;
 			}
-#endif
+//#endif
 
 		if( ERR_OK != netif->input( p, netif ) ) {
 			pbuf_free(p);
 			p = NULL;
 		}
-#ifdef FREERTOS_USED
-	}
-#endif
+//#ifdef FREERTOS_USED
+//	}
+//#endif
 }