Changeset 374 for asp3_tinet_ecnl_arm/trunk/ntshell/src/ntp_cli.c

Timestamp:

Apr 5, 2019, 9:26:53 PM (5 years ago)

Author:

coas-nagasima

Message:

mbed関連を更新
シリアルドライバをmbedのHALを使うよう変更
ファイルディスクリプタの処理を更新

File:

• asp3_tinet_ecnl_arm/trunk/ntshell/src/ntp_cli.c (modified) (13 diffs)

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntp_cli.c

@@ -50 +50 @@
 #include <t_syslog.h>
 #include "kernel_cfg.h"
-#include "util/ntstdio.h"
-
-extern ntstdio_t ntstdio;
+#include <stdio.h>
 
 #endif  /* of #if defined(TARGET_KERNEL_ASP) */
@@ -279 +277 @@
         }
 
-        ntstdio_printf(&ntstdio, "[NTP CLI,%d] recv time: %s .%09u\n",
+        printf("[NTP CLI,%d] recv time: %s .%09u\n",
                 nc->cepid, nc->buf, tp.tv_nsec);
 }
@@ -311 +309 @@
                 line = lookup_ipaddr(&nc->ipaddr6, NTP_SRV_URL, API_PROTO_IPV4);
                 if (line == NULL || !in6_is_addr_ipv4mapped(&nc->ipaddr6)) {
-                        ntstdio_printf(&ntstdio, "[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
+                        printf("[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
                                 nc->cepid, SLP_ITV / SYSTIM_HZ, SLP_ITV % SYSTIM_HZ);
                         nc->timer = SLP_ITV;
@@ -319 +317 @@
 #else   /* of #if defined(SUPPORT_INET6) && defined(SUPPORT_INET4) */
                 if ((line = lookup_ipaddr(&nc->snd_rmt.ipaddr, NTP_SRV_URL, DEFAULT_API_PROTO)) == NULL) {
-                        ntstdio_printf(&ntstdio, "[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
+                        printf("[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
                                 nc->cepid, SLP_ITV / SYSTIM_HZ, SLP_ITV % SYSTIM_HZ);
                         nc->timer = SLP_ITV;
@@ -423 +421 @@
 
         if ((error = udp_snd_dat(nc->cepid, &nc->snd_rmt, ntp, len, TMO_NBLK)) != E_WBLK) {
-                ntstdio_printf(&ntstdio, "[NTP CLI,%d] udp_snd_dat error: %s",
+                printf("[NTP CLI,%d] udp_snd_dat error: %s",
                         nc->cepid, itron_strerror(error));
                 return error;
@@ -441 +439 @@
         ret = get_tim(&time);
         if (ret != E_OK) {
-                ntstdio_printf(&ntstdio, "[NTP CLI,%d] get_tim error: %s",
+                printf("[NTP CLI,%d] get_tim error: %s",
                         nc->cepid, itron_strerror(ret));
                 tp->tv_sec = 0;
@@ -461 +459 @@
         ret = set_tim(time);
         if (ret != E_OK) {
-                ntstdio_printf(&ntstdio, "[NTP CLI,%d] set_tim error: %s",
+                printf("[NTP CLI,%d] set_tim error: %s",
                         nc->cepid, itron_strerror(ret));
         }
@@ -479 +477 @@
         if (len < 0 && len != E_RLWAI) {
                 /* E_RLWAI 以外で、0 以下の場合は、エラーを意味している。*/
-                ntstdio_printf(&ntstdio, "[NTP CLI,%d] callback error: %s, fncd: %s", nc->cepid,
+                printf("[NTP CLI,%d] callback error: %s, fncd: %s", nc->cepid,
                         itron_strerror(len), in_strtfn(fncd));
         }
@@ -486 +484 @@
                         if ((len = udp_rcv_dat(nc->cepid, &nc->rcv_rmt, &nc->ntp_msg, len, TMO_POL)) < 0)
                         {
-                                ntstdio_printf(&ntstdio, "[NTP CLI,%d] udp_rcv_dat error: %s", nc->cepid,
+                                printf("[NTP CLI,%d] udp_rcv_dat error: %s", nc->cepid,
                                         itron_strerror(len));
                         }
@@ -518 +516 @@
 
         get_tid(&nc->tskid);
-        ntstdio_printf(&ntstdio, "[NTP CLI:%d,%d] started.", nc->tskid, (ID)exinf);
+        printf("[NTP CLI:%d,%d] started.", nc->tskid, (ID)exinf);
 
         /* 初期化 */
@@ -525 +523 @@
         ret = get_tim(&time);
         if (ret != E_OK) {
-                ntstdio_printf(&ntstdio, "[NTP CLI,%d] get_tim error: %7lu,%s",
+                printf("[NTP CLI,%d] get_tim error: %7lu,%s",
                         nc->cepid, time / SYSTIM_HZ, itron_strerror(ret));
                 return;
@@ -539 +537 @@
                 error = tslp_tsk(timer);
                 if ((error != E_OK) && (error != E_TMOUT)) {
-                        ntstdio_printf(&ntstdio, "[NTP CLI,%d] tslp_tsk error: %s %d",
+                        printf("[NTP CLI,%d] tslp_tsk error: %s %d",
                                 nc->cepid, itron_strerror(error), timer);
                         break;
@@ -546 +544 @@
                 ret = get_tim(&time);
                 if (ret != E_OK) {
-                        ntstdio_printf(&ntstdio, "[NTP CLI,%d] get_tim error: %s",
+                        printf("[NTP CLI,%d] get_tim error: %s",
                                 nc->cepid, itron_strerror(ret));
                         break;