Changeset 7e752b2 in mainline for uspace/srv/hid

Timestamp:

2010-11-26T01:33:20Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bf61d3a

Parents:

202f57b

Message:

• correct printf() formatting strings and corresponding arguments
• minor cstyle changes and other small fixes

Location:

uspace/srv/hid

Files:

• console/console.c (modified) (2 diffs)
• console/gcons.c (modified) (1 diff)
• fb/serial_console.c (modified) (3 diffs)
• s3c24xx_ts/s3c24xx_ts.c (modified) (2 diffs)

uspace/srv/hid/console/console.c

@@ -804 +804 @@
                         if (screenbuffer_init(&consoles[i].scr,
                             fb_info.cols, fb_info.rows) == NULL) {
-                                printf(NAME ": Unable to allocate screen buffer %u\n", i);
+                                printf(NAME ": Unable to allocate screen buffer %zu\n", i);
                                 return false;
                         }
@@ -813 +813 @@
                         
                         char vc[DEVMAP_NAME_MAXLEN + 1];
-                        snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%u", NAMESPACE, i);
+                        snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i);
                         
                         if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {

uspace/srv/hid/console/gcons.c

@@ -157 +157 @@
                 
                 char data[5];
-                snprintf(data, 5, "%u", index + 1);
+                snprintf(data, 5, "%zu", index + 1);
                 
                 size_t i;

uspace/srv/hid/fb/serial_console.c

@@ -47 +47 @@
 #include <io/style.h>
 #include <str.h>
+#include <inttypes.h>
 #include <io/screenbuffer.h>
 
@@ -135 +136 @@
         
         char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1);
+        snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f",
+            row + 1, col + 1);
         serial_puts(control);
 }
@@ -253 +255 @@
 {
         char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[0;%ur", last_row);
+        snprintf(control, MAX_CONTROL, "\033[0;%" PRIun "r", last_row);
         serial_puts(control);
 }

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -50 +50 @@
 #include <sysinfo.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "s3c24xx_ts.h"
@@ -136 +137 @@
         ts->last_y = 0;
 
-        printf(NAME ": device at physical address 0x%x, inr %d.\n",
-            ts->paddr, inr);
+        printf(NAME ": device at physical address %p, inr %" PRIun ".\n",
+            (void *) ts->paddr, inr);
 
         async_set_interrupt_received(s3c24xx_ts_irq_handler);