From de058a89539f8df331e44150c60e7ec4c1fe0ad5 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 28 Aug 2015 23:41:23 +0200 Subject: [PATCH] Update to changes in SPI API This needs to be tested! --- rpp-test-sw/commands/cmd_spi.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/rpp-test-sw/commands/cmd_spi.c b/rpp-test-sw/commands/cmd_spi.c index 6ad57a9..4bc1e94 100644 --- a/rpp-test-sw/commands/cmd_spi.c +++ b/rpp-test-sw/commands/cmd_spi.c @@ -74,7 +74,7 @@ int cmd_do_spi_translate(cmd_io_t *cmd_io, const struct cmd_des *des, char *para uint8_t spi_test_buf_tx[TEST_BUF]; uint8_t spi_test_buf_rx[TEST_BUF]; -int spimst_print_rx(struct spi_drv *ifc, int status, int addr, uint8_t *buf) +int spimst_print_rx(int status, uint8_t *buf) { int i; @@ -83,7 +83,7 @@ int spimst_print_rx(struct spi_drv *ifc, int status, int addr, uint8_t *buf) return -1; } - rpp_sci_printf("spirx:%#x(", addr); + rpp_sci_printf("spirx:("); for (i = 0; i < status; i++) { rpp_sci_printf("%#x", buf[i]); if (i < status-1) @@ -105,21 +105,19 @@ int spimst_print_rx(struct spi_drv *ifc, int status, int addr, uint8_t *buf) */ int cmd_do_spimst(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[]) { - spi_drv_t *ifc; int i; char *p; char *token; int ret; - unsigned int addr; unsigned int rq_len; - int spi; + enum spi_device dev; int values[MAX_PARAM_VALUES_NUM]; p = param[1]; - if (sscanf(p, "%d", &spi) != 1) + if (sscanf(p, "%d", &i) != 1) return -CMDERR_BADPAR; - p = param[2]; - if (sscanf(p, " %d", &addr) != 1) + dev = (enum spi_device)i; + if (dev >= _SPIDEV_COUNT) return -CMDERR_BADPAR; token = strtok(p, " "); token = strtok(NULL, " "); @@ -132,19 +130,10 @@ int cmd_do_spimst(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[]) i++; } - - ifc = spi_find_drv(NULL, spi); - if (ifc == NULL) - return -CMDERR_NODEV; - - if (!(ifc->flags & SPI_IFC_ON)) - //if (spi_tms570_init(ifc) < 0) - return -CMDERR_BADCFG; - rq_len = i; - ret = spi_transfer(ifc, addr, rq_len, spi_test_buf_tx, spi_test_buf_rx); - spimst_print_rx(ifc, ret, addr, spi_test_buf_rx); + ret = spi_transfer(dev, rq_len, spi_test_buf_tx, spi_test_buf_rx); + spimst_print_rx(ret, spi_test_buf_rx); return 0; } -- 2.39.2