From: Lei Xia <xiaxlei@gmail.com>
Date: Wed, 6 Aug 2008 23:40:07 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: vmmhack1-ramdisk-boot-iso-puppy~13
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=7f1242bb4c55c23dd76c655b22f299f7472d3f5c

*** empty log message ***
---

diff --git a/palacios/include/uip/clock.h b/palacios/include/uip/clock.h
index 4693eb4..a213b99 100644
--- a/palacios/include/uip/clock.h
+++ b/palacios/include/uip/clock.h
@@ -47,7 +47,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: clock.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: clock.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 #ifndef __CLOCK_H__
 #define __CLOCK_H__
diff --git a/palacios/include/uip/lc-addrlabels.h b/palacios/include/uip/lc-addrlabels.h
index cb42f89..83ed1cb 100644
--- a/palacios/include/uip/lc-addrlabels.h
+++ b/palacios/include/uip/lc-addrlabels.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: lc-addrlabels.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: lc-addrlabels.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 
 /**
diff --git a/palacios/include/uip/lc-switch.h b/palacios/include/uip/lc-switch.h
index 1b3400f..d05ca88 100644
--- a/palacios/include/uip/lc-switch.h
+++ b/palacios/include/uip/lc-switch.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: lc-switch.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: lc-switch.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 
 /**
diff --git a/palacios/include/uip/lc.h b/palacios/include/uip/lc.h
index 412e632..7f20331 100644
--- a/palacios/include/uip/lc.h
+++ b/palacios/include/uip/lc.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: lc.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: lc.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 
 /**
@@ -122,7 +122,7 @@
 #ifdef LC_CONF_INCLUDE
 #include LC_CONF_INCLUDE
 #else
-#include <uip/c-switch.h>
+#include <uip/lc-switch.h>
 #endif /* LC_CONF_INCLUDE */
 
 #endif /* __LC_H__ */
diff --git a/palacios/include/uip/psock.h b/palacios/include/uip/psock.h
index 478e453..91697b9 100644
--- a/palacios/include/uip/psock.h
+++ b/palacios/include/uip/psock.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: psock.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: psock.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 
 /**
diff --git a/palacios/include/uip/pt.h b/palacios/include/uip/pt.h
index b1fb2bd..a24cc16 100644
--- a/palacios/include/uip/pt.h
+++ b/palacios/include/uip/pt.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: pt.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: pt.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 
 /**
@@ -51,9 +51,9 @@
 
 #include <uip/lc.h>
 
-struct pt {
+typedef struct pt {
   lc_t lc;
-};
+}pt;
 
 #define PT_WAITING 0
 #define PT_EXITED  1
diff --git a/palacios/include/uip/resolv.h b/palacios/include/uip/resolv.h
index d64efe7..96d5096 100644
--- a/palacios/include/uip/resolv.h
+++ b/palacios/include/uip/resolv.h
@@ -38,17 +38,19 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: resolv.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: resolv.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  *
  */
 #ifndef __RESOLV_H__
 #define __RESOLV_H__
 
+#include <uip/uipopt.h>
+
 typedef int uip_udp_appstate_t;
 void resolv_appcall(void);
 #define UIP_UDP_APPCALL resolv_appcall
 
-#include <uip/uipopt.h>
+
 
 /**
  * Callback function which is called when a hostname is found.
@@ -61,7 +63,9 @@ void resolv_appcall(void);
  * ipaddr A pointer to a 4-byte array containing the IP address of the
  * hostname, or NULL if the hostname could not be found.
  */
-void resolv_found(char *name, u16_t *ipaddr);
+void resolv_found(char *name, u16_t *ipaddr)
+{ 
+}
 
 /* Functions. */
 void resolv_conf(u16_t *dnsserver);
diff --git a/palacios/include/uip/timer.h b/palacios/include/uip/timer.h
index f6bae80..b80911e 100644
--- a/palacios/include/uip/timer.h
+++ b/palacios/include/uip/timer.h
@@ -56,7 +56,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: timer.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: timer.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/palacios/include/uip/uip-conf.h b/palacios/include/uip/uip-conf.h
index d80f77b..a0fc082 100644
--- a/palacios/include/uip/uip-conf.h
+++ b/palacios/include/uip/uip-conf.h
@@ -42,7 +42,7 @@
  *
  * This file is part of the uIP TCP/IP stack
  *
- * $Id: uip-conf.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uip-conf.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 
 /**
@@ -55,14 +55,13 @@
 #ifndef __UIP_CONF_H__
 #define __UIP_CONF_H__
 
-#include <uip/resolv.h>
 
 int uip_appcall(void){
 
 	return 0;
 }
 
-#define UIP_APPCALL  uip_appcall    //application function
+#define UIP_APPCALL  uip_appcall    //application function
 //#define UIP_UDP_APPCALL  uip_appcall 
 
 
diff --git a/palacios/include/uip/uip-fw.h b/palacios/include/uip/uip-fw.h
index 97d0757..4832655 100644
--- a/palacios/include/uip/uip-fw.h
+++ b/palacios/include/uip/uip-fw.h
@@ -41,7 +41,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: uip-fw.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uip-fw.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 #ifndef __UIP_FW_H__
 #define __UIP_FW_H__
diff --git a/palacios/include/uip/uip-neighbor.h b/palacios/include/uip/uip-neighbor.h
index a8068c3..807f462 100644
--- a/palacios/include/uip/uip-neighbor.h
+++ b/palacios/include/uip/uip-neighbor.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the uIP TCP/IP stack
  *
- * $Id: uip-neighbor.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uip-neighbor.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 
 /**
diff --git a/palacios/include/uip/uip-split.h b/palacios/include/uip/uip-split.h
index a65e364..fbcc617 100644
--- a/palacios/include/uip/uip-split.h
+++ b/palacios/include/uip/uip-split.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: uip-split.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uip-split.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  */
 /**
  * \addtogroup uip
diff --git a/palacios/include/uip/uip.h b/palacios/include/uip/uip.h
index 355b806..165acde 100644
--- a/palacios/include/uip/uip.h
+++ b/palacios/include/uip/uip.h
@@ -46,7 +46,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uip.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  *
  */
 
@@ -54,6 +54,7 @@
 #define __UIP_H__
 
 #include <uip/uipopt.h>
+#include <uip/resolv.h>
 
 /**
  * Repressentation of an IP address.
@@ -67,6 +68,7 @@ typedef uip_ip6addr_t uip_ipaddr_t;
 typedef uip_ip4addr_t uip_ipaddr_t;
 #endif /* UIP_CONF_IPV6 */
 
+
 /*---------------------------------------------------------------------------*/
 /* First, the functions that should be called from the
  * system. Initialization, the periodic timer and incoming packets are
diff --git a/palacios/include/uip/uip_arch.h b/palacios/include/uip/uip_arch.h
index abb1766..3dfa160 100644
--- a/palacios/include/uip/uip_arch.h
+++ b/palacios/include/uip/uip_arch.h
@@ -54,7 +54,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arch.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uip_arch.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  *
  */
 
diff --git a/palacios/include/uip/uip_arp.h b/palacios/include/uip/uip_arp.h
index 6ec3324..58aa49f 100644
--- a/palacios/include/uip/uip_arp.h
+++ b/palacios/include/uip/uip_arp.h
@@ -45,7 +45,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arp.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uip_arp.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  *
  */
 
diff --git a/palacios/include/uip/uiplib.h b/palacios/include/uip/uiplib.h
index 8f59a79..9e8486d 100644
--- a/palacios/include/uip/uiplib.h
+++ b/palacios/include/uip/uiplib.h
@@ -37,7 +37,7 @@
  *
  * This file is part of the uIP TCP/IP stack
  *
- * $Id: uiplib.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uiplib.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  *
  */
 #ifndef __UIPLIB_H__
diff --git a/palacios/include/uip/uipopt.h b/palacios/include/uip/uipopt.h
index ce64356..5acdefd 100644
--- a/palacios/include/uip/uipopt.h
+++ b/palacios/include/uip/uipopt.h
@@ -53,7 +53,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uipopt.h,v 1.1 2008/08/06 23:19:30 andrewlxia Exp $
+ * $Id: uipopt.h,v 1.2 2008/08/06 23:40:07 andrewlxia Exp $
  *
  */