Changeset 80f7c54 in mainline for uspace/app

Timestamp:

2018-01-27T14:37:17Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

bf0398c

Parents:

77733a9

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-27 14:37:07)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-27 14:37:17)

Message:

usb: make the code compile on 32-bit architecture

Location:

uspace/app/tmon

Files:

• burst_tests.c (modified) (1 diff)
• list.c (modified) (2 diffs)
• resolve.c (modified) (2 diffs)
• tf.c (modified) (1 diff)

uspace/app/tmon/burst_tests.c

@@ -128 +128 @@
 /** Static array of units with decreasing factors. */
 static const tmon_unit_t units[] = {
-        { .prefix = 'E', .factor = 1ul << 60 },
-        { .prefix = 'P', .factor = 1ul << 50 },
-        { .prefix = 'T', .factor = 1ul << 40 },
-        { .prefix = 'G', .factor = 1ul << 30 },
-        { .prefix = 'M', .factor = 1ul << 20 },
-        { .prefix = 'k', .factor = 1ul << 10 }
+        { .prefix = 'E', .factor = ((uint64_t) 1) << 60 },
+        { .prefix = 'P', .factor = ((uint64_t) 1) << 50 },
+        { .prefix = 'T', .factor = ((uint64_t) 1) << 40 },
+        { .prefix = 'G', .factor = ((uint64_t) 1) << 30 },
+        { .prefix = 'M', .factor = ((uint64_t) 1) << 20 },
+        { .prefix = 'k', .factor = ((uint64_t) 1) << 10 }
 };
 

uspace/app/tmon/list.c

@@ -53 +53 @@
 
         if ((rc = devman_fun_sid_to_handle(svc, &diag_handle))) {
-                printf(NAME ": Error resolving handle of device with SID %ld, skipping.\n", svc);
+                printf(NAME ": Error resolving handle of device with SID %" PRIun ", skipping.\n", svc);
                 return;
         }
@@ -59 +59 @@
         char path[MAX_PATH_LENGTH];
         if ((rc = devman_fun_get_path(diag_handle, path, sizeof(path)))) {
-                printf(NAME ": Error resolving path of device with SID %ld, skipping.\n", svc);
+                printf(NAME ": Error resolving path of device with SID %" PRIun ", skipping.\n", svc);
                 return;
         }

uspace/app/tmon/resolve.c

@@ -69 +69 @@
         if (count != 1) {
                 if (count) {
-                        printf(NAME ": Found %ld devices. Please specify which to use.\n", count);
+                        printf(NAME ": Found %zu devices. Please specify which to use.\n", count);
                 } else {
                         printf(NAME ": No diagnostic devices found.\n");
@@ -77 +77 @@
 
         if ((rc = devman_fun_sid_to_handle(svcs[0], fun))) {
-                printf(NAME ": Error resolving handle of device with SID %ld.\n", svcs[0]);
+                printf(NAME ": Error resolving handle of device with "
+                    "SID %" PRIun ".\n", svcs[0]);
                 return rc;
         }

uspace/app/tmon/tf.c

@@ -69 +69 @@
         char path[MAX_PATH_LENGTH];
         if ((rc = devman_fun_get_path(fun, path, sizeof(path)))) {
-                printf(NAME ": Error resolving path of device with handle %ld. %s\n", fun, str_error(rc));
+                printf(NAME ": Error resolving path of device with handle "
+                    "%" PRIun ". %s\n", fun, str_error(rc));
                 return 1;
         }