Changeset 84439d7 in mainline for uspace/app

Timestamp:

2010-12-05T09:34:46Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

75732da

Parents:

56b962d (diff), 35537a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with development/

Location:

uspace/app

Files:

• bdsh/cmds/modules/bdd/bdd.c (modified) (2 diffs)
• bdsh/cmds/modules/cp/cp.c (modified) (4 diffs)
• bdsh/cmds/modules/mkfile/mkfile.c (modified) (2 diffs)
• bdsh/cmds/modules/unmount/unmount.c (modified) (2 diffs)
• bdsh/exec.c (modified) (1 diff)
• edit/edit.c (modified) (3 diffs)
• netecho/netecho.c (modified) (4 diffs)
• nettest1/nettest1.c (modified) (2 diffs)
• nettest2/nettest2.c (modified) (3 diffs)
• ping/ping.c (modified) (2 diffs)
• redir/redir.c (modified) (1 diff)
• stats/stats.c (modified) (1 diff)
• taskdump/taskdump.c (modified) (9 diffs)
• tasks/tasks.c (modified) (2 diffs)
• tester/Makefile (modified) (2 diffs)
• tester/hw/serial/serial1.c (moved) (moved from uspace/app/test_serial/test_serial.c ) (4 diffs)
• tester/hw/serial/serial1.def (added)
• tester/ipc/ping_pong.c (modified) (1 diff)
• tester/ipc/register.c (modified) (3 diffs)
• tester/print/print1.c (modified) (1 diff)
• tester/print/print2.c (modified) (1 diff)
• tester/print/print4.c (modified) (2 diffs)
• tester/print/print5.c (added)
• tester/print/print5.def (added)
• tester/stdio/stdio1.c (modified) (1 diff)
• tester/tester.c (modified) (3 diffs)
• tester/tester.h (modified) (2 diffs)
• tester/thread/thread1.c (modified) (2 diffs)
• tester/vfs/vfs1.c (modified) (2 diffs)
• top/screen.c (modified) (4 diffs)
• trace/ipcp.c (modified) (4 diffs)
• trace/trace.c (modified) (13 diffs)
• virtusbkbd/virtusbkbd.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/bdd/bdd.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <str.h>
+#include <sys/typefmt.h>
 #include "config.h"
 #include "util.h"
@@ -122 +123 @@
                 rc = block_read_direct(handle, ba, 1, blk);
                 if (rc != EOK) {
-                        printf("%s: Error reading block %llu\n", cmdname, ba);
+                        printf("%s: Error reading block %" PRIuOFF64 "\n", cmdname, ba);
                         free(blk);
                         block_fini(handle);

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -95 +95 @@
 
         if (vb)
-                printf("%d bytes to copy\n", total);
+                printf("%" PRIu64 " bytes to copy\n", total);
 
         lseek(fd1, 0, SEEK_SET);
@@ -130 +130 @@
                  */
                 if (res != 0) {
-                        printf("\n%d more bytes than actually exist were copied\n", res);
+                        printf("\n%zd more bytes than actually exist were copied\n", res);
                         goto err;
                 }
@@ -187 +187 @@
                         return CMD_SUCCESS;
                 case 'v':
-                        printf("%d\n", CP_VERSION);
+                        printf("%s\n", CP_VERSION);
                         return CMD_SUCCESS;
                 case 'V':
@@ -223 +223 @@
 
         if (verbose)
-                printf("%d bytes copied\n", ret);
+                printf("%" PRId64 " bytes copied\n", ret);
 
         if (ret >= 0)

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -168 +168 @@
                 rc = write(fd, buffer, to_write);
                 if (rc <= 0) {
-                        printf("%s: Error writing file (%d).\n", cmdname, rc);
+                        printf("%s: Error writing file (%zd).\n", cmdname, rc);
                         close(fd);
                         return CMD_FAILURE;
@@ -177 +177 @@
         rc = close(fd);
         if (rc != 0) {
-                printf("%s: Error writing file (%d).\n", cmdname, rc);
+                printf("%s: Error writing file (%zd).\n", cmdname, rc);
                 return CMD_FAILURE;
         }

uspace/app/bdsh/cmds/modules/unmount/unmount.c

@@ -47 +47 @@
         } else {
                 help_cmd_unmount(HELP_SHORT);
-                printf("Usage:  %s <mp>\n", cmdname);
+                printf("Usage: %s <mp>\n", cmdname);
         }
         return;
@@ -68 +68 @@
         rc = unmount(argv[1]);
         if (rc != EOK) {
-                printf("Unable to unmount %s (rc=%d)\n", argv[1]);
+                printf("Unable to unmount %s (rc=%d)\n", argv[1], rc);
                 return CMD_FAILURE;
         }

uspace/app/bdsh/exec.c

@@ -133 +133 @@
         rc = task_wait(tid, &texit, &retval);
         if (rc != EOK) {
-                printf("%s: Failed waiting for command (%s)\n", str_error(rc));
+                printf("%s: Failed waiting for command (%s)\n", progname,
+                    str_error(rc));
         } else if (texit != TASK_EXIT_NORMAL) {
                 printf("%s: Command failed (unexpectedly terminated)\n", progname);

uspace/app/edit/edit.c

@@ -781 +781 @@
                         c = str_decode(row_buf, &pos, size);
                         if (c != '\t') {
-                                printf("%lc", c);
+                                printf("%lc", (wint_t) c);
                                 s_column += 1;
                         } else {
@@ -830 +830 @@
         int n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
             "Ctrl-E Save As", coord.row, coord.column, fname);
-        printf("%*s", scr_columns - 1 - n, "");
+        
+        int pos = scr_columns - 1 - n;
+        printf("%*s", pos, "");
         fflush(stdout);
         console_set_style(con, STYLE_NORMAL);
@@ -1153 +1155 @@
         console_set_pos(con, 0, scr_rows - 1);
         console_set_style(con, STYLE_INVERTED);
-        printf(" %*s ", -(scr_columns - 3), str);
+        
+        int pos = -(scr_columns - 3);
+        printf(" %*s ", pos, str);
         fflush(stdout);
         console_set_style(con, STYLE_NORMAL);

uspace/app/netecho/netecho.c

@@ -220 +220 @@
         // check the buffer size
         if (size <= 0) {
-                fprintf(stderr, "Receive size too small (%d). Using 1024 bytes instead.\n", size);
+                fprintf(stderr, "Receive size too small (%zu). Using 1024 bytes instead.\n", size);
                 size = 1024;
         }
@@ -262 +262 @@
                 // check the backlog
                 if (backlog <= 0) {
-                        fprintf(stderr, "Accepted sockets queue size too small (%d). Using 3 instead.\n", size);
+                        fprintf(stderr, "Accepted sockets queue size too small (%zu). Using 3 instead.\n", size);
                         backlog = 3;
                 }
@@ -325 +325 @@
                                                 break;
                                         default:
-                                                fprintf(stderr, "Address family %d (0x%X) is not supported.\n", address->sa_family);
+                                                fprintf(stderr, "Address family %u (%#x) is not supported.\n",
+                                                    address->sa_family, address->sa_family);
                                         }
                                         // parse the source address
@@ -334 +335 @@
                                                 } else {
                                                         data[length] = '\0';
-                                                        printf("Socket %d received %d bytes from %s:%d\n%s\n", socket_id, length, address_string, port, data);
+                                                        printf("Socket %d received %zu bytes from %s:%d\n%s\n",
+                                                            socket_id, length, address_string, port, data);
                                                 }
                                         }

uspace/app/nettest1/nettest1.c

