#ifndef DOCGEN
#include "rpp/rpp.h"
-#include "drv/digital_io_def.h"
+#include "drv/port.h"
+#ifdef TARGET_HAS_SPI
+#include "drv/spi.h"
+#endif
#include "cmdproc_utils.h"
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
int cmd_do_port_list(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
{
uint32_t i;
- char *portInterface;
rpp_sci_printf("List of all defined ports with its type. Those names can be used by portval command.\r\n");
- uint32_t port_cnt = rpp_port_get_port_cnt();
- const char* port_names[16];
- rpp_port_get_port_names(port_names, port_cnt);
-
- for (i = 0; i < port_cnt; i++) {
- if (strcmp(port_names[i], DIO_PIN_NAME_UNUSED) == 0) continue;
- int8_t port_interface = rpp_port_get_interface_type(port_names[i]);
- if (port_interface == 2)
- portInterface = "SPI";
- else if (port_interface == 3)
- portInterface = "GPIO";
- else if (port_interface == 1)
- portInterface = "ADC";
- else
- portInterface = "UNKNOWN";
- rpp_sci_printf("%s, %s\r\n", port_names[i], portInterface);
+
+ 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" };
+ char note[30] = "";
+#ifdef TARGET_HAS_SPI
+ if (port->set == port_spi_set)
+ 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,
+ *note ? " (": "",
+ note,
+ *note ? ")" : "");
}
return 1;
}
+static const struct port_desc *port_from_name(const char *port_name)
+{
+ uint32_t i;
+ for (i = 0; i < ARRAY_SIZE(port_desc); i++)
+ if (strcmp(port_name, port_desc[i].name) == 0)
+ return &port_desc[i];
+ return NULL;
+}
/**
* @brief Read values from specified port
*/
int cmd_do_port_val(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
{
- char *p;
- int i;
int32_t ret;
- uint32_t values[MAX_PARAM_VALUES_NUM];
+ int i;
char portName[32];
- char *token;
- uint32_t numParams;
- int32_t port_pin_cnt = rpp_port_get_pin_cnt(portName);
- p = param[1];
- if (sscanf(p, "%31s ", portName) != 1)
+ if (sscanf(param[1], "%31s ", portName) != 1)
return -CMDERR_BADPAR;
- int8_t port_interface = rpp_port_get_interface_type(portName);
- if (port_interface == FAILURE) return -CMDERR_BADREG;
+ const struct port_desc *port = port_from_name(portName);
+ if (!port)
+ return -CMDERR_BADPAR;
if (param[2] != NULL) { // More parameters = set values
- p = param[2];
- if (port_interface == 3)
- // Information about pin values are encoded as hexadecimal 8b value
- numParams = port_pin_cnt/8+1;
- else if (port_interface == 2)
- // Commands are passed as bytes
- numParams = port_pin_cnt;
- else if (port_interface == 1)
- return -CMDERR_BADPAR; // ADC is read only and no other port is supported
- token = strtok(p, " ");
- i = 0;
- while (i < numParams && token != NULL) {
- if (sscanf(token, "%x", &values[i]) == EOF)
+ if (!port->set)
+ return -CMDERR_WRPERM;
+
+ switch (port->bpch) {
+ case 1: {
+ uint32_t value;
+ ret = sscanf(param[2], "%i", &value);
+ if (ret == EOF || ret == 0)
+ return -CMDERR_BADPAR;
+
+ ret = port->set(port, &value, sizeof(value));
+ if (ret == FAILURE)
+ return -CMDERR_WRPERM;
+ 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;
- token = strtok(NULL, " ");
- i++;
+ value = cpu_to_be16(value);
+ ret = port->set(port, &value, sizeof(value));
+ if (ret == FAILURE)
+ return -CMDERR_WRPERM;
+ return cmd_opchar_replong(cmd_io, param, be16_to_cpu(value), 0, 16);
}
+ case 24: {
+ uint32_t value;
+ ret = sscanf(param[2], "%i", &value);
+ if (ret == EOF || ret == 0 || (value & 0xff000000))
+ return -CMDERR_BADPAR;
- if (i != numParams || token != NULL)
- return -CMDERR_BADPAR;
- ret = rpp_port_set_val(portName, port_pin_cnt, values);
- if (ret == FAILURE) {
- return -CMDERR_WRPERM;
+ char v[3] = { (value >> 16) & 0xff, (value >> 8) & 0xff, (value >> 0) & 0xff };
+
+ ret = port->set(port, &v, sizeof(v));
+ if (ret == FAILURE)
+ return -CMDERR_WRPERM;
+ value = v[0] << 16 | v[1] << 8 | v[2];
+ return cmd_opchar_replong(cmd_io, param, value, 0, 16);
}
+ case 32: {
+ uint32_t value;
+ ret = sscanf(param[2], "%i", &value);
+ if (ret == EOF || ret == 0)
+ return -CMDERR_BADPAR;
- return cmd_opchar_replong(cmd_io, param, ret, 0, 16);
- }
- else {
- ret = rpp_port_get_val(portName, port_pin_cnt, values);
- if (ret == FAILURE) {
+ char v[4] = { (value >> 24) & 0xff, (value >> 16) & 0xff, (value >> 8) & 0xff, (value >> 0) & 0xff };
+
+ ret = port->set(port, &v, sizeof(v));
+ if (ret == FAILURE)
+ return -CMDERR_WRPERM;
+ value = v[0] << 24 | v[1] << 16 | v[2] << 8 | v[3];
+ return cmd_opchar_replong(cmd_io, param, value, 0, 16);
+ }
+ default:
+ rpp_sci_printf("Unsupported bits-per-channel value: %d\n", port->bpch);
+ return -CMDERR_NODEV;
+ }
+ } else { /* Get values from port */
+ if (!port->get)
return -CMDERR_RDPERM;
+
+ /* Workaround for cmd_opchar_replong() to work */
+ param[2] = param[0] + strlen(param[0]);
+
+ switch (port->bpch) {
+ case 1: {
+ uint32_t value = 0;
+ ret = port->get(port, &value, sizeof(value));
+ if (ret == FAILURE)
+ return -CMDERR_RDPERM;
+ return cmd_opchar_replong(cmd_io, param, value, 0, 16);
+ }
+ case 16: {
+ uint16_t values[16] = {0};
+ if (port->numchn > ARRAY_SIZE(values))
+ return -CMDERR_BADCFG;
+ ret = port->get(port, &values, sizeof(values));
+ if (ret == FAILURE)
+ return -CMDERR_RDPERM;
+
+ if (port->numchn == 1)
+ return cmd_opchar_replong(cmd_io, param, values[0], 0, 16);
+ else {
+ rpp_sci_printf("%*s=", param[2] - param[0], param[0]);
+ for (i = 0; i < port->numchn; i++)
+ rpp_sci_printf(" %hx", values[i]);
+ rpp_sci_printf("\n");
+ return 0;
+ }
}
- for (i = 0; i < port_pin_cnt; i++) {
- rpp_sci_printf("%d\r\n", values[i]);
+ default:
+ rpp_sci_printf("Unsupported bits-per-channel value: %d\n", port->bpch);
+ return -CMDERR_NODEV;
}
- rpp_sci_printf("portval%s=%x\n", portName, ret);
- return 0;
}
+ return 0;
}
#endif /* DOCGEN */
"portval*","Read or write values from or to the port",
"### Command syntax ###\n"
"\n"
- " portval<NAME> <VAL>\n"
+ " portval<NAME> <VAL> [<VAL> ...]\n"
" portval<NAME>\n"
"where\n"
"\n"
"- `<NAME>` is a string specifying the name of the port\n"
- "- `<VAL>` is a sequence of hexadecimal numbers, separated by spaces, e.g. 12 AA CD\n\n"
+ "- `<VAL>` is decimal, hexdecimal (0x) or octal (0) number\n"
"\n"
"### Description ###\n"
"\n"
- "This command sets or gets values of all pins on the specified port.\n"
- "If the port is connected to the GPIO interface of the MCU, then\n"
- "when writing the value, the lowest significant bit of the argument\n"
- "is assigned to the first pin, the second bit is assigned to the\n"
- "second pin, etc. The command returns zero.\n"
- "When reading from the port, the command returns values for each pin.\n"
+ "This command sets (when VAL is present) or gets (without VAL) values\n"
+ "of all channels of the specified port. For digital IO ports (1 bit per\n"
+ "channel), the least significant bit of the VAL corresponds to the\n"
+ "first pin, the second bit to the second pin, etc.\n"
"\n"
- "If the port is connected to the SPI interface of the MCU, then\n"
- "it is write only and the argument is interpreted as a command for\n"
- "the port controller. The command returns the response from the\n"
- "port controller.\n"
- "For command examples please refer to the project wiki\n"
+ "The set variant of the command returns a value that depends on the\n"
+ "port type. For digital IO, this is the value set, for SPI ports this\n"
+ "is the SPI response.\n"
"\n"
- "If the port is connected to the ADC interface of the MCU, then\n"
- "it is read only and returns values for each ADC pin.\n"
+ "The get variant returns the value read from the port.\n"
+ "\n"
+ "If the port represents an SPI interface of the MCU, then it is write\n"
+ "only and the argument is interpreted as a command for the port\n"
+ "controller.\n"
+ "\n"
+ "If the port is represents the ADC interface of the MCU, it is read\n"
+ "only and returns values for each ADC pin.\n"
"\n"
"Port names and interface type can be obtained with the portlist\n"
"command.\n"
"\n"
"### Example ###\n"
"\n"
- " --> portvalGIOB 3A\n"
- " portvalGIOB=0\n"
+ " --> portvalGIOB 0x3A\n"
+ " portvalGIOB=0x3a\n"
" --> portvalGIOB\n"
- " 0\n"
- " 1\n"
- " 0\n"
- " 1\n"
- " 1\n"
- " 1\n"
- "\n"
+ " portvalGIOB=0x3a\n"
"This pair of commands sets:\nGIOB"
"GIOB=0\n"
"GIOB=1\n"
"### Description ###\n"
"\n"
"This command prints the list of all defined ports accessible via the\n"
- "portval command. Each record of the list is a couple of\n"
- "PortName-PortInterface, where PortInterface is SPI, ADC or GPIO.\n"
- "The type of the MCU<->port interface slightly modifies the meaning\n"
- "of the portval command."
+ "portval command. Each line contains port name, read/write type, number\n"
+ "of channels and width of the channel in bits.\n"
"\n"
"### Example ###\n"
"\n"
" --> portlist\n"
" List of all defined ports with its type. Those names can be used by portval command.\n"
- " GIOA, GPIO\n"
- " GIOB, GPIO\n"
- " NHET1, GPIO\n"
- " ADC, ADC\n",
+ " GIOA RW 8x1b\n"
+ " GIOB RW 8x1b\n"
+ " NHET RW 30x1b\n"
+ " ADC RO 16x12b\n",
CMD_HANDLER(cmd_do_port_list), (void *)&cmd_list_port
};
projects / pes-rpp / rpp-test-sw.git / blobdiff