commit ad63a29c0c6d99b59c8045c36ecac0ece7768f86
author Liu Zhongjian <zhongjia@codeaurora.org> Wed Mar 15 16:58:00 2017 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 16 04:47:29 2017 -0700
tree 3a4c1ba08806da51045aefd21051468836da1184
parent 502f277da20ab4760f41e6499cce5444fa60f5ea

[qca-ssdk-shell]: fix kw issue of shell.

Change-Id: If832f5061ac908edea30ce5877a85e8ebf44e09c
Signed-off-by: Liu Zhongjian <zhongjia@codeaurora.org>

include/fal/fal_interface_ctrl.h

diff --git a/include/fal/fal_interface_ctrl.h b/include/fal/fal_interface_ctrl.h
index 23ad46f..40ac18b 100755
--- a/include/fal/fal_interface_ctrl.h
+++ b/include/fal/fal_interface_ctrl.h
@@ -114,12 +114,14 @@
 
     typedef enum
     {
-        Fx100BASE_MODE = 2,
+	Fx100BASE_MODE = 2,
+	Fx100BASE_BUTT = 0xffff,
     } fx100_ctrl_link_mode_t;
 
     typedef enum
     {
-        FX100_SERDS_MODE = 1,
+	FX100_SERDS_MODE = 1,
+	Fx100_SERDS_BUTT = 0xffff,
     } sgmii_fiber_mode_t;
 
 #define    FX100_HALF_DUPLEX  0

src/fal_uk/fal_uk_if.c

diff --git a/src/fal_uk/fal_uk_if.c b/src/fal_uk/fal_uk_if.c
index 11ad43f..2dec408 100755
--- a/src/fal_uk/fal_uk_if.c
+++ b/src/fal_uk/fal_uk_if.c
@@ -43,12 +43,8 @@
         value[i + 2] = va_arg(arg_ptr, unsigned long);
     }
     va_end(arg_ptr);
+    sw_uk_if(value);
 
-    rv = sw_uk_if(value);
-    if (SW_OK != rv)
-    {
-        return rv;
-    }
     return rtn;
 }
 

src/sal/sd/sd.c

diff --git a/src/sal/sd/sd.c b/src/sal/sd/sd.c
index 8f1cded..b4fb8ea 100755
--- a/src/sal/sd/sd.c
+++ b/src/sal/sd/sd.c
@@ -48,10 +48,6 @@
             args[3] = phy;
             args[4] = reg;
             args[5] = data;
-            if (SW_OK != sw_uk_if(args))
-            {
-                return SW_FAIL;
-            }
         }
 #else
         return SW_NOT_SUPPORTED;
@@ -83,10 +79,6 @@
             args[3] = phy;
             args[4] = reg;
             args[5] = (a_uint32_t) & tmp;
-            if (SW_OK != sw_uk_if(args))
-            {
-                return SW_FAIL;
-            }
             *data = *((a_uint16_t *)&tmp);
         }
 #else

src/shell/shell_io.c

diff --git a/src/shell/shell_io.c b/src/shell/shell_io.c
index 3c151ae..fcede65 100755
--- a/src/shell/shell_io.c
+++ b/src/shell/shell_io.c
@@ -2214,13 +2214,9 @@
     {
         dprintf("YES");
     }
-    else if (A_FALSE == val)
-    {
-        dprintf("NO");
-    }
     else
     {
-        dprintf("UNKNOW");
+        dprintf("NO");
     }
 
     return;
@@ -2249,7 +2245,6 @@
 cmd_data_check_portmap(char *cmdstr, fal_pbmp_t * val, a_uint32_t size)
 {
     char *tmp = NULL, *str_save;
-    a_uint32_t i = 0;
     a_uint32_t port;
 
     *val = 0;
@@ -2262,11 +2257,6 @@
     tmp = (void *) strtok_r(cmdstr, ",", &str_save);
     while (tmp)
     {
-        if (SW_MAX_NR_PORT <= i)
-        {
-            return SW_BAD_VALUE;
-        }
-
         sscanf(tmp, "%d", &port);
         if (SW_MAX_NR_PORT <= port)
         {

src/shell/shell_lib.c

diff --git a/src/shell/shell_lib.c b/src/shell/shell_lib.c
index e0aad30..b2a9555 100755
--- a/src/shell/shell_lib.c
+++ b/src/shell/shell_lib.c
@@ -644,7 +644,7 @@
         }
 
     }
-    else if (cmd_nr > 1)
+    else
     {
         if (FULL_MATCHED(pmatch_nr, pmatch_id))
         {
@@ -663,7 +663,7 @@
                 }
 
             }
-            else if (cmd_nr == 3)
+            else
             {
                 int pmatch_act_nr = 0, pmatch_act_id = GCMD_DESC_NO_MATCH;
                 pmatch_act_nr = search_cmd_action(pmatch_id, &pmatch_act_id, tmp_str[1], tmp_str[2], is_print);