Merge git://git.denx.de/u-boot-net

[J-u-boot.git] / net / bootp.h

diff --git a/net/bootp.h b/net/bootp.h
index 3b95a0a2ded87596636516c3b1b865aa79cf3aaf..fcb0a64e6143c550e101e0fd7597a56804e1ef32 100644 (file)
--- a/net/bootp.h
+++ b/net/bootp.h
@@ -29,29 +29,29 @@ extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL  */
 #define OPT_FIELD_SIZE 64
 #endif
 
-struct Bootp_t {
-       uchar           bp_op;          /* Operation                    */
+struct bootp_hdr {
+       u8              bp_op;          /* Operation                    */
 # define OP_BOOTREQUEST        1
 # define OP_BOOTREPLY  2
-       uchar           bp_htype;       /* Hardware type                */
+       u8              bp_htype;       /* Hardware type                */
 # define HWT_ETHER     1
-       uchar           bp_hlen;        /* Hardware address length      */
+       u8              bp_hlen;        /* Hardware address length      */
 # define HWL_ETHER     6
-       uchar           bp_hops;        /* Hop count (gateway thing)    */
-       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           */
-       uchar           bp_chaddr[16];  /* Client hardware address      */
+       u8              bp_hops;        /* Hop count (gateway thing)    */
+       u32             bp_id;          /* Transaction ID               */
+       u16             bp_secs;        /* Seconds since boot           */
+       u16             bp_spare1;      /* Alignment                    */
+       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           */
+       u8              bp_chaddr[16];  /* Client hardware address      */
        char            bp_sname[64];   /* Server host name             */
        char            bp_file[128];   /* Boot file name               */
        char            bp_vend[OPT_FIELD_SIZE]; /* Vendor information  */
 };
 
-#define BOOTP_HDR_SIZE sizeof(struct Bootp_t)
+#define BOOTP_HDR_SIZE sizeof(struct bootp_hdr)
 
 /**********************************************************************/
 /*
@@ -59,17 +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;
+extern u32     bootp_id;               /* ID of cur BOOTP request      */
+extern int     bootp_try;
 
 
 /* Send a BOOTP request */
-extern void BootpReset(void);
-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,