Merge branch 'master' of git://git.denx.de/u-boot-samsung

[karo-tx-uboot.git] / include / net.h

diff --git a/include/net.h b/include/net.h
index d2d394f0da80d0788e92dce97f740c9fe0679443..ab571eb3ee49d4a488a1ec5a69ac49bc61972964 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -105,29 +105,34 @@ struct eth_device {
 #ifdef CONFIG_MCAST_TFTP
        int (*mcast) (struct eth_device*, u32 ip, u8 set);
 #endif
+       int  (*write_hwaddr) (struct eth_device*);
        struct eth_device *next;
        void *priv;
 };
 
-extern int eth_initialize(bd_t *bis);          /* Initialize network subsystem */
-extern int eth_register(struct eth_device* dev);/* Register network device     */
-extern void eth_try_another(int first_restart);        /* Change the device            */
+extern int eth_initialize(bd_t *bis);  /* Initialize network subsystem */
+extern int eth_register(struct eth_device* dev);/* Register network device */
+extern void eth_try_another(int first_restart);        /* Change the device */
 #ifdef CONFIG_NET_MULTI
-extern void eth_set_current(void);             /* set nterface to ethcur var.  */
+extern void eth_set_current(void);             /* set nterface to ethcur var */
 #endif
-extern struct eth_device *eth_get_dev(void);   /* get the current device MAC   */
-extern struct eth_device *eth_get_dev_by_name(char *devname); /* get device    */
-extern int eth_get_dev_index (void);           /* get the device index         */
-extern void eth_set_enetaddr(int num, char* a);        /* Set new MAC address          */
-
-extern int eth_init(bd_t *bis);                        /* Initialize the device        */
-extern int eth_send(volatile void *packet, int length);           /* Send a packet     */
+extern struct eth_device *eth_get_dev(void);   /* get the current device MAC */
+extern struct eth_device *eth_get_dev_by_name(const char *devname);
+extern struct eth_device *eth_get_dev_by_index(int index); /* get dev @ index */
+extern int eth_get_dev_index (void);           /* get the device index */
+extern void eth_parse_enetaddr(const char *addr, uchar *enetaddr);
+extern int eth_getenv_enetaddr(char *name, uchar *enetaddr);
+extern int eth_setenv_enetaddr(char *name, const uchar *enetaddr);
+extern int eth_getenv_enetaddr_by_index(int index, uchar *enetaddr);
+
+extern int eth_init(bd_t *bis);                        /* Initialize the device */
+extern int eth_send(volatile void *packet, int length);           /* Send a packet */
 #ifdef CONFIG_API
-extern int eth_receive(volatile void *packet, int length); /* Receive a packet */
+extern int eth_receive(volatile void *packet, int length); /* Receive a packet*/
 #endif
-extern int eth_rx(void);                       /* Check for received packets   */
-extern void eth_halt(void);                    /* stop SCC                     */
-extern char *eth_get_name(void);               /* get name of current device   */
+extern int eth_rx(void);                       /* Check for received packets */
+extern void eth_halt(void);                    /* stop SCC */
+extern char *eth_get_name(void);               /* get name of current device */
 
 #ifdef CONFIG_MCAST_TFTP
 int eth_mcast_join( IPaddr_t mcast_addr, u8 join);
@@ -327,8 +332,8 @@ extern IPaddr_t             NetOurIP;               /* Our    IP addr (0 = unknown) */
 extern IPaddr_t                NetServerIP;            /* Server IP addr (0 = unknown) */
 extern volatile uchar * NetTxPacket;           /* THE transmit packet          */
 extern volatile uchar * NetRxPackets[PKTBUFSRX];/* Receive packets             */
-extern volatile uchar * NetRxPkt;              /* Current receive packet       */
-extern int             NetRxPktLen;            /* Current rx packet length     */
+extern volatile uchar * NetRxPacket;           /* Current receive packet       */
+extern int             NetRxPacketLen;         /* Current rx packet length     */
 extern unsigned                NetIPID;                /* IP ID (counting)             */
 extern uchar           NetBcastAddr[6];        /* Ethernet boardcast address   */
 extern uchar           NetEtherNullAddr[6];
@@ -357,6 +362,11 @@ typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP
 /* from net/net.c */
 extern char    BootFile[128];                  /* Boot File name               */
 
+#if defined(CONFIG_CMD_DNS)
+extern char *NetDNSResolve;            /* The host to resolve  */
+extern char *NetDNSenvvar;             /* the env var to put the ip into */
+#endif
+
 #if defined(CONFIG_CMD_PING)
 extern IPaddr_t        NetPingIP;                      /* the ip address to ping               */
 #endif
@@ -407,9 +417,6 @@ extern int  NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, i
 /* Processes a received packet */
 extern void    NetReceive(volatile uchar *, int);
 
-/* Print an IP address on the console */
-extern void    print_IPaddr (IPaddr_t);
-
 /*
  * The following functions are a bit ugly, but necessary to deal with
  * alignment restrictions on ARM.
@@ -474,6 +481,22 @@ static inline int is_multicast_ether_addr(const u8 *addr)
        return (0x01 & addr[0]);
 }
 
+/**
+ * is_valid_ether_addr - Determine if the given Ethernet address is valid
+ * @addr: Pointer to a six-byte array containing the Ethernet address
+ *
+ * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not
+ * a multicast address, and is not FF:FF:FF:FF:FF:FF.
+ *
+ * Return true if the address is valid.
+ */
+static inline int is_valid_ether_addr(const u8 * addr)
+{
+       /* FF:FF:FF:FF:FF:FF is a multicast address so we don't need to
+        * explicitly check for it here. */
+       return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr);
+}
+
 /* Convert an IP address to a string */
 extern void    ip_to_string (IPaddr_t x, char *s);
 
@@ -486,15 +509,15 @@ extern void       VLAN_to_string (ushort x, char *s);
 /* Convert a string to a vlan id */
 extern ushort string_to_VLAN(char *s);
 
-/* read an IP address from a environment variable */
-extern IPaddr_t getenv_IPaddr (char *);
-
 /* read a VLAN id from an environment variable */
 extern ushort getenv_VLAN(char *);
 
 /* copy a filename (allow for "..." notation, limit length) */
 extern void    copy_filename (char *dst, char *src, int size);
 
+/* get a random source port */
+extern unsigned int random_port(void);
+
 /**********************************************************************/
 
 #endif /* __NET_H__ */