devmem2: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 113 insertions, 0 deletions

diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
new file mode 100644
index 0000000000..b99752d478
--- /dev/null
+++ b/meta-oe/recipes-support/devmem2/devmem2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Simple program to read/write from/to any location in memory."
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://devmem2.c;endline=28;md5=dd68f2b0a5184b3db3dc25c99e0bd0cd"
+PR = "r7"
+
+SRC_URI = "http://www.lartmaker.nl/lartware/port/devmem2.c \
+           file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
+S = "${WORKDIR}"
+
+CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
+
+do_compile() {
+        ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install devmem2 ${D}${bindir}
+}
+
+SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
+SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
diff --git a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch b/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch
new file mode 100644
index 0000000000..4517797fc7
--- /dev/null
+++ b/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch
@@ -0,0 +1,91 @@
+--- devmem2.c   2004-08-05 01:55:25.000000000 +0200
++++ devmem2_modif.c     2011-01-13 15:48:37.798799784 +0100
+@@ -45,12 +45,16 @@
+ #define MAP_SIZE 4096UL
+ #define MAP_MASK (MAP_SIZE - 1)
+ 
++static inline void *fixup_addr(void *addr, size_t size);
++
+ int main(int argc, char **argv) {
+     int fd;
+     void *map_base, *virt_addr; 
+-       unsigned long read_result, writeval;
++       unsigned long read_result, write_val;
+        off_t target;
+        int access_type = 'w';
++       char fmt_str[128];
++       size_t data_size;
+        
+        if(argc < 2) {
+                fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n"
+@@ -79,38 +83,51 @@
+     virt_addr = map_base + (target & MAP_MASK);
+     switch(access_type) {
+                case 'b':
++                       data_size = sizeof(unsigned char);
++                       virt_addr = fixup_addr(virt_addr, data_size);
+                        read_result = *((unsigned char *) virt_addr);
+                        break;
+                case 'h':
++                       data_size = sizeof(unsigned short);
++                       virt_addr = fixup_addr(virt_addr, data_size);
+                        read_result = *((unsigned short *) virt_addr);
+                        break;
+                case 'w':
++                       data_size = sizeof(unsigned long);
++                       virt_addr = fixup_addr(virt_addr, data_size);
+                        read_result = *((unsigned long *) virt_addr);
+                        break;
+                default:
+                        fprintf(stderr, "Illegal data type '%c'.\n", access_type);
+                        exit(2);
+        }
+-    printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); 
++       sprintf(fmt_str, "Read at address  0x%%08lX (%%p): 0x%%0%dlX\n", 2*data_size);
++    printf(fmt_str, (unsigned long)target, virt_addr, read_result);
+     fflush(stdout);
+ 
+        if(argc > 3) {
+-               writeval = strtoul(argv[3], 0, 0);
++               write_val = strtoul(argv[3], 0, 0);
+                switch(access_type) {
+                        case 'b':
+-                               *((unsigned char *) virt_addr) = writeval;
++                               virt_addr = fixup_addr(virt_addr, sizeof(unsigned char));
++                               *((unsigned char *) virt_addr) = write_val;
+                                read_result = *((unsigned char *) virt_addr);
+                                break;
+                        case 'h':
+-                               *((unsigned short *) virt_addr) = writeval;
++                               virt_addr = fixup_addr(virt_addr, sizeof(unsigned short));
++                               *((unsigned short *) virt_addr) = write_val;
+                                read_result = *((unsigned short *) virt_addr);
+                                break;
+                        case 'w':
+-                               *((unsigned long *) virt_addr) = writeval;
++                               virt_addr = fixup_addr(virt_addr, sizeof(unsigned long));
++                               *((unsigned long *) virt_addr) = write_val;
+                                read_result = *((unsigned long *) virt_addr);
+                                break;
+                }
+-               printf("Written 0x%X; readback 0x%X\n", writeval, read_result); 
++               sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, "
++                       "readback 0x%%0%dlX\n", 2*data_size, 2*data_size);
++               printf(fmt_str, (unsigned long)target, virt_addr,
++                       write_val, read_result);
+                fflush(stdout);
+        }
+        
+@@ -119,3 +136,12 @@
+     return 0;
+ }
+ 
++static inline void *fixup_addr(void *addr, size_t size)
++{
++#ifdef FORCE_STRICT_ALIGNMENT
++       unsigned long aligned_addr = (unsigned long)addr;
++       aligned_addr &= ~(size - 1);
++       addr = (void *)aligned_addr;
++#endif
++       return addr;
++}