Commit 2b04f8bf authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

devmem2: use a patch that actually applies

The patch provided by Colin Didier and Maxime Hadjinlian was not
applying properly. Fixes:

  http://autobuild.buildroot.org/results/c45/c45eb706fb35ffc87fede777c3d20479a90872ae/



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 2a50b081
Loading
Loading
Loading
Loading
+16 −13
Original line number Diff line number Diff line
From 15eae3dbb3d6824a0fd478e2ce0fe879496bb72c Mon Sep 17 00:00:00 2001
From: Colin Didier <colin.didier@devialet.com>
Date: Thu, 19 Jun 2014 16:58:19 +0200
Subject: [PATCH] be coherent in type usage
From 6570e7afe1eebd64022b871b9ebd9a76be267f57 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 29 Jun 2014 16:27:49 +0200
Subject: [PATCH] Be coherent in type usage

- no need to use off_t because it is read from strtoul()
- print unsigned int type correctly
@@ -10,12 +10,13 @@ When built with _FILE_OFFSET_BITS=64, off_t becomes an long long int
and was printed as an unsigned int which lead to a garbled output.

Signed-off-by: Colin Didier <colin.didier@devialet.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 devmem2.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/devmem2.c b/devmem2.c
index 7732ecb..1ae06ef 100644
index 7732ecb..7aa5c79 100644
--- a/devmem2.c
+++ b/devmem2.c
@@ -58,8 +58,7 @@
@@ -33,7 +34,7 @@ index 7732ecb..1ae06ef 100644
 			exit(2);
 	}
-    printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); 
+    printf("Value at address 0x%lX (%p): 0x%lX\n", target, virt_addr, read_result);
+    printf("Value at address 0x%lX (%p): 0x%X\n", target, virt_addr, read_result); 
     fflush(stdout);
 
 	if(argc > 3) {
@@ -42,8 +43,10 @@ index 7732ecb..1ae06ef 100644
 				break;
 		}
-		printf("Written 0x%X; readback 0x%X\n", writeval, read_result); 
+		printf("Written 0x%lX; readback 0x%lX\n", writeval, read_result);
+		printf("Written 0x%lX; readback 0x%X\n", writeval, read_result); 
 		fflush(stdout);
 	}
 	
-- 
2.0.0