]> rtime.felk.cvut.cz Git - pes-rpp/rpp-test-sw.git/commitdiff
Support more channels for 16 bit ports
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 29 Aug 2015 11:21:33 +0000 (13:21 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 3 Sep 2015 08:30:59 +0000 (10:30 +0200)
rpp-test-sw/commands/cmd_port.c

index 2f7afd0b2fdaf1194c428c951b69d3919a849606..5f404d73bc08b06b735770f365086917a40ce151 100644 (file)
@@ -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))
@@ -107,15 +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;
-                       value = cpu_to_be16(value);
-                       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, be16_to_cpu(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;