ddr: altera: sdram: Clean up set_sdr_dram_timing*()

[karo-tx-uboot.git] / net / bootme.c

diff --git a/net/bootme.c b/net/bootme.c
index 448727201cae94e9f0ad332311ed58c79f43de32..ef6195e0f590d58035a7f5ee9917103f4605b222 100644 (file)
--- a/net/bootme.c
+++ b/net/bootme.c
@@ -33,7 +33,7 @@ static enum bootme_state bootme_state;
 static int bootme_src_port = 0xdeadface;
 static int bootme_dst_port = 0xdeadbeef;
 static uchar bootme_ether[ETH_ALEN];
-static IPaddr_t bootme_ip;
+static struct in_addr bootme_ip;
 static int bootme_timed_out;
 static const char *output_packet; /* used by first send udp */
 static int output_packet_len;
@@ -93,10 +93,10 @@ static inline int env_changed(int *id)
 
 static int env_id;
 
-static int is_broadcast(IPaddr_t ip)
+static int is_broadcast(struct in_addr ip)
 {
-       static IPaddr_t netmask;
-       static IPaddr_t our_ip;
+       static struct in_addr netmask;
+       static struct in_addr our_ip;
 
        return (ip == ~0 ||                             /* 255.255.255.255 */
            ((netmask & our_ip) == (netmask & ip) &&    /* on the same net */
@@ -113,7 +113,7 @@ static int check_net_config(void)
                if (bootme_ip == 0) {
                        bip = getenv("bootmeip");
                        if (bip) {
-                               bootme_ip = getenv_IPaddr("bootmeip");
+                               bootme_ip = getenv_ip("bootmeip");
                                if (!bootme_ip)
                                        return -EINVAL;
                                p = strchr(bip, ':');
@@ -141,13 +141,13 @@ static int check_net_config(void)
                        memset(bootme_ether, 0, sizeof(bootme_ether));
 
                net_init();
-               NetServerIP = bootme_ip;
+               net_copy_ip(&net_server_ip, &bootme_ip);
        }
        return 0;
 }
 
 static void bootme_wait_arp_handler(uchar *pkt, unsigned dest,
-                               IPaddr_t sip, unsigned src,
+                               struct in_addr sip, unsigned src,
                                unsigned len)
 {
        net_set_state(NETLOOP_SUCCESS); /* got arp reply - quit net loop */
@@ -168,7 +168,7 @@ static inline char next_cursor(char c)
        return 0;
 }
 
-static void bootme_handler(uchar *pkt, unsigned dest_port, IPaddr_t src_ip,
+static void bootme_handler(uchar *pkt, unsigned dest_port, struct in_addr src_ip,
                        unsigned src_port, unsigned len)
 {
        uchar *eth_pkt = pkt;
@@ -197,12 +197,12 @@ static void bootme_handler(uchar *pkt, unsigned dest_port, IPaddr_t src_ip,
        }
        if (bootme_state == BOOTME_INIT || bootme_state == BOOTME_DEBUG_INIT) {
                struct ethernet_hdr *eth = (struct ethernet_hdr *)(pkt -
-                                       NetEthHdrSize() - IP_UDP_HDR_SIZE);
+                                       net_eth_hdr_size() - IP_UDP_HDR_SIZE);
                memcpy(bootme_ether, eth->et_src, sizeof(bootme_ether));
                printf("Target MAC address set to %pM\n", bootme_ether);
 
                if (is_broadcast(bootme_ip)) {
-                       NetCopyIP(&bootme_ip, &src_ip);
+                       net_copy_ip(&bootme_ip, &src_ip);
                }
        }
        if (bootme_state == BOOTME_INIT) {
@@ -225,7 +225,7 @@ static void bootme_handler(uchar *pkt, unsigned dest_port, IPaddr_t src_ip,
 
        case BOOTME_DOWNLOAD:
                if (last_state != BOOTME_INIT)
-                       NetBootFileXferSize += len - 4;
+                       net_boot_file_size += len - 4;
                /* fallthru */
        case BOOTME_DEBUG:
                if (last_state == BOOTME_INIT ||
@@ -251,7 +251,7 @@ void BootmeStart(void)
                check_net_config();
 
        if (output_packet_len == 0 ||
-               is_valid_ether_addr(bootme_ether)) {
+               is_valid_ethaddr(bootme_ether)) {
                /* wait for incoming packet */
                net_set_udp_handler(bootme_handler);
                bootme_timed_out = 0;
@@ -261,12 +261,12 @@ void BootmeStart(void)
                uchar *pkt;
 
                net_set_arp_handler(bootme_wait_arp_handler);
-               assert(NetTxPacket != NULL);
-               pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE;
+               assert(net_tx_packet != NULL);
+               pkt = (uchar *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE;
                memcpy(pkt, output_packet, output_packet_len);
                debug("%s@%d: Sending ARP request:\n", __func__, __LINE__);
                ce_dump_block(pkt, output_packet_len);
-               NetSendUDPPacket(bootme_ether, bootme_ip, bootme_dst_port,
+               net_send_udp_packet(bootme_ether, bootme_ip, bootme_dst_port,
                                bootme_src_port, output_packet_len);
                output_packet_len = 0;
        }
@@ -286,7 +286,7 @@ int bootme_send_frame(const void *buf, size_t len)
                check_net_config();
 
        debug("%s: buf: %p len: %u from %pI4:%d to %pI4:%d\n",
-               __func__, buf, len, &NetOurIP, bootme_src_port, &bootme_ip,
+               __func__, buf, len, &net_ip, bootme_src_port, &bootme_ip,
                bootme_dst_port);
 
        if (is_zero_ether_addr(bootme_ether)) {
@@ -315,11 +315,11 @@ int bootme_send_frame(const void *buf, size_t len)
                }
        }
 
-       assert(NetTxPacket != NULL);
-       pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE;
+       assert(net_tx_packet != NULL);
+       pkt = (uchar *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE;
        memcpy(pkt, buf, len);
 
-       ret = NetSendUDPPacket(bootme_ether, bootme_ip, bootme_dst_port,
+       ret = net_send_udp_packet(bootme_ether, bootme_ip, bootme_dst_port,
                        bootme_src_port, len);
        if (ret)
                printf("Failed to send packet: %d\n", ret);
@@ -327,12 +327,12 @@ int bootme_send_frame(const void *buf, size_t len)
        return ret;
 }
 
-static void bootme_init(IPaddr_t server_ip)
+static void bootme_init(struct in_addr server_ip)
 {
        debug("%s@%d: bootme_state: %d -> %d\n", __func__, __LINE__,
                bootme_state, BOOTME_INIT);
        bootme_state = BOOTME_INIT;
-       bootme_ip = server_ip;
+       net_copy_ip(&bootme_ip, &server_ip);
        /* force reconfiguration in check_net_config() */
        env_id = 0;
 }
@@ -374,7 +374,7 @@ int BootMeDebugStart(bootme_hand_f *handler)
        return bootme_state;
 }
 
-int BootMeRequest(IPaddr_t server_ip, const void *buf, size_t len, int timeout)
+int BootMeRequest(struct in_addr server_ip, const void *buf, size_t len, int timeout)
 {
        bootme_init(server_ip);
        bootme_timeout = timeout * 1000;