blob: 2a57f29891d680658232d6ee69e8bf1dee601ff3 [file] [log] [blame]
Armin Kuster066be202018-07-08 14:58:53 -07001From 1360a907879dd24041797a3b709d49aeac2ab444 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 29 May 2018 16:55:42 -0400
4Subject: [PATCH] devmem.c: ensure word is 32-bit and add support for 64-bit
5 long
6
7Signed-off-by: Denys Dmytriyenko <denys@ti.com>
8---
9 devmem2.c | 23 +++++++++++++++++------
10 1 file changed, 17 insertions(+), 6 deletions(-)
11
12diff --git a/devmem2.c b/devmem2.c
13index 5845381..68131b2 100644
14--- a/devmem2.c
15+++ b/devmem2.c
16@@ -39,6 +39,7 @@
17
18 #include <stdio.h>
19 #include <stdlib.h>
20+#include <stdint.h>
21 #include <unistd.h>
22 #include <string.h>
23 #include <errno.h>
24@@ -69,7 +70,7 @@ int main(int argc, char **argv) {
25 if(argc < 2) {
26 fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n"
27 "\taddress : memory address to act upon\n"
28- "\ttype : access operation type : [b]yte, [h]alfword, [w]ord\n"
29+ "\ttype : access operation type : [b]yte, [h]alfword, [w]ord, [l]ong\n"
30 "\tdata : data to be written\n\n",
31 argv[0]);
32 exit(1);
33@@ -103,9 +104,14 @@ int main(int argc, char **argv) {
34 read_result = *((unsigned short *) virt_addr);
35 break;
36 case 'w':
37- data_size = sizeof(unsigned long);
38+ data_size = sizeof(uint32_t);
39 virt_addr = fixup_addr(virt_addr, data_size);
40- read_result = *((unsigned long *) virt_addr);
41+ read_result = *((uint32_t *) virt_addr);
42+ break;
43+ case 'l':
44+ data_size = sizeof(uint64_t);
45+ virt_addr = fixup_addr(virt_addr, data_size);
46+ read_result = *((uint64_t *) virt_addr);
47 break;
48 default:
49 fprintf(stderr, "Illegal data type '%c'.\n", access_type);
50@@ -129,9 +135,14 @@ int main(int argc, char **argv) {
51 read_result = *((unsigned short *) virt_addr);
52 break;
53 case 'w':
54- virt_addr = fixup_addr(virt_addr, sizeof(unsigned long));
55- *((unsigned long *) virt_addr) = write_val;
56- read_result = *((unsigned long *) virt_addr);
57+ virt_addr = fixup_addr(virt_addr, sizeof(uint32_t));
58+ *((uint32_t *) virt_addr) = write_val;
59+ read_result = *((uint32_t *) virt_addr);
60+ break;
61+ case 'l':
62+ virt_addr = fixup_addr(virt_addr, sizeof(uint64_t));
63+ *((uint64_t *) virt_addr) = write_val;
64+ read_result = *((uint64_t *) virt_addr);
65 break;
66 }
67 sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, "
68--
692.7.4
70