22c22
< * $FreeBSD: head/sys/boot/arm/at91/libat91/emac.c 161370 2006-08-16 23:39:58Z imp $
---
> * $FreeBSD: head/sys/boot/arm/at91/libat91/emac.c 163533 2006-10-20 09:12:05Z imp $
34c34,40
< static char serverMACAddr[6];
---
> static receive_descriptor_t *p_rxBD;
> static unsigned short localPort;
> static unsigned short serverPort;
> static unsigned serverMACSet;
> static unsigned localIPSet, serverIPSet;
> static unsigned lastSize;
> static unsigned char serverMACAddr[6];
78c84
< p_memcpy((char*)p_ARP->src_mac, (char*)localMACAddr, 6);
---
> memcpy(p_ARP->src_mac, localMACAddr, 6);
87,90c93,94
< p_memcpy((char*)p_ARP->sender_mac, (char*)localMACAddr, 6);
<
< p_memcpy((char*)p_ARP->sender_ip, (char*)localIPAddr, 4);
<
---
> memcpy(p_ARP->sender_mac, localMACAddr, 6);
> memcpy(p_ARP->sender_ip, localIPAddr, 4);
91a96
> memcpy(p_ARP->target_ip, serverIPAddr, 4);
93,94d97
< p_memcpy((char*)p_ARP->target_ip, (char*)serverIPAddr, 4);
<
118,121c121,122
< p_memcpy((char*)macHdr->dest_mac, (char*)serverMACAddr, 6);
<
< p_memcpy((char*)macHdr->src_mac, (char*)localMACAddr, 6);
<
---
> memcpy(macHdr->dest_mac, serverMACAddr, 6);
> memcpy(macHdr->src_mac, localMACAddr, 6);
135c136,137
< p_memcpy((char*)ipHdr->ip_src, (char*)localIPAddr, 4);
---
> memcpy(ipHdr->ip_src, localIPAddr, 4);
> memcpy(ipHdr->ip_dst, serverIPAddr, 4);
137,138d138
< p_memcpy((char*)ipHdr->ip_dst, (char*)serverIPAddr, 4);
<
148c148
< p_memcpy((char*)udpHdr+8, tftpData, tftpLength);
---
> memcpy((char *)udpHdr+8, tftpData, tftpLength);
185,186c185,186
< ePtr = p_strcpy(cPtr, filename);
< mPtr = p_strcpy(ePtr, "octet");
---
> ePtr = strcpy(cPtr, filename);
> mPtr = strcpy(ePtr, "octet");
208c208
< p_memcpy(dlAddress, data, len);
---
> memcpy(dlAddress, data, len);
219c219
< printf("tftp: %u byte\r\n", lastSize);
---
> printf("tftp: %u byte\n", lastSize);
252d251
<
269,271c268
<
< p_memcpy((char*)serverMACAddr,
< (char*)p_ARP->sender_mac, 6);
---
> memcpy(serverMACAddr, p_ARP->sender_mac, 6);
302c299
< p_memcpy((char*)pHeader, (char*)pIpHeader,sizeof(ip_header_t));
---
> memcpy(pHeader, pIpHeader, sizeof(ip_header_t));
427c424
< printf("\r\n");
---
> printf("\n");
445a443,445
> p_rxBD = (receive_descriptor_t*)RX_BUFFER_START;
> localPort = SWAP16(0x8002);
>
556c556
< printf("\nNAK %u\r\n", ackBlock);
---
> printf("\nNAK %u\n", ackBlock);
561c561
< printf("TFTP TIMEOUT!\r\n");
---
> printf("TFTP TIMEOUT!\n");