@@ -356 +356 @@
         /* Check data buffer size */
         if (size <= 0) {
-                fprintf(stderr, "Data buffer size too small (%d). Using 1024 "
+                fprintf(stderr, "Data buffer size too small (%zu). Using 1024 "
                     "bytes instead.\n", size);
                 size = 1024;
@@ -410 +410 @@
         }
 
-        printf("Tested in %d microseconds\n", tv_sub(&time_after,
+        printf("Tested in %ld microseconds\n", tv_sub(&time_after,
             &time_before));
 

uspace/app/nettest2/nettest2.c

@@ -302 +302 @@
         /* Check data buffer size. */
         if (size <= 0) {
-                fprintf(stderr, "Data buffer size too small (%d). Using 1024 "
+                fprintf(stderr, "Data buffer size too small (%zu). Using 1024 "
                     "bytes instead.\n", size);
                 size = 1024;
@@ -375 +375 @@
                 printf("\tOK\n");
 
-        printf("sendto + recvfrom tested in %d microseconds\n",
+        printf("sendto + recvfrom tested in %ld microseconds\n",
             tv_sub(&time_after, &time_before));
 
@@ -403 +403 @@
                 printf("\tOK\n");
 
-        printf("sendto, recvfrom tested in %d microseconds\n",
+        printf("sendto, recvfrom tested in %ld microseconds\n",
             tv_sub(&time_after, &time_before));
 

uspace/app/ping/ping.c

@@ -337 +337 @@
         }
         
-        printf("PING %s (%s) %u(%u) bytes of data\n", config.dest_addr,
+        printf("PING %s (%s) %zu(%zu) bytes of data\n", config.dest_addr,
             config.dest_str, config.size, config.size);
         
@@ -378 +378 @@
                 switch (result) {
                 case ICMP_ECHO:
-                        printf("%u bytes from ? (?): icmp_seq=%u ttl=? time=%u.%04u\n",
+                        printf("%zu bytes from ? (?): icmp_seq=%u ttl=? time=%ld.%04ld\n",
                                 config.size, seq, elapsed / 1000, elapsed % 1000);
                         break;
                 case ETIMEOUT:
-                        printf("%u bytes from ? (?): icmp_seq=%u Timed out\n",
+                        printf("%zu bytes from ? (?): icmp_seq=%u Timed out\n",
                                 config.size, seq);
                         break;

uspace/app/redir/redir.c

@@ -78 +78 @@
 {
         const char **args;
-        task_id_t id;
+        task_id_t id = 0;
         int rc;
 

uspace/app/stats/stats.c

@@ -56 +56 @@
         
         uint64_t sec = time.tv_sec;
-        printf("%02" PRIu64 ":%02" PRIu64 ":%02" PRIu64, (sec % DAY) / HOUR,
-            (sec % HOUR) / MINUTE, sec % MINUTE);
+        printf("%02" PRIu64 ":%02" PRIu64 ":%02" PRIu64,
+            (sec % DAY) / HOUR, (sec % HOUR) / MINUTE, sec % MINUTE);
         
         sysarg_t uptime = stats_get_uptime();
-        printf(", up %u days, %u hours, %u minutes, %u seconds", uptime / DAY,
-            (uptime % DAY) / HOUR, (uptime % HOUR) / MINUTE, uptime % MINUTE);
+        printf(", up %" PRIun " days, %" PRIun " hours, "
+            "%" PRIun " minutes, %" PRIun " seconds",
+            uptime / DAY, (uptime % DAY) / HOUR,
+            (uptime % HOUR) / MINUTE, uptime % MINUTE);
         
         size_t count;

uspace/app/taskdump/taskdump.c

@@ -85 +85 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
+                printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;
         }
@@ -92 +92 @@
         app_symtab = NULL;
 
-        printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id);
+        printf("Dumping task '%s' (task ID %" PRIu64 ").\n", app_name, task_id);
         autoload_syms();
         putchar('\n');
@@ -126 +126 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -168 +168 @@
                                 core_file_name = *argv;
                         } else {
-                                printf("Uknown option '%s'\n", arg[0]);
+                                printf("Uknown option '%c'\n", arg[0]);
                                 print_syntax();
                                 return -1;
@@ -240 +240 @@
         printf("Threads:\n");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] hash: %p\n", 1+i, thash_buf[i]);
+                printf(" [%zu] hash: %p\n", 1 + i, (void *) thash_buf[i]);
 
                 thread_dump(thash_buf[i]);
@@ -284 +284 @@
         printf("Address space areas:\n");
         for (i = 0; i < n_areas; i++) {
-                printf(" [%d] flags: %c%c%c%c base: %p size: %p\n", 1+i,
+                printf(" [%zu] flags: %c%c%c%c base: %p size: %zu\n", 1 + i,
                     (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-',
                     (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-',
                     (ainfo_buf[i].flags & AS_AREA_EXEC) ? 'X' : '-',
                     (ainfo_buf[i].flags & AS_AREA_CACHEABLE) ? 'C' : '-',
-                    ainfo_buf[i].start_addr, ainfo_buf[i].size);
+                    (void *) ainfo_buf[i].start_addr, ainfo_buf[i].size);
         }
 
@@ -326 +326 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread %p crashed at %s. FP = %p\n", thash, sym_pc, fp);
+        printf("Thread %p crashed at %s. FP = %p\n", (void *) thash,
+            sym_pc, (void *) fp);
         free(sym_pc);
 
@@ -334 +335 @@
         while (stacktrace_fp_valid(&st, fp)) {
                 sym_pc = fmt_sym_address(pc);
-                printf("  %p: %s\n", fp, sym_pc);
+                printf("  %p: %s\n", (void *) fp, sym_pc);
                 free(sym_pc);
 
@@ -457 +458 @@
 
         if (rc == EOK) {
-                rc = asprintf(&str, "%p (%s+%p)", addr, name, offs);
+                rc = asprintf(&str, "%p (%s+%zu)", (void *) addr, name, offs);
         } else {
-                rc = asprintf(&str, "%p", addr);
+                rc = asprintf(&str, "%p", (void *) addr);
         }
 

uspace/app/tasks/tasks.c

@@ -77 +77 @@
                 order_suffix(stats_tasks[i].kcycles, &kcycles, &ksuffix);
                 
-                printf("%8" PRIu64 "%8u %8" PRIu64"%c %12"
+                printf("%8" PRIu64 "%8zu %8" PRIu64 "%c %12"
                     PRIu64 "%c %12" PRIu64 "%c %s\n", stats_tasks[i].task_id,
                     stats_tasks[i].threads, virtmem, vmsuffix, ucycles, usuffix,
@@ -160 +160 @@
         }
         
-        printf("%s: %u CPU(s) detected\n", NAME, count);
+        printf("%s: %zu CPU(s) detected\n", NAME, count);
         
         size_t i;

uspace/app/tester/Makefile

@@ -38 +38 @@
         print/print3.c \
         print/print4.c \
+        print/print5.c \
         console/console1.c \
         stdio/stdio1.c \
@@ -49 +50 @@
         ipc/connect.c \
         loop/loop1.c \
-        mm/malloc1.c
+        mm/malloc1.c \
+        hw/serial/serial1.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tester/hw/serial/serial1.c

@@ -27 +27 @@
  */
 
-/** @addtogroup test_serial
- * @brief       test the serial port driver - read from the serial port
+/** @addtogroup tester
+ * @brief Test the serial port driver - loopback test
  * @{
  */
@@ -35 +35 @@
  */
 
+#include <inttypes.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -47 +48 @@
 #include <str.h>
 #include <ipc/serial_ctl.h>
-
-#define NAME            "test serial"
-
-
-static void print_usage(void)
+#include "../../tester.h"
+
+#define DEFAULT_COUNT  1024
+#define DEFAULT_SLEEP  100000
+#define EOT            "####> End of transfer <####\n"
+
+const char *test_serial1(void)
 {
-        printf("Usage: \n test_serial count \n where count is the number of "
-            "characters to be read\n");
-}
-
-int main(int argc, char *argv[])
-{
-        if (argc != 2) {
-                printf(NAME ": incorrect number of arguments.\n");
-                print_usage();
-                return 0;
-        }
-        
-        long int cnt = strtol(argv[1], NULL, 10);
-        
-        int res;
-        res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
+        size_t cnt;
+        
+        if (test_argc < 1)
+                cnt = DEFAULT_COUNT;
+        else
+                switch (str_size_t(test_argv[0], NULL, 0, true, &cnt)) {
+                case EOK:
+                        break;
+                case EINVAL:
+                        return "Invalid argument, unsigned integer expected";
+                case EOVERFLOW:
+                        return "Argument size overflow";
+                default:
+                        return "Unexpected argument error";
+                }
+        
+        int res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
+        
         devman_handle_t handle;
-        
         res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,
             IPC_FLAG_BLOCKING);
-        if (EOK != res) {
-                printf(NAME ": could not get the device handle, errno = %d.\n",
-                    -res);
-                return 1;
-        }
-        
-        printf(NAME ": trying to read %d characters from device with handle "
-            "%d.\n", cnt, handle);
+        if (res != EOK)
+                return "Could not get serial device handle";
         
         int phone = devman_device_connect(handle, IPC_FLAG_BLOCKING);
-        if (0 > phone) {
-                printf(NAME ": could not connect to the device, errno = %d.\n",
-                    -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
-                return 2;
+        if (phone < 0) {
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Unable to connect to serial device";
         }
         
         char *buf = (char *) malloc(cnt + 1);
-        if (NULL == buf) {
-                printf(NAME ": failed to allocate the input buffer\n");
+        if (buf == NULL) {
                 ipc_hangup(phone);
                 devman_hangup_phone(DEVMAN_CLIENT);
-                return 3;
-        }
-        
-        ipcarg_t old_baud, old_par, old_stop, old_word_size;
+                return "Failed to allocate input buffer";
+        }
+        
+        ipcarg_t old_baud;
+        ipcarg_t old_par;
+        ipcarg_t old_stop;
+        ipcarg_t old_word_size;
         
         res = ipc_call_sync_0_4(phone, SERIAL_GET_COM_PROPS, &old_baud,
             &old_par, &old_word_size, &old_stop);
-        if (EOK != res) {
-                printf(NAME ": failed to get old communication parameters, "
-                    "errno = %d.\n", -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
+        if (res != EOK) {
+                free(buf);
                 ipc_hangup(phone);
-                free(buf);
-                return 4;
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Failed to get old serial communication parameters";
         }
         
@@ -114 +110 @@
             SERIAL_NO_PARITY, 8, 1);
         if (EOK != res) {
-                printf(NAME ": failed to set communication parameters, errno = "
-                    "%d.\n", -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
+                free(buf);
                 ipc_hangup(phone);
-                free(buf);
-                return 4;
-        }
-        
-        int total = 0;
-        int read = 0;
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Failed to set serial communication parameters";
+        }
+        
+        TPRINTF("Trying to read %zu characters from serial device "
+            "(handle=%" PRIun ")\n", cnt, handle);
+        
+        size_t total = 0;
         while (total < cnt) {
-                read = read_dev(phone, buf, cnt - total);
-                if (0 > read) {
-                        printf(NAME ": failed read from device, errno = %d.\n",
-                            -read);
+                ssize_t read = read_dev(phone, buf, cnt - total);
+                
+                if (read < 0) {
                         ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
                             old_par, old_word_size, old_stop);
+                        free(buf);
                         ipc_hangup(phone);
                         devman_hangup_phone(DEVMAN_CLIENT);
+                        return "Failed read from serial device";
+                }
+                
+                if ((size_t) read > cnt - total) {
+                        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                            old_par, old_word_size, old_stop);
                         free(buf);
-                        return 5;
-                }
-                total += read;
-                if (read > 0) {
+                        ipc_hangup(phone);
+                        devman_hangup_phone(DEVMAN_CLIENT);
+                        return "Read more data than expected";
+                }
+                
+                TPRINTF("Read %zd bytes\n", read);
+                
+                if (read == 0)
+                        usleep(DEFAULT_SLEEP);
+                else {
                         buf[read] = 0;
-                        printf(buf);
+                        
                         /*
                          * Write data back to the device to test the opposite
                          * direction of data transfer.
                          */
-                        write_dev(phone, buf, read);
-                } else {
-                        usleep(100000);
-                }       
-        }
-        
-        const char *the_end = "\n---------\nTHE END\n---------\n";
-        write_dev(phone, (void *)the_end, str_size(the_end));
-        
-        /* restore original communication settings */
-        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, old_par,
-            old_word_size, old_stop);
+                        ssize_t written = write_dev(phone, buf, read);
+                        
+                        if (written < 0) {
+                                ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                                    old_par, old_word_size, old_stop);
+                                free(buf);
+                                ipc_hangup(phone);
+                                devman_hangup_phone(DEVMAN_CLIENT);
+                                return "Failed write to serial device";
+                        }
+                        
+                        if (written != read) {
+                                ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                                    old_par, old_word_size, old_stop);
+                                free(buf);
+                                ipc_hangup(phone);
+                                devman_hangup_phone(DEVMAN_CLIENT);
+                                return "Written less data than read from serial device";
+                        }
+                        
+                        TPRINTF("Written %zd bytes\n", written);
+                }
+                
+                total += read;
+        }
+        
+        TPRINTF("Trying to write EOT banner to the serial device\n");
+        
+        size_t eot_size = str_size(EOT);
+        ssize_t written = write_dev(phone, (void *) EOT, eot_size);
+        
+        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+            old_par, old_word_size, old_stop);
+        free(buf);
+        ipc_hangup(phone);
         devman_hangup_phone(DEVMAN_CLIENT);
-        ipc_hangup(phone);
-        free(buf);
-        
-        return 0;
+        
+        if (written < 0)
+                return "Failed to write EOT banner to serial device";
+        
+        if ((size_t) written != eot_size)
+                return "Written less data than the size of the EOT banner "
+                    "to serial device";
+        
+        return NULL;
 }
 

uspace/app/tester/ipc/ping_pong.c

@@ -72 +72 @@
         }
         
-        TPRINTF("OK\nCompleted %llu round trips in %u seconds, %llu rt/s.\n",
+        TPRINTF("OK\nCompleted %" PRIu64 " round trips in %u seconds, %" PRIu64 " rt/s.\n",
             count, DURATION_SECS, count / DURATION_SECS);
         

uspace/app/tester/ipc/register.c

@@ -27 +27 @@
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -41 +42 @@
         unsigned int i;
         
-        TPRINTF("Connected phone %#x accepting\n", icall->in_phone_hash);
+        TPRINTF("Connected phone %" PRIun " accepting\n", icall->in_phone_hash);
         ipc_answer_0(iid, EOK);
         for (i = 0; i < MAX_CONNECTIONS; i++) {
@@ -57 +58 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        TPRINTF("Phone %#x hung up\n", icall->in_phone_hash);
+                        TPRINTF("Phone %" PRIun " hung up\n", icall->in_phone_hash);
                         retval = 0;
                         break;
                 case IPC_TEST_METHOD:
-                        TPRINTF("Received well known message from %#x: %#x\n",
+                        TPRINTF("Received well known message from %" PRIun ": %" PRIun "\n",
                             icall->in_phone_hash, callid);
                         ipc_answer_0(callid, EOK);
                         break;
                 default:
-                        TPRINTF("Received unknown message from %#x: %#x\n",
+                        TPRINTF("Received unknown message from %" PRIun ": %" PRIun "\n",
                             icall->in_phone_hash, callid);
                         ipc_answer_0(callid, ENOENT);

uspace/app/tester/print/print1.c

@@ -49 +49 @@
         TPRINTF("Real output:     \"%8.10s\"\n\n", "very long text");
         
-        TPRINTF("Testing printf(\"%%s\", NULL):\n");
-        TPRINTF("Expected output: \"(NULL)\"\n");
-        TPRINTF("Real output:     \"%s\"\n\n", NULL);
-        
         return NULL;
 }

uspace/app/tester/print/print2.c

@@ -33 +33 @@
 const char *test_print2(void)
 {
-        TPRINTF("Testing printf(\"%%c %%3.2c %%-3.2c %%2.3c %%-2.3c\", 'a', 'b', 'c', 'd', 'e'):\n");
-        TPRINTF("Expected output: [a] [  b] [c  ] [ d] [e ]\n");
-        TPRINTF("Real output:     [%c] [%3.2c] [%-3.2c] [%2.3c] [%-2.3c]\n\n", 'a', 'b', 'c', 'd', 'e');
+        TPRINTF("Testing printf(\"%%c\", 'a'):\n");
+        TPRINTF("Expected output: [a]\n");
+        TPRINTF("Real output:     [%c]\n\n", 'a');
         
         TPRINTF("Testing printf(\"%%d %%3.2d %%-3.2d %%2.3d %%-2.3d\", 1, 2, 3, 4, 5):\n");

uspace/app/tester/print/print4.c

@@ -45 +45 @@
                 TPRINTF("  ");
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wchar_t) ((group << 5) + index));
+                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
                 
                 TPRINTF("\n");
@@ -57 +57 @@
                 uint8_t index;
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wchar_t) ((group << 5) + index));
+                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
                 
                 TPRINTF("\n");

uspace/app/tester/stdio/stdio1.c

@@ -60 +60 @@
         
         buf[cnt] = '\0';
-        TPRINTF("Read %u bytes, string \"%s\"\n", cnt, buf);
+        TPRINTF("Read %zu bytes, string \"%s\"\n", cnt, buf);
         
         TPRINTF("Seek to beginning...");

uspace/app/tester/tester.c

@@ -51 +51 @@
 #include "print/print3.def"
 #include "print/print4.def"
+#include "print/print5.def"
 #include "console/console1.def"
 #include "stdio/stdio1.def"
@@ -63 +64 @@
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
+#include "hw/serial/serial1.def"
         {NULL, NULL, NULL, false}
 };
@@ -110 +112 @@
         }
         
+        unsigned int _len = (unsigned int) len;
+        if ((_len != len) || (((int) _len) < 0)) {
+                printf("Command length overflow\n");
+                return;
+        }
+        
         for (test = tests; test->name != NULL; test++)
-                printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+                printf("%-*s %s%s\n", _len, test->name, test->desc,
+                    (test->safe ? "" : " (unsafe)"));
         
-        printf("%-*s Run all safe tests\n", len, "*");
+        printf("%-*s Run all safe tests\n", _len, "*");
 }
 

uspace/app/tester/tester.h

@@ -68 +68 @@
 extern const char *test_print3(void);
 extern const char *test_print4(void);
+extern const char *test_print5(void);
 extern const char *test_console1(void);
 extern const char *test_stdio1(void);
@@ -80 +81 @@
 extern const char *test_loop1(void);
 extern const char *test_malloc1(void);
+extern const char *test_serial1(void);
 
 extern test_t tests[];

uspace/app/tester/thread/thread1.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include "../tester.h"
 
@@ -74 +75 @@
         atomic_set(&finish, 0);
         while (atomic_get(&threads_finished) < total) {
-                TPRINTF("Threads left: %u\n", total - atomic_get(&threads_finished));
+                TPRINTF("Threads left: %" PRIua "\n",
+                    total - atomic_get(&threads_finished));
                 sleep(1);
         }

uspace/app/tester/vfs/vfs1.c

@@ -105 +105 @@
         if (cnt < 0)
                 return "write() failed";
-        TPRINTF("Written %d bytes\n", cnt);
+        TPRINTF("Written %zd bytes\n", cnt);
         
         if (lseek(fd0, 0, SEEK_SET) != 0)
@@ -116 +116 @@
                         return "read() failed";
                 
-                TPRINTF("Read %d bytes: \".*s\"\n", cnt, cnt, buf);
+                int _cnt = (int) cnt;
+                if (_cnt != cnt) {
+                        /* Count overflow, just to be sure. */
+                        TPRINTF("Read %zd bytes\n", cnt);
+                } else {
+                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, _cnt, buf);
+                }
         }
         

uspace/app/top/screen.c

@@ -150 +150 @@
         screen_get_pos(&c, &r);
         
-        if (c < cols)
-                printf("%.*s", cols - c - 1, str);
+        if (c < cols) {
+                int pos = cols - c - 1;
+                printf("%.*s", pos, str);
+        }
 }
 
 static inline void print_global_head(data_t *data)
 {
-        printf("top - %02lu:%02lu:%02lu up %u days, %02u:%02u:%02u, load average:",
+        printf("top - %02lu:%02lu:%02lu up "
+            "%" PRIun " days, %02" PRIun ":%02" PRIun ":%02" PRIun ", "
+            "load average:",
             data->hours, data->minutes, data->seconds,
             data->udays, data->uhours, data->uminutes, data->useconds);
@@ -171 +175 @@
 static inline void print_task_summary(data_t *data)
 {
-        printf("tasks: %u total", data->tasks_count);
+        printf("tasks: %zu total", data->tasks_count);
         screen_newline();
 }
@@ -211 +215 @@
         }
         
-        printf("threads: %u total, %u running, %u ready, %u sleeping, %u lingering, "
-            "%u other, %u invalid",
+        printf("threads: %zu total, %zu running, %zu ready, "
+            "%zu sleeping, %zu lingering, %zu other, %zu invalid",
             total, running, ready, sleeping, lingering, other, invalid);
         screen_newline();
@@ -295 +299 @@
                 order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
                 
-                printf("%-8" PRIu64 " %9u %8" PRIu64 "%c ", task->task_id,
+                printf("%-8" PRIu64 " %9zu %8" PRIu64 "%c ", task->task_id,
                     task->threads, virtmem, virtmem_suffix);
                 print_percent(perc->virtmem, 2);

uspace/app/trace/ipcp.c

@@ -137 +137 @@
 
         if (oper != NULL) {
-                printf("%s (%ld)", oper->name, method);
+                printf("%s (%" PRIun ")", oper->name, method);
                 return;
         }
 
-        printf("%ld", method);
+        printf("%" PRIun, method);
 }
 
@@ -201 +201 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Call ID: %p, phone: %d, proto: %s, method: ", hash,
-                        phone, (proto ? proto->name : "n/a"));
+                printf("Call ID: %p, phone: %d, proto: %s, method: ",
+                    (void *) hash, phone,
+                    (proto ? proto->name : "n/a"));
                 ipc_m_print(proto, IPC_GET_METHOD(*call));
-                printf(" args: (%" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
-                    ", %" PRIuIPCARG ", %" PRIuIPCARG ")\n", args[1], args[2],
-                    args[3], args[4], args[5]);
+                printf(" args: (%" PRIun ", %" PRIun ", %" PRIun ", "
+                    "%" PRIun ", %" PRIun ")\n",
+                    args[1], args[2], args[3], args[4], args[5]);
         }
 
@@ -281 +282 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Response to %p: retval=%ld, args = (%" PRIuIPCARG
-                    ", %" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
-                    ", %" PRIuIPCARG ")\n",
-                    hash, retval, IPC_GET_ARG1(*answer),
+                printf("Response to %p: retval=%" PRIdn ", args = (%" PRIun ", "
+                    "%" PRIun ", %" PRIun ", %" PRIun ", %" PRIun ")\n",
+                    (void *) hash, retval, IPC_GET_ARG1(*answer),
                     IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
                     IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
@@ -340 +340 @@
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash %p)\n", hash);
+                        printf("Not a response (hash %p)\n", (void *) hash);
                 }
                 return;

uspace/app/trace/trace.c

@@ -161 +161 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -200 +200 @@
         printf("Threads:");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] (hash %p)", 1+i, thread_hash_buf[i]);
-        }
-        printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t));
+                printf(" [%d] (hash %p)", 1 + i, (void *) thread_hash_buf[i]);
+        }
+        printf("\ntotal of %zu threads\n", tb_needed / sizeof(uintptr_t));
 
         return 0;
@@ -224 +224 @@
         case V_HASH:
         case V_PTR:
-                printf("%p", val);
+                printf("%p", (void *) val);
                 break;
 
@@ -248 +248 @@
         case V_CHAR:
                 if (sval >= 0x20 && sval < 0x7f) {
-                        printf("'%c'", sval);
+                        printf("'%c'", (char) sval);
                 } else {
                         switch (sval) {
@@ -257 +257 @@
                         case '\t': printf("'\\t'"); break;
                         case '\\': printf("'\\\\'"); break;
-                        default: printf("'\\x%02lX'", val); break;
+                        default: printf("'\\x%02" PRIxn "'", val); break;
                         }
                 }
