X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=net%2Fbootp.h;h=efc2100a4b52cc6728ef806528bb8acd52ab5581;hb=42347805af11546aecde5d4062ba08ca9e1cd30a;hp=ce7373454eedd9ec1f82bb3e0586d38a8e90a4e2;hpb=3090b7e36c0631e0141dd88dd3b6ca85fb1fe291;p=karo-tx-uboot.git

diff --git a/net/bootp.h b/net/bootp.h
index ce7373454e..efc2100a4b 100644
--- a/net/bootp.h
+++ b/net/bootp.h
@@ -20,16 +20,16 @@
  */
 #if defined(CONFIG_CMD_DHCP)
 /* Minimum DHCP Options size per RFC2131 - results in 576 byte pkt */
-#define OPT_SIZE 312
+#define OPT_FIELD_SIZE 312
 #if defined(CONFIG_BOOTP_VENDOREX)
 extern u8 *dhcp_vendorex_prep(u8 *e); /*rtn new e after add own opts. */
 extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL  */
 #endif
 #else
-#define OPT_SIZE 64
+#define OPT_FIELD_SIZE 64
 #endif
 
-struct Bootp_t {
+struct bootp_hdr {
 	uchar		bp_op;		/* Operation			*/
 # define OP_BOOTREQUEST	1
 # define OP_BOOTREPLY	2
@@ -41,18 +41,17 @@ struct Bootp_t {
 	ulong		bp_id;		/* Transaction ID		*/
 	ushort		bp_secs;	/* Seconds since boot		*/
 	ushort		bp_spare1;	/* Alignment			*/
-	IPaddr_t	bp_ciaddr;	/* Client IP address		*/
-	IPaddr_t	bp_yiaddr;	/* Your (client) IP address	*/
-	IPaddr_t	bp_siaddr;	/* Server IP address		*/
-	IPaddr_t	bp_giaddr;	/* Gateway IP address		*/
+	struct in_addr	bp_ciaddr;	/* Client IP address		*/
+	struct in_addr	bp_yiaddr;	/* Your (client) IP address	*/
+	struct in_addr	bp_siaddr;	/* Server IP address		*/
+	struct in_addr	bp_giaddr;	/* Gateway IP address		*/
 	uchar		bp_chaddr[16];	/* Client hardware address	*/
 	char		bp_sname[64];	/* Server host name		*/
 	char		bp_file[128];	/* Boot file name		*/
-	char		bp_vend[OPT_SIZE];	/* Vendor information	*/
+	char		bp_vend[OPT_FIELD_SIZE]; /* Vendor information	*/
 };
 
-#define BOOTP_HDR_SIZE	sizeof(struct Bootp_t)
-#define BOOTP_SIZE	(ETHER_HDR_SIZE + IP_HDR_SIZE + BOOTP_HDR_SIZE)
+#define BOOTP_HDR_SIZE	sizeof(struct bootp_hdr)
 
 /**********************************************************************/
 /*
@@ -60,19 +59,16 @@ struct Bootp_t {
  */
 
 /* bootp.c */
-extern ulong	BootpID;		/* ID of cur BOOTP request	*/
-extern char	BootFile[128];		/* Boot file name		*/
-extern int	BootpTry;
-#ifdef CONFIG_BOOTP_RANDOM_DELAY
-extern ulong	seed1, seed2;		/* seed for random BOOTP delay	*/
-#endif
+extern ulong	bootp_id;		/* ID of cur BOOTP request	*/
+extern int	bootp_try;
 
 
 /* Send a BOOTP request */
-extern void BootpRequest(void);
+void bootp_reset(void);
+void bootp_request(void);
 
 /****************** DHCP Support *********************/
-extern void DhcpRequest(void);
+void dhcp_request(void);
 
 /* DHCP States */
 typedef enum { INIT,
@@ -92,8 +88,6 @@ typedef enum { INIT,
 #define DHCP_NAK      6
 #define DHCP_RELEASE  7
 
-#define SELECT_TIMEOUT 3000UL	/* Milliseconds to wait for offers */
-
 /**********************************************************************/
 
 #endif /* __BOOTP_H__ */