Changeset f0a2720 in mainline

Timestamp:

2012-08-23T15:22:30Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

db81577

Parents:

aa492fe

Message:

fix formatting arguments

Location:

uspace

Files:

• drv/bus/isa/i8237.c (modified) (2 diffs)
• drv/char/ps2mouse/ps2mouse.c (modified) (1 diff)
• drv/nic/rtl8139/driver.c (modified) (6 diffs)
• srv/net/ethip/pdu.c (modified) (2 diffs)
• srv/net/tcp/conn.c (modified) (2 diffs)
• srv/net/tcp/segment.c (modified) (1 diff)
• srv/net/tcp/tqueue.c (modified) (1 diff)

uspace/drv/bus/isa/i8237.c

@@ -351 +351 @@
         
         /* 16 bit transfers are a bit special */
-        ddf_msg(LVL_DEBUG, "Unspoiled address: %p and size: %zu.", pa, size);
+        ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu16 ")",
+            pa, size);
         if (channel > 4) {
                 /* Size must be aligned to 16 bits */
@@ -367 +368 @@
         const dma_channel_t dma_channel = controller_8237.channels[channel];
         
-        ddf_msg(LVL_DEBUG, "Setting channel %u, to address %p(%zu), mode %hhx.",
-            channel, pa, size, mode);
+        ddf_msg(LVL_DEBUG, "Setting channel %u to address %#" PRIx32 " "
+            "(size %" PRIu16 "), mode %hhx.", channel, pa, size, mode);
         
         /* Mask DMA request */

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -75 +75 @@
         const ssize_t size = chardev_read(sess, &data, 1); \
         if (size != 1) { \
-                ddf_msg(LVL_ERROR, "Failed reading byte: %d)", size);\
+                ddf_msg(LVL_ERROR, "Failed reading byte: %zd)", size);\
                 return size < 0 ? size : EIO; \
         } \

uspace/drv/nic/rtl8139/driver.c

@@ -620 +620 @@
                 /* Check if the header is valid, otherwise we are lost in the buffer */
                 if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) {
-                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4"PRIu16", "
-                            "header 0x%4"PRIx16". Offset: %zu)", size, frame_header, 
+                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4" PRIu16 ", "
+                            "header 0x%4" PRIx16 ". Offset: %d)", size, frame_header,
                             rx_offset);
                         goto rx_err;
@@ -1162 +1162 @@
 
         /* Allocate buffer for receiver */
-        ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %zu bytes",
+        ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %d bytes",
             RxBUF_TOT_LENGTH);
 
@@ -1249 +1249 @@
         /* Gain control over port's registers. */
         if (pio_enable(rtl8139->io_addr, RTL8139_IO_SIZE, &rtl8139->io_port)) {
-                ddf_msg(LVL_ERROR, "Cannot gain the port %lx for device %s.", rtl8139->io_addr,
+                ddf_msg(LVL_ERROR, "Cannot gain the port %p for device %s.", rtl8139->io_addr,
                     ddf_dev_get_name(dev));
                 return EADDRNOTAVAIL;
@@ -1296 +1296 @@
 
         assert(dev);
-        ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %d)",
+        ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %zu)",
             ddf_dev_get_name(dev), ddf_dev_get_handle(dev));
 
@@ -1328 +1328 @@
         rc = nic_connect_to_services(nic_data);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to connect to services", rc);
+                ddf_msg(LVL_ERROR, "Failed to connect to services (%d)", rc);
                 goto err_irq;
         }
@@ -2139 +2139 @@
                 pio_write_32(rtl8139->io_port + TCTR, 0);
 
-                ddf_msg(LVL_DEBUG, "Periodic mode. Interrupt mask %"PRIx16", poll.full_skips %"
-                    PRIu32", last timer %"PRIu32".", rtl8139->int_mask, 
-                    rtl8139->poll_timer.full_skips, rtl8139->poll_timer.last_val);
+                ddf_msg(LVL_DEBUG, "Periodic mode. Interrupt mask %" PRIx16 ", "
+                    "poll.full_skips %zu, last timer %" PRIu32,
+                    rtl8139->int_mask, rtl8139->poll_timer.full_skips,
+                    rtl8139->poll_timer.last_val);
                 break;
         default:

uspace/srv/net/ethip/pdu.c

@@ -69 +69 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Encoding Ethernet frame src=%llx dest=%llx etype=%x",
-            frame->src, frame->dest, frame->etype_len);
+        log_msg(LVL_DEBUG, "Encoding Ethernet frame "
+            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
+            frame->src.addr, frame->dest.addr, frame->etype_len);
         log_msg(LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
 
@@ -104 +105 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Decoding Ethernet frame src=%llx dest=%llx etype=%x",
-            frame->src, frame->dest, frame->etype_len);
+        log_msg(LVL_DEBUG, "Decoding Ethernet frame "
+            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
+            frame->src.addr, frame->dest.addr, frame->etype_len);
         log_msg(LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);
 

uspace/srv/net/tcp/conn.c

@@ -999 +999 @@
         } else {
                 log_msg(LVL_DEBUG, "%s: Nothing left in segment, dropping "
-                    "(xfer_size=%zu, SEG.LEN=%zu, seg->ctrl=%u)",
-                    conn->name, xfer_size, seg->len, (unsigned)seg->ctrl);
+                    "(xfer_size=%zu, SEG.LEN=%" PRIu32 ", seg->ctrl=%u)",
+                    conn->name, xfer_size, seg->len, (unsigned int) seg->ctrl);
                 /* Nothing left in segment */
                 tcp_segment_delete(seg);
@@ -1146 +1146 @@
 void tcp_conn_segment_arrived(tcp_conn_t *conn, tcp_segment_t *seg)
 {
-        log_msg(LVL_DEBUG, "%c: tcp_conn_segment_arrived(%p)",
+        log_msg(LVL_DEBUG, "%s: tcp_conn_segment_arrived(%p)",
             conn->name, seg);
 

uspace/srv/net/tcp/segment.c

@@ -250 +250 @@
         log_msg(LVL_DEBUG2, "Segment dump:");
         log_msg(LVL_DEBUG2, " - ctrl = %u", (unsigned)seg->ctrl);
-        log_msg(LVL_DEBUG2, " - seq = % " PRIu32, seg->seq);
-        log_msg(LVL_DEBUG2, " - ack = % " PRIu32, seg->ack);
-        log_msg(LVL_DEBUG2, " - len = % " PRIu32, seg->len);
-        log_msg(LVL_DEBUG2, " - wnd = % " PRIu32, seg->wnd);
-        log_msg(LVL_DEBUG2, " - up = % " PRIu32, seg->up);
+        log_msg(LVL_DEBUG2, " - seq = %" PRIu32, seg->seq);
+        log_msg(LVL_DEBUG2, " - ack = %" PRIu32, seg->ack);
+        log_msg(LVL_DEBUG2, " - len = %" PRIu32, seg->len);
+        log_msg(LVL_DEBUG2, " - wnd = %" PRIu32, seg->wnd);
+        log_msg(LVL_DEBUG2, " - up = %" PRIu32, seg->up);
 }
 

uspace/srv/net/tcp/tqueue.c

@@ -172 +172 @@
 
         xfer_seqlen = min(snd_buf_seqlen, avail_wnd);
-        log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %zu, "
+        log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %" PRIu32 ", "
             "xfer_seqlen = %zu", conn->name, snd_buf_seqlen, conn->snd_wnd,
             xfer_seqlen);