Changeset 3f6c16fe in mainline

Timestamp:

2012-11-22T22:48:03Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

711a38b

Parents:

e32720ff

Message:

Fix integer vs. pointer comparisons and assignments, printf() formatters.

File:

• kernel/generic/src/console/cmd.c (modified) (6 diffs)

kernel/generic/src/console/cmd.c

@@ -696 +696 @@
         uint8_t *ptr = NULL;
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
-                ptr = argv[0].intval;
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
+                ptr = (void *) argv[0].intval;
         else
 #endif
-                ptr = (uint8_t*)km_map(argv[0].intval, sizeof(uint8_t), PAGE_NOT_CACHEABLE);
+                ptr = (uint8_t*) km_map(argv[0].intval, sizeof(uint8_t),
+                    PAGE_NOT_CACHEABLE);
         const uint8_t val = pio_read_8(ptr);
-        printf("read %x: %"PRIx8"\n", argv[0].intval, val);
+        printf("read %"PRIxn": %"PRIx8"\n", argv[0].intval, val);
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
@@ -721 +722 @@
         uint16_t *ptr = NULL;
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
-                ptr = argv[0].intval;
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
+                ptr = (void *)argv[0].intval;
         else
 #endif
-                ptr = (uint16_t*)km_map(argv[0].intval, sizeof(uint16_t), PAGE_NOT_CACHEABLE);
+                ptr = (uint16_t*)km_map(argv[0].intval, sizeof(uint16_t),
+                    PAGE_NOT_CACHEABLE);
         const uint16_t val = pio_read_16(ptr);
-        printf("read %x: %"PRIx16"\n", argv[0].intval, val);
+        printf("read %"PRIxn": %"PRIx16"\n", argv[0].intval, val);
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
@@ -746 +748 @@
         uint32_t *ptr = NULL;
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
-                ptr = argv[0].intval;
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
+                ptr = (void *) argv[0].intval;
         else
 #endif
-                ptr = (uint32_t*)km_map(argv[0].intval, sizeof(uint32_t), PAGE_NOT_CACHEABLE);
+                ptr = (uint32_t*)km_map(argv[0].intval, sizeof(uint32_t),
+                    PAGE_NOT_CACHEABLE);
         const uint32_t val = pio_read_32(ptr);
-        printf("read %#x: %#"PRIx32"\n", argv[0].intval, val);
+        printf("read %"PRIxn": %"PRIx32"\n", argv[0].intval, val);
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
@@ -771 +774 @@
         uint8_t *ptr = NULL;
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
-                ptr = argv[0].intval;
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
+                ptr = (void *) argv[0].intval;
         else
 #endif
-                ptr = (uint8_t*)km_map(argv[0].intval, sizeof(uint8_t), PAGE_NOT_CACHEABLE);
-        printf("write %x: %"PRIx8"\n", argv[0].intval, (uint8_t)argv[1].intval);
+                ptr = (uint8_t*)km_map(argv[0].intval, sizeof(uint8_t),
+                    PAGE_NOT_CACHEABLE);
+        printf("write %"PRIxn": %"PRIx8"\n", argv[0].intval,
+            (uint8_t)argv[1].intval);
         pio_write_8(ptr, (uint8_t)argv[1].intval);
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
@@ -796 +801 @@
         uint16_t *ptr = NULL;
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
-                ptr = argv[0].intval;
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
+                ptr = (void *) argv[0].intval;
         else
 #endif
-                ptr = (uint16_t*)km_map(argv[0].intval, sizeof(uint16_t), PAGE_NOT_CACHEABLE);
-        printf("write %x: %"PRIx16"\n", argv[0].intval, (uint16_t)argv[1].intval);
+                ptr = (uint16_t*)km_map(argv[0].intval, sizeof(uint16_t),
+                    PAGE_NOT_CACHEABLE);
+        printf("write %"PRIxn": %"PRIx16"\n", argv[0].intval,
+            (uint16_t)argv[1].intval);
         pio_write_16(ptr, (uint16_t)argv[1].intval);
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
@@ -821 +828 @@
         uint32_t *ptr = NULL;
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
-                ptr = argv[0].intval;
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
+                ptr = (void *) argv[0].intval;
         else
 #endif
-                ptr = (uint32_t*)km_map(argv[0].intval, sizeof(uint32_t), PAGE_NOT_CACHEABLE);
-        printf("write %x: %"PRIx32"\n", argv[0].intval, (uint32_t)argv[1].intval);
+                ptr = (uint32_t*)km_map(argv[0].intval, sizeof(uint32_t),
+                    PAGE_NOT_CACHEABLE);
+        printf("write %"PRIxn": %"PRIx32"\n", argv[0].intval,
+            (uint32_t)argv[1].intval);
         pio_write_32(ptr, (uint32_t)argv[1].intval);
 #ifdef IO_SPACE_BOUNDARY
-        if (argv->intval < IO_SPACE_BOUNDARY)
+        if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif