diff mbox

[U-Boot,v2,12/25] net: cosmetic: Clean up SNTP variables and functions

Message ID 1428475285-25836-13-git-send-email-joe.hershberger@ni.com
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Joe Hershberger April 8, 2015, 6:41 a.m. UTC 
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>
---

Changes in v2: None

 net/net.c  |  2 +-
 net/sntp.c | 25 +++++++++++--------------
 net/sntp.h |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

Comments

Simon Glass April 8, 2015, 12:46 p.m. UTC | #1 
On 8 April 2015 at 00:41, Joe Hershberger <joe.hershberger@ni.com> wrote:
> 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>
> ---
>
> Changes in v2: None
>
>  net/net.c  |  2 +-
>  net/sntp.c | 25 +++++++++++--------------
>  net/sntp.h |  2 +-
>  3 files changed, 13 insertions(+), 16 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass April 8, 2015, 2:37 p.m. UTC | #2 
On 8 April 2015 at 06:46, Simon Glass <sjg@chromium.org> wrote:
> On 8 April 2015 at 00:41, Joe Hershberger <joe.hershberger@ni.com> wrote:
>> 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>
>> ---
>>
>> Changes in v2: None
>>
>>  net/net.c  |  2 +-
>>  net/sntp.c | 25 +++++++++++--------------
>>  net/sntp.h |  2 +-
>>  3 files changed, 13 insertions(+), 16 deletions(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm/next, thanks!
diff mbox

Patch

diff --git a/net/net.c b/net/net.c
index 6c23293..a159432 100644
--- a/net/net.c
+++ b/net/net.c
@@ -422,7 +422,7 @@  restart:
 #endif
 #if defined(CONFIG_CMD_SNTP)
 		case SNTP:
-			SntpStart();
+			sntp_start();
 			break;
 #endif
 #if defined(CONFIG_CMD_DNS)
diff --git a/net/sntp.c b/net/sntp.c
index 1e2b678..8073ca6 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -14,10 +14,9 @@ 
 
 #define SNTP_TIMEOUT 10000UL
 
-static int SntpOurPort;
+static int sntp_our_port;
 
-static void
-SntpSend(void)
+static void sntp_send(void)
 {
 	struct sntp_pkt_t pkt;
 	int pktlen = SNTP_PACKET_LEN;
@@ -34,15 +33,14 @@  SntpSend(void)
 	memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE,
 	       (char *)&pkt, pktlen);
 
-	SntpOurPort = 10000 + (get_timer(0) % 4096);
+	sntp_our_port = 10000 + (get_timer(0) % 4096);
 	sport = NTP_SERVICE_PORT;
 
 	net_send_udp_packet(net_server_ethaddr, net_ntp_server, sport,
-			    SntpOurPort, pktlen);
+			    sntp_our_port, pktlen);
 }
 
-static void
-SntpTimeout(void)
+static void sntp_timeout_handler(void)
 {
 	puts("Timeout\n");
 	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__);
 
-	if (dest != SntpOurPort)
+	if (dest != sntp_our_port)
 		return;
 
 	/*
@@ -72,20 +70,19 @@  static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
 	rtc_set(&tm);
 #endif
 	printf("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
-		tm.tm_year, tm.tm_mon, tm.tm_mday,
-		tm.tm_hour, tm.tm_min, tm.tm_sec);
+	       tm.tm_year, tm.tm_mon, tm.tm_mday,
+	       tm.tm_hour, tm.tm_min, tm.tm_sec);
 
 	net_set_state(NETLOOP_SUCCESS);
 }
 
-void
-SntpStart(void)
+void sntp_start(void)
 {
 	debug("%s\n", __func__);
 
-	NetSetTimeout(SNTP_TIMEOUT, SntpTimeout);
+	NetSetTimeout(SNTP_TIMEOUT, sntp_timeout_handler);
 	net_set_udp_handler(sntp_handler);
 	memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));
 
-	SntpSend();
+	sntp_send();
 }
diff --git a/net/sntp.h b/net/sntp.h
index bf5bf0b..6a9c6bb 100644
--- a/net/sntp.h
+++ b/net/sntp.h
@@ -53,6 +53,6 @@  struct sntp_pkt_t {
 	unsigned long long transmit_timestamp;
 };
 
-extern void SntpStart(void);	/* Begin SNTP */
+void sntp_start(void);	/* Begin SNTP */
 
 #endif /* __SNTP_H__ */