@@ -277 +277 @@
 
         putchar('(');
-        if (n > 0) printf("%" PRIdSYSARG, sc_args[0]);
+        if (n > 0) printf("%" PRIun, sc_args[0]);
         for (i = 1; i < n; i++) {
-                printf(", %" PRIdSYSARG, sc_args[i]);
+                printf(", %" PRIun, sc_args[i]);
         }
         putchar(')');
@@ -489 +489 @@
 {
         async_serialize_start();
-        printf("New thread, hash 0x%lx\n", hash);
+        printf("New thread, hash %p\n", (void *) hash);
         async_serialize_end();
 
@@ -510 +510 @@
         }
 
-        printf("Start tracing thread [%d] (hash %p).\n", thread_id, thread_hash);
+        printf("Start tracing thread [%u] (hash %p).\n",
+            thread_id, (void *) thread_hash);
 
         while (!abort_trace) {
@@ -516 +517 @@
                 fibril_mutex_lock(&state_lock);
                 if (paused) {
-                        printf("Thread [%d] paused. Press R to resume.\n",
+                        printf("Thread [%u] paused. Press R to resume.\n",
                             thread_id);
 
@@ -522 +523 @@
                                 fibril_condvar_wait(&state_cv, &state_lock);
 
-                        printf("Thread [%d] resumed.\n", thread_id);
+                        printf("Thread [%u] resumed.\n", thread_id);
                 }
                 fibril_mutex_unlock(&state_lock);
@@ -554 +555 @@
                                 break;
                         case UDEBUG_EVENT_THREAD_E:
-                                printf("Thread %p exited.\n", val0);
+                                printf("Thread %" PRIun " exited.\n", val0);
                                 fibril_mutex_lock(&state_lock);
                                 abort_trace = true;
@@ -927 +928 @@
                                 }
                         } else {
-                                printf("Uknown option '%s'\n", arg[0]);
+                                printf("Uknown option '%c'\n", arg[0]);
                                 print_syntax();
                                 return -1;
@@ -984 +985 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
+                printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;
         }
 
-        printf("Connected to task %" PRIdTASKID ".\n", task_id);
+        printf("Connected to task %" PRIu64 ".\n", task_id);
 
         if (task_ldr != NULL)

uspace/app/virtusbkbd/virtusbkbd.c

@@ -171 +171 @@
 static void on_keyboard_change(kb_status_t *status)
 {
-        printf("%s: Current keyboard status: %08hhb", NAME, status->modifiers);
+        printf("%s: Current keyboard status: %02hhx", NAME, status->modifiers);
         size_t i;
         for (i = 0; i < KB_MAX_KEYS_AT_ONCE; i++) {