Support more channels for 16 bit ports

[pes-rpp/rpp-test-sw.git] / rpp-test-sw / commands / cmd_port.c

diff --git a/rpp-test-sw/commands/cmd_port.c b/rpp-test-sw/commands/cmd_port.c
index e20d83502fff92100ab974806bfcdaa795ce969c..5f404d73bc08b06b735770f365086917a40ce151 100644 (file)
--- a/rpp-test-sw/commands/cmd_port.c
+++ b/rpp-test-sw/commands/cmd_port.c
@@ -30,6 +30,7 @@
 #ifdef TARGET_HAS_SPI
 #include "drv/spi.h"
 #endif
+#include <drv/endian.h>
 #include "cmdproc_utils.h"
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -43,18 +44,18 @@ int cmd_do_port_list(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
        for (i = 0; i < ARRAY_SIZE(port_desc); i++) {
                const struct port_desc *port = &port_desc[i];
                const char *rw[4] = { "N/A", "WO", "RO", "RW" };
-               const char *type = "";
+               char note[30] = "";
 #ifdef TARGET_HAS_SPI
                if (port->set == port_spi_set)
-                       type = "SPI";
+                       snprintf(note, sizeof(note), "SPI, %s", port->cfg.spi.chip);
 #endif
                rpp_sci_printf("%-10s %s %dx%db%s%s%s\r\n",
                                           port->name,
                                           rw[(port->set ? 1 : 0) | (port->get ? 2 : 0)],
                                           port->numchn, port->bpch,
-                                          *type ? " (": "",
-                                          type,
-                                          *type ? ")" : "");
+                                          *note ? " (": "",
+                                          note,
+                                          *note ? ")" : "");
        }
        return 1;
 }
@@ -107,14 +108,30 @@ int cmd_do_port_val(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
                        return cmd_opchar_replong(cmd_io, param, value, 0, 16);
                }
                case 16: {
-                       uint16_t value;
-                       ret = sscanf(param[2], "%hi", &value);
-                       if (ret == EOF || ret == 0)
-                               break;
-                       ret = port->set(port, &value, sizeof(value));
+                       uint16_t value[8];
+                       int i, n;
+                       char *p = param[2];
+                       assert(port->numchn <= ARRAY_SIZE(value));
+
+                       for (i = 0; i < port->numchn; i++) {
+                               ret = sscanf(param[2], "%hi%n", &value[i], &n);
+                               if (ret == EOF || ret == 0)
+                                       break;
+                               value[i] = cpu_to_be16(value[i]);
+                               p += n;
+                       }
+
+                       ret = port->set(port, &value, port->numchn * 2);
                        if (ret == FAILURE)
                                return -CMDERR_WRPERM;
-                       return cmd_opchar_replong(cmd_io, param, value, 0, 16);
+                       if (port->numchn == 1)
+                               return cmd_opchar_replong(cmd_io, param, be16_to_cpu(value[0]), 0, 16);
+                       else {
+                               for (i = 0; i < port->numchn; i++)
+                                       rpp_sci_printf("%#x ", be16_to_cpu(value[i]));
+                               rpp_sci_printf("\n");
+                               return 0;
+                       }
                }
                case 24: {
                        uint32_t value;