redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

net: cosmetic: Clean up SNTP variables and functions 

Make a thorough pass through all variables and function names contained
within sntp.c and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
utp
Joe Hershberger 2015-04-08 01:41:12 -05:00 committed by Simon Glass
parent 698d78e545
commit 38ba255874
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/net.c
View File

@ -422,7 +422,7 @@ restart:
#endif #endif
#if defined(CONFIG_CMD_SNTP) #if defined(CONFIG_CMD_SNTP)
case SNTP: case SNTP:
SntpStart(); sntp_start();
break; break;
#endif #endif
#if defined(CONFIG_CMD_DNS) #if defined(CONFIG_CMD_DNS)

25
net/sntp.c
View File

@ -14,10 +14,9 @@
#define SNTP_TIMEOUT 10000UL #define SNTP_TIMEOUT 10000UL
static int SntpOurPort; static int sntp_our_port;
static void static void sntp_send(void)
SntpSend(void)
{ {
struct sntp_pkt_t pkt; struct sntp_pkt_t pkt;
int pktlen = SNTP_PACKET_LEN; int pktlen = SNTP_PACKET_LEN;
@ -34,15 +33,14 @@ SntpSend(void)
memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE, memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE,
(char *)&pkt, pktlen); (char *)&pkt, pktlen);
SntpOurPort = 10000 + (get_timer(0) % 4096); sntp_our_port = 10000 + (get_timer(0) % 4096);
sport = NTP_SERVICE_PORT; sport = NTP_SERVICE_PORT;
net_send_udp_packet(net_server_ethaddr, net_ntp_server, sport, net_send_udp_packet(net_server_ethaddr, net_ntp_server, sport,
SntpOurPort, pktlen); sntp_our_port, pktlen);
} }
static void static void sntp_timeout_handler(void)
SntpTimeout(void)
{ {
puts("Timeout\n"); puts("Timeout\n");
net_set_state(NETLOOP_FAIL); net_set_state(NETLOOP_FAIL);
@ -58,7 +56,7 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
debug("%s\n", __func__); debug("%s\n", __func__);
if (dest != SntpOurPort) if (dest != sntp_our_port)
return; return;
/* /*
@ -72,20 +70,19 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
rtc_set(&tm); rtc_set(&tm);
#endif #endif
printf("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n", printf("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_year, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);
net_set_state(NETLOOP_SUCCESS); net_set_state(NETLOOP_SUCCESS);
} }
void void sntp_start(void)
SntpStart(void)
{ {
debug("%s\n", __func__); debug("%s\n", __func__);
NetSetTimeout(SNTP_TIMEOUT, SntpTimeout); NetSetTimeout(SNTP_TIMEOUT, sntp_timeout_handler);
net_set_udp_handler(sntp_handler); net_set_udp_handler(sntp_handler);
memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr)); memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));
SntpSend(); sntp_send();
} }

2
net/sntp.h
View File

@ -53,6 +53,6 @@ struct sntp_pkt_t {
unsigned long long transmit_timestamp; unsigned long long transmit_timestamp;
}; };
extern void SntpStart(void); /* Begin SNTP */ void sntp_start(void); /* Begin SNTP */
#endif /* __SNTP_H__ */ #endif /* __SNTP_H__ */