From: Adrian Remonda <adrianremonda@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: adrianremonda@gmail.com, broonie@kernel.org, corbet@lwn.net,
linux-spi@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] Added input buffer from the terminal.
Date: Sat, 7 Mar 2015 12:56:34 -0500 [thread overview]
Message-ID: <1425750995-18176-4-git-send-email-adrianremonda@gmail.com> (raw)
In-Reply-To: <1425750995-18176-3-git-send-email-adrianremonda@gmail.com>
Now it is possible to send string and hexadecimal data as an input parameter
modified: Documentation/spi/spidev_test.c
Signed-off-by: Adrian Remonda <adrianremonda@gmail.com>
---
Documentation/spi/spidev_test.c | 76 ++++++++++++++++++++++++++++++---------
1 file changed, 60 insertions(+), 16 deletions(-)
diff --git a/Documentation/spi/spidev_test.c b/Documentation/spi/spidev_test.c
index a247b3dbf65a..5660cd5fd18f 100644
--- a/Documentation/spi/spidev_test.c
+++ b/Documentation/spi/spidev_test.c
@@ -37,6 +37,18 @@ static uint32_t speed = 500000;
static uint16_t delay;
static int verbose;
+uint8_t default_tx[] = {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x40, 0x00, 0x00, 0x00, 0x00, 0x95,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xF0, 0x0D,
+};
+
+uint8_t default_rx[ARRAY_SIZE(default_tx)] = {0, };
+char *input_tx;
+
static void hexDump(const void *src, size_t length, size_t bLine, char *prefix)
{
int i = 0;
@@ -64,23 +76,38 @@ static void hexDump(const void *src, size_t length, size_t bLine, char *prefix)
}
}
-static void transfer(int fd)
+/*
+ * Unescape - process hexadecimal escape character
+ * converts shell input "\x23" -> 0x23
+ */
+int unespcape(char *dst, char *src, size_t len)
+{
+ int ret = 0;
+ char *pSrc = src;
+ char *pDst = dst;
+ unsigned int ch;
+
+ while (*pSrc) {
+ if (*pSrc == '\\' && *(pSrc+1) == 'x') {
+ sscanf(pSrc + 2, "%2x", &ch);
+ pSrc += 4;
+ *pDst++ = (unsigned char)ch;
+ } else {
+ *pDst++ = *pSrc++;
+ }
+ ret++;
+ }
+ return ret;
+}
+
+static void transfer(int fd, uint8_t const *tx, uint8_t const *rx, size_t len)
{
int ret;
- uint8_t tx[] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x40, 0x00, 0x00, 0x00, 0x00, 0x95,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xDE, 0xAD, 0xBE, 0xEF, 0xBA, 0xAD,
- 0xF0, 0x0D,
- };
- uint8_t rx[ARRAY_SIZE(tx)] = {0, };
+
struct spi_ioc_transfer tr = {
.tx_buf = (unsigned long)tx,
.rx_buf = (unsigned long)rx,
- .len = ARRAY_SIZE(tx),
+ .len = len,
.delay_usecs = delay,
.speed_hz = speed,
.bits_per_word = bits,
@@ -106,8 +133,8 @@ static void transfer(int fd)
pabort("can't send spi message");
if (verbose)
- hexDump(tx, ARRAY_SIZE(tx), 32, "TX");
- hexDump(rx, ARRAY_SIZE(rx), 32, "RX");
+ hexDump(tx, len, 32, "TX");
+ hexDump(rx, len, 32, "RX");
}
static void print_usage(const char *prog)
@@ -124,6 +151,7 @@ static void print_usage(const char *prog)
" -C --cs-high chip select active high\n"
" -3 --3wire SI/SO signals shared\n"
" -v --verbose Verbose (show tx buffer)\n"
+ " -p Send data (e.g. \"1234\\xde\\xad\")\n"
" -N --no-cs no chip select\n"
" -R --ready slave pulls low to pause\n"
" -2 --dual dual transfer\n"
@@ -154,7 +182,7 @@ static void parse_opts(int argc, char *argv[])
};
int c;
- c = getopt_long(argc, argv, "D:s:d:b:lHOLC3NR24:v", lopts, NULL);
+ c = getopt_long(argc, argv, "D:s:d:b:lHOLC3NR24p:v", lopts, NULL);
if (c == -1)
break;
@@ -199,6 +227,9 @@ static void parse_opts(int argc, char *argv[])
case 'R':
mode |= SPI_READY;
break;
+ case 'p':
+ input_tx = optarg;
+ break;
case '2':
mode |= SPI_TX_DUAL;
break;
@@ -222,6 +253,9 @@ int main(int argc, char *argv[])
{
int ret = 0;
int fd;
+ uint8_t *tx;
+ uint8_t *rx;
+ int size;
parse_opts(argc, argv);
@@ -266,7 +300,17 @@ int main(int argc, char *argv[])
printf("bits per word: %d\n", bits);
printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000);
- transfer(fd);
+ if (input_tx) {
+ size = strlen(input_tx+1);
+ tx = (uint8_t *)malloc(size);
+ rx = (uint8_t *)malloc(size);
+ size = unespcape((char *)tx, input_tx, size);
+ transfer(fd, tx, rx, size);
+ free(rx);
+ free(tx);
+ } else {
+ transfer(fd, default_tx, default_rx, sizeof(default_tx));
+ }
close(fd);
--
1.7.10.4
next prev parent reply other threads:[~2015-03-07 17:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-07 17:56 [PATCH 0/4] spi: spidev_test: Added functionalities Adrian Remonda
2015-03-07 17:56 ` Adrian Remonda
2015-03-07 17:56 ` [PATCH 1/4] Cleaned hexadecimal dump Adrian Remonda
2015-03-07 17:56 ` [PATCH 2/4] Added verbose output Adrian Remonda
2015-03-07 17:56 ` Adrian Remonda [this message]
2015-03-07 17:56 ` [PATCH 4/4] Moved spidev_tools.c to tools/spi Adrian Remonda
2015-03-09 18:38 ` [PATCH 3/4] Added input buffer from the terminal Mark Brown
2015-03-08 2:22 ` [PATCH 1/4] Cleaned hexadecimal dump Joe Perches
2015-03-08 10:53 ` Andy Shevchenko
2015-03-08 16:20 ` Joe Perches
2015-03-09 13:51 ` Geert Uytterhoeven
2015-03-09 13:51 ` Geert Uytterhoeven
2015-03-09 18:40 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425750995-18176-4-git-send-email-adrianremonda@gmail.com \
--to=adrianremonda@gmail.com \
--cc=broonie@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.