Changeset 5572ad1 in mainline for uspace/drv

Timestamp:

2012-08-23T21:50:46Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

276e44a

Parents:

ae827d0 (diff), db81577 (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 mainline changes

Location:

uspace/drv

Files:

• bus/isa/i8237.c (modified) (2 diffs)
• char/ps2mouse/ps2mouse.c (modified) (1 diff)
• nic/rtl8139/driver.c (modified) (6 diffs)

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: