Changeset b910455 in mainline for uspace/srv

Timestamp:

2011-04-07T09:46:11Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6639ae1

Parents:

f6bffee (diff), 8e80d3f (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/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (5 diffs)
• bd/ata_bd/ata_hw.h (modified) (1 diff)
• devman/devman.c (modified) (26 diffs)
• devman/devman.h (modified) (2 diffs)
• devman/main.c (modified) (29 diffs)
• devman/util.c (modified) (1 diff)
• devman/util.h (modified) (1 diff)
• devmap/devmap.c (modified) (1 diff)
• hid/kbd/generic/kbd.c (modified) (2 diffs)
• hid/kbd/include/kbd.h (modified) (1 diff)
• hid/kbd/port/ns16550.c (modified) (1 diff)
• hid/kbd/port/z8530.c (modified) (1 diff)
• hw/bus/cuda_adb/cuda_adb.c (modified) (2 diffs)
• hw/irc/apic/apic.c (modified) (2 diffs)
• hw/irc/fhc/fhc.c (modified) (1 diff)
• hw/irc/i8259/i8259.c (modified) (1 diff)
• hw/irc/obio/obio.c (modified) (1 diff)
• hw/netif/ne2000/dp8390.c (modified) (1 diff)
• hw/netif/ne2000/ne2000.c (modified) (2 diffs)
• loader/arch/abs32le/_link.ld.in (modified) (1 diff)
• loader/arch/amd64/_link.ld.in (modified) (1 diff)
• loader/arch/arm32/_link.ld.in (modified) (1 diff)
• loader/arch/ia32/_link.ld.in (modified) (1 diff)
• loader/arch/ia64/_link.ld.in (modified) (2 diffs)
• loader/arch/mips32/_link.ld.in (modified) (1 diff)
• loader/arch/ppc32/_link.ld.in (modified) (1 diff)
• loader/arch/sparc64/_link.ld.in (modified) (1 diff)
• loader/main.c (modified) (1 diff)
• net/il/arp/arp.c (modified) (13 diffs)
• net/il/ip/ip.c (modified) (47 diffs)
• net/net/net.c (modified) (6 diffs)
• net/nil/eth/eth.c (modified) (2 diffs)
• net/tl/tcp/tcp.c (modified) (4 diffs)
• net/tl/tcp/tcp.h (modified) (1 diff)
• net/tl/udp/udp.c (modified) (6 diffs)
• vfs/vfs_ops.c (modified) (1 diff)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -372 +372 @@
         uint16_t w;
         uint8_t c;
+        uint16_t bc;
         size_t pos, len;
         int rc;
@@ -387 +388 @@
         } else if (rc == EIO) {
                 /*
-                 * There is something, but not a register device.
-                 * It could be a packet device.
+                 * There is something, but not a register device. Check to see
+                 * whether the IDENTIFY command left the packet signature in
+                 * the registers in case this is a packet device.
+                 *
+                 * According to the ATA specification, the LBA low and
+                 * interrupt reason registers should be set to 0x01. However,
+                 * there are many devices that do not follow this and only set
+                 * the byte count registers. So, only check these.
                  */
-                rc = identify_pkt_dev(disk_id, &idata);
-                if (rc == EOK) {
-                        /* We have a packet device. */
-                        d->dev_type = ata_pkt_dev;
+                bc = ((uint16_t)pio_read_8(&cmd->cylinder_high) << 8) |
+                    pio_read_8(&cmd->cylinder_low);
+
+                if (bc == PDEV_SIGNATURE_BC) {
+                        rc = identify_pkt_dev(disk_id, &idata);
+                        if (rc == EOK) {
+                                /* We have a packet device. */
+                                d->dev_type = ata_pkt_dev;
+                        } else {
+                                return EIO;
+                        }
                 } else {
                         /* Nope. Something's there, but not recognized. */
@@ -403 +417 @@
         }
 
-        printf("device caps: 0x%04x\n", idata.caps);
         if (d->dev_type == ata_pkt_dev) {
                 /* Packet device */
@@ -566 +579 @@
 
         /*
-         * This is where we would most likely expect a non-existing device to
-         * show up by not setting SR_DRDY.
+         * Do not wait for DRDY to be set in case this is a packet device.
+         * We determine whether the device is present by waiting for DRQ to be
+         * set after issuing the command.
          */
-        if (wait_status(SR_DRDY, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
+        if (wait_status(0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
                 return ETIMEOUT;
 
@@ -577 +591 @@
                 return ETIMEOUT;
 
+        /*
+         * If ERR is set, this may be a packet device, so return EIO to cause
+         * the caller to check for one.
+         */
+        if ((status & SR_ERR) != 0) {
+                return EIO;
+        }
+
+        if (wait_status(SR_DRQ, ~SR_BSY, &status, TIMEOUT_PROBE) != EOK)
+                return ETIMEOUT;
+
         /* Read data from the disk buffer. */
 
-        if ((status & SR_DRQ) != 0) {
-                for (i = 0; i < identify_data_size / 2; i++) {
-                        data = pio_read_16(&cmd->data_port);
-                        ((uint16_t *) buf)[i] = data;
-                }
-        }
-
-        if ((status & SR_ERR) != 0) {
-                return EIO;
+        for (i = 0; i < identify_data_size / 2; i++) {
+                data = pio_read_16(&cmd->data_port);
+                ((uint16_t *) buf)[i] = data;
         }
 

uspace/srv/bd/ata_bd/ata_hw.h

@@ -293 +293 @@
 };
 
+enum ata_pdev_signature {
+        /**
+         * Signature put by a packet device in byte count register
+         * in response to Identify command.
+         */
+        PDEV_SIGNATURE_BC       = 0xEB14
+};
+
 #endif
 

uspace/srv/devman/devman.c

@@ -34 +34 @@
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <io/log.h>
 #include <ipc/driver.h>
 #include <ipc/devman.h>
@@ -146 +147 @@
         fibril_mutex_unlock(&drivers_list->drivers_mutex);
 
-        printf(NAME": the '%s' driver was added to the list of available "
-            "drivers.\n", drv->name);
+        log_msg(LVL_NOTE, "Driver `%s' was added to the list of available "
+            "drivers.", drv->name);
 }
 
@@ -237 +238 @@
 bool read_match_ids(const char *conf_path, match_id_list_t *ids)
 {
-        printf(NAME ": read_match_ids conf_path = %s.\n", conf_path);
+        log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
         
         bool suc = false;
@@ -247 +248 @@
         fd = open(conf_path, O_RDONLY);
         if (fd < 0) {
-                printf(NAME ": unable to open %s\n", conf_path);
+                log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.",
+                    conf_path, str_error(fd));
                 goto cleanup;
         }
@@ -255 +257 @@
         lseek(fd, 0, SEEK_SET);
         if (len == 0) {
-                printf(NAME ": configuration file '%s' is empty.\n", conf_path);
+                log_msg(LVL_ERROR, "Configuration file '%s' is empty.",
+                    conf_path);
                 goto cleanup;
         }
@@ -261 +264 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                printf(NAME ": memory allocation failed when parsing file "
-                    "'%s'.\n", conf_path);
+                log_msg(LVL_ERROR, "Memory allocation failed when parsing file "
+                    "'%s'.", conf_path);
                 goto cleanup;
         }
         
-        if (read(fd, buf, len) <= 0) {
-                printf(NAME ": unable to read file '%s'.\n", conf_path);
+        ssize_t read_bytes = safe_read(fd, buf, len);
+        if (read_bytes <= 0) {
+                log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
                 goto cleanup;
         }
-        buf[len] = 0;
+        buf[read_bytes] = 0;
         
         suc = parse_match_ids(buf, ids);
@@ -305 +309 @@
 bool get_driver_info(const char *base_path, const char *name, driver_t *drv)
 {
-        printf(NAME ": get_driver_info base_path = %s, name = %s.\n",
+        log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")",
             base_path, name);
         
@@ -337 +341 @@
         struct stat s;
         if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
-                printf(NAME ": driver not found at path %s.", drv->binary_path);
+                log_msg(LVL_ERROR, "Driver not found at path `%s'.",
+                    drv->binary_path);
                 goto cleanup;
         }
@@ -364 +369 @@
 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path)
 {
-        printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path);
+        log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
         
         int drv_cnt = 0;
@@ -398 +403 @@
         dev_node_t *dev;
         
-        printf(NAME ": create_root_nodes\n");
+        log_msg(LVL_DEBUG, "create_root_nodes()");
         
         fibril_rwlock_write_lock(&tree->rwlock);
@@ -483 +488 @@
 void attach_driver(dev_node_t *dev, driver_t *drv)
 {
-        printf(NAME ": attach_driver %s to device %s\n",
-            drv->name, dev->pfun->pathname);
+        log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
+            dev->pfun->pathname, drv->name);
         
         fibril_mutex_lock(&drv->driver_mutex);
@@ -506 +511 @@
         assert(fibril_mutex_is_locked(&drv->driver_mutex));
         
-        printf(NAME ": start_driver '%s'\n", drv->name);
+        log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
         
         rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL);
         if (rc != EOK) {
-                printf(NAME ": error spawning %s (%s)\n",
-                    drv->name, str_error(rc));
+                log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.",
+                    drv->name, drv->binary_path, str_error(rc));
                 return false;
         }
@@ -573 +578 @@
         int phone;
 
-        printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name);
+        log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
+            driver->name);
 
         fibril_mutex_lock(&driver->driver_mutex);
@@ -640 +646 @@
          * immediately and possibly started here as well.
          */
-        printf(NAME ": driver %s goes into running state.\n", driver->name);
+        log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
         driver->state = DRIVER_RUNNING;
 
@@ -657 +663 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
+        log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
+            driver->name);
         
         /*
@@ -747 +754 @@
          * access any structures that would affect driver_t.
          */
-        printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,
-            dev->pfun->name);
+        log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
+            drv->name, dev->pfun->name);
         
         sysarg_t rc;
@@ -809 +816 @@
         driver_t *drv = find_best_match_driver(drivers_list, dev);
         if (drv == NULL) {
-                printf(NAME ": no driver found for device '%s'.\n",
+                log_msg(LVL_ERROR, "No driver found for device `%s'.",
                     dev->pfun->pathname);
                 return false;
@@ -847 +854 @@
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list)
 {
-        printf(NAME ": init_device_tree.\n");
+        log_msg(LVL_DEBUG, "init_device_tree()");
         
         tree->current_handle = 0;
@@ -1026 +1033 @@
         fun->pathname = (char *) malloc(pathsize);
         if (fun->pathname == NULL) {
-                printf(NAME ": failed to allocate device path.\n");
+                log_msg(LVL_ERROR, "Failed to allocate device path.");
                 return false;
         }
@@ -1057 +1064 @@
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
+        log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
+            dev, pfun, pfun->pathname);
+
         /* Add the node to the handle-to-node map. */
         dev->handle = ++tree->current_handle;
@@ -1063 +1073 @@
 
         /* Add the node to the list of its parent's children. */
-        printf("insert_dev_node: dev=%p, dev->pfun := %p\n", dev, pfun);
         dev->pfun = pfun;
         pfun->child = dev;
@@ -1123 +1132 @@
 fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path)
 {
+        assert(path != NULL);
+
+        bool is_absolute = path[0] == '/';
+        if (!is_absolute) {
+                return NULL;
+        }
+
         fibril_rwlock_read_lock(&tree->rwlock);
         
@@ -1132 +1148 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = (rel_path[0] == '/');
+        bool cont = true;
         
         while (cont && fun != NULL) {
@@ -1157 +1173 @@
 }
 
+/** Find function with a specified name belonging to given device.
+ *
+ * Device tree rwlock should be held at least for reading.
+ *
+ * @param dev Device the function belongs to.
+ * @param name Function name (not path).
+ * @return Function node.
+ * @retval NULL No function with given name.
+ */
+fun_node_t *find_fun_node_in_device(dev_node_t *dev, const char *name)
+{
+        assert(dev != NULL);
+        assert(name != NULL);
+
+        fun_node_t *fun;
+        link_t *link;
+
+        for (link = dev->functions.next;
+            link != &dev->functions;
+            link = link->next) {
+                fun = list_get_instance(link, fun_node_t, dev_functions);
+
+                if (str_cmp(name, fun->name) == 0)
+                        return fun;
+        }
+
+        return NULL;
+}
+
+/** Find function node by its class name and index. */
+fun_node_t *find_fun_node_by_class(class_list_t *class_list,
+    const char *class_name, const char *dev_name)
+{
+        assert(class_list != NULL);
+        assert(class_name != NULL);
+        assert(dev_name != NULL);
+
+        fibril_rwlock_read_lock(&class_list->rwlock);
+
+        dev_class_t *cl = find_dev_class_no_lock(class_list, class_name);
+        if (cl == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        dev_class_info_t *dev = find_dev_in_class(cl, dev_name);
+        if (dev == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        fun_node_t *fun = dev->fun;
+
+        fibril_rwlock_read_unlock(&class_list->rwlock);
+
+        return fun;
+}
+
+
 /** Find child function node with a specified name.
  *
@@ -1167 +1242 @@
 fun_node_t *find_node_child(fun_node_t *pfun, const char *name)
 {
-        fun_node_t *fun;
-        link_t *link;
-        
-        link = pfun->child->functions.next;
-        
-        while (link != &pfun->child->functions) {
-                fun = list_get_instance(link, fun_node_t, dev_functions);
-                
-                if (str_cmp(name, fun->name) == 0)
-                        return fun;
-                
-                link = link->next;
-        }
-        
-        return NULL;
+        return find_fun_node_in_device(pfun->child, name);
 }
 
@@ -1343 +1404 @@
 }
 
+dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name)
+{
+        assert(dev_class != NULL);
+        assert(dev_name != NULL);
+
+        link_t *link;
+        for (link = dev_class->devices.next;
+            link != &dev_class->devices;
+            link = link->next) {
+                dev_class_info_t *dev = list_get_instance(link,
+                    dev_class_info_t, link);
+
+                if (str_cmp(dev->dev_name, dev_name) == 0) {
+                        return dev;
+                }
+        }
+
+        return NULL;
+}
+
 void init_class_list(class_list_t *class_list)
 {

uspace/srv/devman/devman.h

@@ -338 +338 @@
 extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle);
 extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *);
+extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *);
+extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *);
 
 /* Device tree */
@@ -359 +361 @@
 extern dev_class_t *get_dev_class(class_list_t *, char *);
 extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *);
+extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *);
 extern void add_dev_class_no_lock(class_list_t *, dev_class_t *);
 

uspace/srv/devman/main.c

@@ -43 +43 @@
 #include <stdio.h>
 #include <errno.h>
+#include <str_error.h>
 #include <bool.h>
 #include <fibril_synch.h>
@@ -51 +52 @@
 #include <sys/stat.h>
 #include <ctype.h>
+#include <io/log.h>
 #include <ipc/devman.h>
 #include <ipc/driver.h>
@@ -71 +73 @@
         driver_t *driver = NULL;
 
-        printf(NAME ": devman_driver_register \n");
+        log_msg(LVL_DEBUG, "devman_driver_register");
         
         iid = async_get_call(&icall);
@@ -88 +90 @@
         }
 
-        printf(NAME ": the %s driver is trying to register by the service.\n",
+        log_msg(LVL_DEBUG, "The `%s' driver is trying to register.",
             drv_name);
         
@@ -95 +97 @@
         
         if (driver == NULL) {
-                printf(NAME ": no driver named %s was found.\n", drv_name);
+                log_msg(LVL_ERROR, "No driver named `%s' was found.", drv_name);
                 free(drv_name);
                 drv_name = NULL;
@@ -106 +108 @@
         
         /* Create connection to the driver. */
-        printf(NAME ":  creating connection to the %s driver.\n", driver->name);
+        log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
+            driver->name);
         ipc_call_t call;
         ipc_callid_t callid = async_get_call(&call);
@@ -118 +121 @@
         set_driver_phone(driver, IPC_GET_ARG5(call));
         
-        printf(NAME ": the %s driver was successfully registered as running.\n",
+        log_msg(LVL_NOTE, 
+            "The `%s' driver was successfully registered as running.",
             driver->name);
         
@@ -142 +146 @@
         callid = async_get_call(&call);
         if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
-                printf(NAME ": ERROR: devman_receive_match_id - invalid "
-                    "protocol.\n");
+                log_msg(LVL_ERROR, 
+                    "Invalid protocol when trying to receive match id.");
                 async_answer_0(callid, EINVAL); 
                 delete_match_id(match_id);
@@ -150 +154 @@
         
         if (match_id == NULL) {
-                printf(NAME ": ERROR: devman_receive_match_id - failed to "
-                    "allocate match id.\n");
+                log_msg(LVL_ERROR, "Failed to allocate match id.");
                 async_answer_0(callid, ENOMEM);
                 return ENOMEM;
@@ -165 +168 @@
         if (rc != EOK) {
                 delete_match_id(match_id);
-                printf(NAME ": devman_receive_match_id - failed to receive "
-                    "match id string.\n");
+                log_msg(LVL_ERROR, "Failed to receive match id string: %s.",
+                    str_error(rc));
                 return rc;
         }
@@ -172 +175 @@
         list_append(&match_id->link, &match_ids->ids);
         
-        printf(NAME ": received match id '%s', score = %d \n",
+        log_msg(LVL_DEBUG, "Received match id `%s', score %d.",
             match_id->id, match_id->score);
         return rc;
@@ -228 +231 @@
         if (ftype != fun_inner && ftype != fun_exposed) {
                 /* Unknown function type */
-                printf(NAME ": Error, unknown function type provided by driver!\n");
+                log_msg(LVL_ERROR, 
+                    "Unknown function type %d provided by driver.",
+                    (int) ftype);
 
                 fibril_rwlock_write_unlock(&tree->rwlock);
@@ -243 +248 @@
         }
         
+        /* Check that function with same name is not there already. */
+        if (find_fun_node_in_device(pdev, fun_name) != NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                async_answer_0(callid, EEXISTS);
+                printf(NAME ": Warning, driver tried to register `%s' twice.\n",
+                    fun_name);
+                free(fun_name);
+                return;
+        }
+
         fun_node_t *fun = create_fun_node();
         if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {
@@ -265 +280 @@
         fibril_rwlock_write_unlock(&tree->rwlock);
         
-        printf(NAME ": devman_add_function %s\n", fun->pathname);
+        log_msg(LVL_DEBUG, "devman_add_function(fun=\"%s\")", fun->pathname);
         
         devman_receive_match_ids(match_count, &fun->match_ids);
@@ -347 +362 @@
         devmap_register_class_dev(class_info);
         
-        printf(NAME ": function'%s' added to class '%s', class name '%s' was "
-            "asigned to it\n", fun->pathname, class_name, class_info->dev_name);
+        log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.",
+            fun->pathname, class_name, class_info->dev_name);
 
         async_answer_0(callid, EOK);
@@ -363 +378 @@
         
         initialize_running_driver(driver, &device_tree);
-        printf(NAME ": the %s driver was successfully initialized. \n",
+        log_msg(LVL_DEBUG, "The `%s` driver was successfully initialized.",
             driver->name);
         return 0;
@@ -385 +400 @@
         fid_t fid = fibril_create(init_running_drv, driver);
         if (fid == 0) {
-                printf(NAME ": Error creating fibril for the initialization of "
-                    "the newly registered running driver.\n");
+                log_msg(LVL_ERROR, "Failed to create initialization fibril " \
+                    "for driver `%s'.", driver->name);
                 return;
         }
@@ -438 +453 @@
 }
 
+/** Find handle for the device instance identified by device class name. */
+static void devman_function_get_handle_by_class(ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        char *classname;
+        char *devname;
+
+        int rc = async_data_write_accept((void **) &classname, true, 0, 0, 0, 0);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        rc = async_data_write_accept((void **) &devname, true, 0, 0, 0, 0);
+        if (rc != EOK) {
+                free(classname);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+
+        fun_node_t *fun = find_fun_node_by_class(&class_list,
+            classname, devname);
+
+        free(classname);
+        free(devname);
+
+        if (fun == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        async_answer_1(iid, EOK, fun->handle);
+}
+
 
 /** Function for handling connections from a client to the device manager. */
@@ -457 +506 @@
                         devman_function_get_handle(callid, &call);
                         break;
+                case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
+                        devman_function_get_handle_by_class(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOENT);
@@ -477 +529 @@
                 dev = fun->dev;
 
-        if (fun == NULL && dev == NULL) {
-                printf(NAME ": devman_forward error - no device or function with "
-                    "handle %" PRIun " was found.\n", handle);
+        /*
+         * For a valid function to connect to we need a device. The root
+         * function, for example, has no device and cannot be connected to.
+         * This means @c dev needs to be valid regardless whether we are
+         * connecting to a device or to a function.
+         */
+        if (dev == NULL) {
+                log_msg(LVL_ERROR, "IPC forwarding failed - no device or "
+                    "function with handle %" PRIun " was found.", handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -485 +543 @@
 
         if (fun == NULL && !drv_to_parent) {
-                printf(NAME ": devman_forward error - cannot connect to "
-                    "handle %" PRIun ", refers to a device.\n", handle);
+                log_msg(LVL_ERROR, NAME ": devman_forward error - cannot "
+                    "connect to handle %" PRIun ", refers to a device.",
+                    handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -507 +566 @@
         
         if (driver == NULL) {
-                printf(NAME ": devman_forward error - the device is not in %" PRIun
-                    " usable state.\n", handle);
+                log_msg(LVL_ERROR, "IPC forwarding refused - " \
+                    "the device %" PRIun " is not in usable state.", handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -520 +579 @@
         
         if (driver->phone <= 0) {
-                printf(NAME ": devman_forward: cound not forward to driver %s ",
-                    driver->name);
-                printf("the driver's phone is %" PRIun ").\n", driver->phone);
+                log_msg(LVL_ERROR, 
+                    "Could not forward to driver `%s' (phone is %d).",
+                    driver->name, (int) driver->phone);
                 async_answer_0(iid, EINVAL);
                 return;
@@ -528 +587 @@
 
         if (fun != NULL) {
-                printf(NAME ": devman_forward: forward connection to function %s to "
-                    "driver %s.\n", fun->pathname, driver->name);
+                log_msg(LVL_DEBUG, 
+                    "Forwarding request for `%s' function to driver `%s'.",
+                    fun->pathname, driver->name);
         } else {
-                printf(NAME ": devman_forward: forward connection to device %s to "
-                    "driver %s.\n", dev->pfun->pathname, driver->name);
+                log_msg(LVL_DEBUG, 
+                    "Forwarding request for `%s' device to driver `%s'.",
+                    dev->pfun->pathname, driver->name);
         }
 
@@ -564 +625 @@
         async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0,
             IPC_FF_NONE);
-        printf(NAME ": devman_connection_devmapper: forwarded connection to "
-            "device %s to driver %s.\n", fun->pathname, dev->drv->name);
+        log_msg(LVL_DEBUG, 
+            "Forwarding devmapper request for `%s' function to driver `%s'.",
+            fun->pathname, dev->drv->name);
 }
 
@@ -600 +662 @@
 static bool devman_init(void)
 {
-        printf(NAME ": devman_init - looking for available drivers.\n");
+        log_msg(LVL_DEBUG, "devman_init - looking for available drivers.");
         
         /* Initialize list of available drivers. */
@@ -606 +668 @@
         if (lookup_available_drivers(&drivers_list,
             DRIVER_DEFAULT_STORE) == 0) {
-                printf(NAME " no drivers found.");
+                log_msg(LVL_FATAL, "No drivers found.");
                 return false;
         }
 
-        printf(NAME ": devman_init  - list of drivers has been initialized.\n");
+        log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized.");
 
         /* Create root device node. */
         if (!init_device_tree(&device_tree, &drivers_list)) {
-                printf(NAME " failed to initialize device tree.");
+                log_msg(LVL_FATAL, "Failed to initialize device tree.");
                 return false;
         }
@@ -635 +697 @@
         printf(NAME ": HelenOS Device Manager\n");
 
+        if (log_init(NAME, LVL_ERROR) != EOK) {
+                printf(NAME ": Error initializing logging subsystem.\n");
+                return -1;
+        }
+
         if (!devman_init()) {
-                printf(NAME ": Error while initializing service\n");
+                log_msg(LVL_ERROR, "Error while initializing service.");
                 return -1;
         }
@@ -644 +711 @@
 
         /* Register device manager at naming service. */
-        if (service_register(SERVICE_DEVMAN) != EOK)
+        if (service_register(SERVICE_DEVMAN) != EOK) {
+                log_msg(LVL_ERROR, "Failed registering as a service.");
                 return -1;
-
-        printf(NAME ": Accepting connections\n");
+        }
+
+        printf(NAME ": Accepting connections.\n");
         async_manager();
 

uspace/srv/devman/util.c

@@ -111 +111 @@
 }
 
+ssize_t safe_read(int fd, void *buffer, size_t size)
+{
+        if (size == 0) {
+                return 0;
+        }
+
+        uint8_t *buf_ptr = (uint8_t *) buffer;
+
+        size_t total_read = 0;
+        while (total_read < size) {
+                ssize_t bytes_read = read(fd, buf_ptr, size - total_read);
+                if (bytes_read < 0) {
+                        /* Error. */
+                        return bytes_read;
+                } else if (bytes_read == 0) {
+                        /* Possibly end of file. */
+                        break;
+                } else {
+                        /* Read at least something. */
+                        buf_ptr += bytes_read;
+                        total_read += bytes_read;
+                }
+        }
+
+        return (ssize_t) total_read;
+}
+
 /** @}
  */

uspace/srv/devman/util.h

@@ -47 +47 @@
 extern void replace_char(char *, char, char);
 
+extern ssize_t safe_read(int, void *, size_t);
+
 #endif
 

uspace/srv/devmap/devmap.c

@@ -551 +551 @@
         if (devmap_device_find_name(namespace->name, device->name) != NULL) {
                 printf("%s: Device '%s/%s' already registered\n", NAME,
-                    device->namespace->name, device->name);
+                    namespace->name, device->name);
                 devmap_namespace_destroy(namespace);
                 fibril_mutex_unlock(&devices_list_mutex);

uspace/srv/hid/kbd/generic/kbd.c

@@ -67 +67 @@
 static unsigned lock_keys;
 
-int cir_service = 0;
-int cir_phone = -1;
+bool irc_service = false;
+int irc_phone = -1;
 
 #define NUM_LAYOUTS 3
@@ -216 +216 @@
         sysarg_t obio;
         
-        if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
-                cir_service = SERVICE_FHC;
-        else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
-                cir_service = SERVICE_OBIO;
-        
-        if (cir_service) {
-                while (cir_phone < 0)
-                        cir_phone = service_connect_blocking(cir_service, 0, 0);
+        if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
+            || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
+                irc_service = true;
+        
+        if (irc_service) {
+                while (irc_phone < 0)
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }
         

uspace/srv/hid/kbd/include/kbd.h

@@ -38 +38 @@
 #define KBD_KBD_H_
 
-extern int cir_service;
-extern int cir_phone;
+#include <bool.h>
+
+extern bool irc_service;
+extern int irc_phone;
 
 extern void kbd_push_scancode(int);

uspace/srv/hid/kbd/port/ns16550.c

@@ -120 +120 @@
         kbd_push_scancode(scan_code);
         
-        if (cir_service)
-                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
+        if (irc_service)
+                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

uspace/srv/hid/kbd/port/z8530.c

@@ -108 +108 @@
         kbd_push_scancode(scan_code);
         
-        if (cir_service)
-                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
+        if (irc_service)
+                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -367 +367 @@
 static void cuda_irq_rcv_end(void *buf, size_t *len)
 {
-        uint8_t data, b;
-
+        uint8_t b;
+        
         b = pio_read_8(&dev->b);
-        data = pio_read_8(&dev->sr);
-
+        pio_read_8(&dev->sr);
+        
         if ((b & TREQ) == 0) {
                 instance->xstate = cx_receive;
@@ -379 +379 @@
                 cuda_send_start();
         }
-
-        memcpy(buf, instance->rcv_buf, instance->bidx);
-        *len = instance->bidx;
+        
+        memcpy(buf, instance->rcv_buf, instance->bidx);
+        *len = instance->bidx;
         instance->bidx = 0;
 }

uspace/srv/hw/irc/apic/apic.c

@@ -56 +56 @@
 static int apic_enable_irq(sysarg_t irq)
 {
-        // FIXME: TODO
+        /* FIXME: TODO */
         return ENOTSUP;
 }
@@ -107 +107 @@
         
         async_set_client_connection(apic_connection);
-        service_register(SERVICE_APIC);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/irc/fhc/fhc.c

@@ -136 +136 @@
         
         async_set_client_connection(fhc_connection);
-        service_register(SERVICE_FHC);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/irc/i8259/i8259.c

@@ -149 +149 @@
         
         async_set_client_connection(i8259_connection);
-        service_register(SERVICE_I8259);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/irc/obio/obio.c

@@ -137 +137 @@
         
         async_set_client_connection(obio_connection);
-        service_register(SERVICE_OBIO);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/netif/ne2000/dp8390.c

@@ -391 +391 @@
         
         if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) {
+                fibril_mutex_unlock(&ne2k->sq_mutex);
                 fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n",
                     NAME, size);

uspace/srv/hw/netif/ne2000/ne2000.c

@@ -75 +75 @@
 #define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
 
-static int irc_service = 0;
+static bool irc_service = false;
 static int irc_phone = -1;
 
@@ -383 +383 @@
         sysarg_t i8259;
         
-        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic))
-                irc_service = SERVICE_APIC;
-        else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))
-                irc_service = SERVICE_I8259;
+        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)))
+                irc_service = true;
         
         if (irc_service) {
                 while (irc_phone < 0)
-                        irc_phone = service_connect_blocking(irc_service, 0, 0);
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }
         

uspace/srv/loader/arch/abs32le/_link.ld.in

@@ -21 +21 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/amd64/_link.ld.in

@@ -27 +27 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/arm32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ia32/_link.ld.in

@@ -26 +26 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ia64/_link.ld.in

@@ -21 +21 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         
@@ -29 +29 @@
         .got : {
                 _gp = .;
-                *(.got*);
+                *(.got .got.*);
         } :data
         

uspace/srv/loader/arch/mips32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ppc32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/sparc64/_link.ld.in

@@ -20 +20 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/main.c

@@ -407 +407 @@
                         /* Not reached */
                 default:
-                        retval = ENOENT;
+                        retval = EINVAL;
                         break;
                 }
-                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) {
-                        DPRINTF("Responding EINVAL to method %d.\n",
-                            IPC_GET_IMETHOD(call));
-                        async_answer_0(callid, EINVAL);
-                }
+                
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
+                        async_answer_0(callid, retval);
         }
 }

uspace/srv/net/il/arp/arp.c

@@ -157 +157 @@
                         
                         arp_clear_addr(&proto->addresses);
-                        arp_addr_destroy(&proto->addresses);
-                }
-        }
-        
-        arp_protos_clear(&device->protos);
+                        arp_addr_destroy(&proto->addresses, free);
+                }
+        }
+        
+        arp_protos_clear(&device->protos, free);
 }
 
@@ -184 +184 @@
         }
         
-        arp_cache_clear(&arp_globals.cache);
+        arp_cache_clear(&arp_globals.cache, free);
         fibril_mutex_unlock(&arp_globals.lock);
         
@@ -212 +212 @@
                 arp_clear_trans(trans);
         
-        arp_addr_exclude(&proto->addresses, address->value, address->length);
+        arp_addr_exclude(&proto->addresses, address->value, address->length, free);
         
         fibril_mutex_unlock(&arp_globals.lock);
@@ -345 +345 @@
                             header->protocol_length, trans);
                         if (rc != EOK) {
-                                /* The generic char map has already freed trans! */
+                                free(trans);
                                 return rc;
                         }
@@ -556 +556 @@
                 if (index < 0) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return index;
@@ -569 +569 @@
                 if (device->phone < 0) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return EREFUSED;
@@ -579 +579 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -589 +589 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -601 +601 @@
                         free(device->addr);
                         free(device->addr_data);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -614 +614 @@
                         free(device->broadcast_addr);
                         free(device->broadcast_data);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -746 +746 @@
                         arp_clear_trans(trans);
                         arp_addr_exclude(&proto->addresses, target->value,
-                            target->length);
+                            target->length, free);
                         return EAGAIN;
                 }
@@ -794 +794 @@
             trans);
         if (rc != EOK) {
-                /* The generic char map has already freed trans! */
+                free(trans);
                 return rc;
         }
@@ -807 +807 @@
                 arp_clear_trans(trans);
                 arp_addr_exclude(&proto->addresses, target->value,
-                    target->length);
+                    target->length, free);
                 return ENOENT;
         }

uspace/srv/net/il/ip/ip.c

@@ -176 +176 @@
         socklen_t addrlen;
 
-        // detach the first packet and release the others
+        /* Detach the first packet and release the others */
         next = pq_detach(packet);
         if (next)
@@ -185 +185 @@
                         return ENOMEM;
 
-                // get header
+                /* Get header */
                 header = (ip_header_t *) packet_get_data(packet);
                 if (!header)
@@ -192 +192 @@
         }
 
-        // only for the first fragment
+        /* Only for the first fragment */
         if (IP_FRAGMENT_OFFSET(header))
                 return EINVAL;
 
-        // not for the ICMP protocol
+        /* Not for the ICMP protocol */
         if (header->protocol == IPPROTO_ICMP)
                 return EPERM;
 
-        // set the destination address
+        /* Set the destination address */
         switch (header->version) {
         case IPVERSION:
@@ -351 +351 @@
         configuration = &names[0];
 
-        // get configuration
+        /* Get configuration */
         rc = net_get_device_conf_req(ip_globals.net_phone, ip_netif->device_id,
             &configuration, count, &data);
@@ -365 +365 @@
                 
                 if (ip_netif->dhcp) {
-                        // TODO dhcp
+                        /* TODO dhcp */
                         net_free_settings(configuration, data);
                         return ENOTSUP;
@@ -398 +398 @@
                         }
                 } else {
-                        // TODO ipv6 in separate module
+                        /* TODO ipv6 in separate module */
                         net_free_settings(configuration, data);
                         return ENOTSUP;
@@ -419 +419 @@
         }
 
-        // binds the netif service which also initializes the device
+        /* Bind netif service which also initializes the device */
         ip_netif->phone = nil_bind_service(ip_netif->service,
             (sysarg_t) ip_netif->device_id, SERVICE_IP,
@@ -429 +429 @@
         }
 
-        // has to be after the device netif module initialization
+        /* Has to be after the device netif module initialization */
         if (ip_netif->arp) {
                 if (route) {
@@ -445 +445 @@
         }
 
-        // get packet dimensions
+        /* Get packet dimensions */
         rc = nil_packet_size_req(ip_netif->phone, ip_netif->device_id,
             &ip_netif->packet_dimension);
@@ -463 +463 @@
         
         if (gateway.s_addr) {
-                // the default gateway
+                /* The default gateway */
                 ip_globals.gateway.address.s_addr = 0;
                 ip_globals.gateway.netmask.s_addr = 0;
@@ -505 +505 @@
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
-                ip_routes_destroy(&ip_netif->routes);
+                ip_routes_destroy(&ip_netif->routes, free);
                 free(ip_netif);
                 return rc;
@@ -512 +512 @@
                 ip_netif->arp->usage++;
 
-        // print the settings
+        /* Print the settings */
         printf("%s: Device registered (id: %d, phone: %d, ipv: %d, conf: %s)\n",
             NAME, ip_netif->device_id, ip_netif->phone, ip_netif->ipv,
             ip_netif->dhcp ? "dhcp" : "static");
         
-        // TODO ipv6 addresses
+        /* TODO ipv6 addresses */
         
         char address[INET_ADDRSTRLEN];
@@ -587 +587 @@
         ip_netif_t *netif;
 
-        // start with the last netif - the newest one
+        /* Start with the last netif - the newest one */
         index = ip_netifs_count(&ip_globals.netifs) - 1;
         while (index >= 0) {
@@ -629 +629 @@
         size_t length;
 
-        // copy first itself
+        /* Copy first itself */
         memcpy(last, first, sizeof(ip_header_t));
         length = sizeof(ip_header_t);
         next = sizeof(ip_header_t);
 
-        // process all ip options
+        /* Process all IP options */
         while (next < first->header_length) {
                 option = (ip_option_t *) (((uint8_t *) first) + next);
-                // skip end or noop
+                /* Skip end or noop */
                 if ((option->type == IPOPT_END) ||
                     (option->type == IPOPT_NOOP)) {
                         next++;
                 } else {
-                        // copy if told so or skip
+                        /* Copy if told so or skip */
                         if (IPOPT_COPIED(option->type)) {
                                 memcpy(((uint8_t *) last) + length,
@@ -648 +648 @@
                                 length += option->length;
                         }
-                        // next option
+                        /* Next option */
                         next += option->length;
                 }
         }
 
-        // align 4 byte boundary
+        /* Align 4 byte boundary */
         if (length % 4) {
                 bzero(((uint8_t *) last) + length, 4 - (length % 4));
@@ -789 +789 @@
 
         header->total_length = htons(length);
-        // unnecessary for all protocols
+        /* Unnecessary for all protocols */
         header->header_checksum = IP_HEADER_CHECKSUM(header);
 
@@ -916 +916 @@
                 return ENOMEM;
 
-        // get header
+        /* Get header */
         header = (ip_header_t *) packet_get_data(packet);
         if (!header)
                 return EINVAL;
 
-        // fragmentation forbidden?
+        /* Fragmentation forbidden? */
         if(header->flags & IPFLAG_DONT_FRAGMENT)
                 return EPERM;
 
-        // create the last fragment
+        /* Create the last fragment */
         new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, length,
             suffix, ((addrlen > addr_len) ? addrlen : addr_len));
@@ -931 +931 @@
                 return ENOMEM;
 
-        // allocate as much as originally
+        /* Allocate as much as originally */
         last_header = (ip_header_t *) packet_suffix(new_packet,
             IP_HEADER_LENGTH(header));
@@ -939 +939 @@
         ip_create_last_header(last_header, header);
 
-        // trim the unused space
+        /* Trim the unused space */
         rc = packet_trim(new_packet, 0,
             IP_HEADER_LENGTH(header) - IP_HEADER_LENGTH(last_header));
@@ -945 +945 @@
                 return ip_release_and_return(packet, rc);
 
-        // biggest multiple of 8 lower than content
-        // TODO even fragmentation?
+        /* Greatest multiple of 8 lower than content */
+        /* TODO even fragmentation? */
         length = length & ~0x7;
         
@@ -957 +957 @@
                 return ip_release_and_return(packet, rc);
 
-        // mark the first as fragmented
+        /* Mark the first as fragmented */
         header->flags |= IPFLAG_MORE_FRAGMENTS;
 
-        // create middle framgents
+        /* Create middle fragments */
         while (IP_TOTAL_LENGTH(header) > length) {
                 new_packet = packet_get_4_remote(ip_globals.net_phone, prefix,
@@ -981 +981 @@
         }
 
-        // finish the first fragment
+        /* Finish the first fragment */
         header->header_checksum = IP_HEADER_CHECKSUM(header);
 
@@ -1012 +1012 @@
 
         next = packet;
-        // check all packets
+        /* Check all packets */
         while (next) {
                 length = packet_get_data_length(next);
@@ -1021 +1021 @@
                 }
 
-                // too long
+                /* Too long */
                 result = ip_fragment_packet(next, content, prefix,
                     suffix, addr_len);
@@ -1027 +1027 @@
                         new_packet = pq_detach(next);
                         if (next == packet) {
-                                // the new first packet of the queue
+                                /* The new first packet of the queue */
                                 packet = new_packet;
                         }
-                        // fragmentation needed?
+                        /* Fragmentation needed? */
                         if (result == EPERM) {
                                 phone = ip_prepare_icmp_and_get_phone(
                                     error, next, NULL);
                                 if (phone >= 0) {
-                                        // fragmentation necessary ICMP
+                                        /* Fragmentation necessary ICMP */
                                         icmp_destination_unreachable_msg(phone,
                                             ICMP_FRAG_NEEDED, content, next);
@@ -1080 +1080 @@
         int rc;
 
-        // get destination hardware address
+        /* Get destination hardware address */
         if (netif->arp && (route->address.s_addr != dest.s_addr)) {
                 destination.value = route->gateway.s_addr ?
@@ -1102 +1102 @@
                             NULL);
                         if (phone >= 0) {
-                                // unreachable ICMP if no routing
+                                /* Unreachable ICMP if no routing */
                                 icmp_destination_unreachable_msg(phone,
                                     ICMP_HOST_UNREACH, 0, packet);
@@ -1148 +1148 @@
         int rc;
 
-        // addresses in the host byte order
-        // should be the next hop address or the target destination address
+        /*
+         * Addresses in the host byte order
+         * Should be the next hop address or the target destination address
+         */
         addrlen = packet_get_addr(packet, NULL, (uint8_t **) &addr);
         if (addrlen < 0)
@@ -1174 +1176 @@
         fibril_rwlock_read_lock(&ip_globals.netifs_lock);
 
-        // device specified?
+        /* Device specified? */
         if (device_id > 0) {
                 netif = ip_netifs_find(&ip_globals.netifs, device_id);
@@ -1190 +1192 @@
                 phone = ip_prepare_icmp_and_get_phone(error, packet, NULL);
                 if (phone >= 0) {
-                        // unreachable ICMP if no routing
+                        /* Unreachable ICMP if no routing */
                         icmp_destination_unreachable_msg(phone,
                             ICMP_NET_UNREACH, 0, packet);
@@ -1198 +1200 @@
 
         if (error) {
-                // do not send for broadcast, anycast packets or network
-                // broadcast
+                /*
+                 * Do not send for broadcast, anycast packets or network
+                 * broadcast.
+                 */
                 if (!dest->s_addr || !(~dest->s_addr) ||
                     !(~((dest->s_addr & ~route->netmask.s_addr) |
@@ -1208 +1212 @@
         }
         
-        // if the local host is the destination
+        /* Ff the local host is the destination */
         if ((route->address.s_addr == dest->s_addr) &&
             (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) {
-                // find the loopback device to deliver
+                /* Find the loopback device to deliver */
                 dest->s_addr = IPV4_LOCALHOST_ADDRESS;
                 route = ip_find_route(*dest);
@@ -1220 +1224 @@
                             NULL);
                         if (phone >= 0) {
-                                // unreachable ICMP if no routing
+                                /* Unreachable ICMP if no routing */
                                 icmp_destination_unreachable_msg(phone,
                                     ICMP_HOST_UNREACH, 0, packet);
@@ -1252 +1256 @@
 
         fibril_rwlock_write_lock(&ip_globals.netifs_lock);
-        // find the device
+        /* Find the device */
         netif = ip_netifs_find(&ip_globals.netifs, device_id);
         if (!netif) {
@@ -1275 +1279 @@
         in_addr_t destination;
 
-        // TODO search set ipopt route?
+        /* TODO search set ipopt route? */
         destination.s_addr = header->destination_address;
         return destination;
@@ -1317 +1321 @@
         if ((header->flags & IPFLAG_MORE_FRAGMENTS) ||
             IP_FRAGMENT_OFFSET(header)) {
-                // TODO fragmented
+                /* TODO fragmented */
                 return ENOTSUP;
         }
@@ -1344 +1348 @@
                 return ip_release_and_return(packet, rc);
 
-        // trim padding if present
+        /* Trim padding if present */
         if (!error &&
             (IP_TOTAL_LENGTH(header) < packet_get_data_length(packet))) {
@@ -1360 +1364 @@
                 phone = ip_prepare_icmp_and_get_phone(error, packet, header);
                 if (phone >= 0) {
-                        // unreachable ICMP
+                        /* Unreachable ICMP */
                         icmp_destination_unreachable_msg(phone,
                             ICMP_PROT_UNREACH, 0, packet);
@@ -1417 +1421 @@
                 return ip_release_and_return(packet, ENOMEM);
 
-        // checksum
+        /* Checksum */
         if ((header->header_checksum) &&
             (IP_HEADER_CHECKSUM(header) != IP_CHECKSUM_ZERO)) {
                 phone = ip_prepare_icmp_and_get_phone(0, packet, header);
                 if (phone >= 0) {
-                        // checksum error ICMP
+                        /* Checksum error ICMP */
                         icmp_parameter_problem_msg(phone, ICMP_PARAM_POINTER,
                             ((size_t) ((void *) &header->header_checksum)) -
@@ -1433 +1437 @@
                 phone = ip_prepare_icmp_and_get_phone(0, packet, header);
                 if (phone >= 0) {
-                        // ttl exceeded ICMP
+                        /* ttl exceeded ICMP */
                         icmp_time_exceeded_msg(phone, ICMP_EXC_TTL, packet);
                 }
@@ -1439 +1443 @@
         }
         
-        // process ipopt and get destination
+        /* Process ipopt and get destination */
         dest = ip_get_destination(header);
 
-        // set the addrination address
+        /* Set the destination address */
         switch (header->version) {
         case IPVERSION:
@@ -1464 +1468 @@
                 phone = ip_prepare_icmp_and_get_phone(0, packet, header);
                 if (phone >= 0) {
-                        // unreachable ICMP
+                        /* Unreachable ICMP */
                         icmp_destination_unreachable_msg(phone,
                             ICMP_HOST_UNREACH, 0, packet);
@@ -1472 +1476 @@
 
         if (route->address.s_addr == dest.s_addr) {
-                // local delivery
+                /* Local delivery */
                 return ip_deliver_local(device_id, packet, header, 0);
         }
@@ -1484 +1488 @@
         phone = ip_prepare_icmp_and_get_phone(0, packet, header);
         if (phone >= 0) {
-                // unreachable ICMP if no routing
+                /* Unreachable ICMP if no routing */
                 icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0,
                     packet);
@@ -1770 +1774 @@
                 header = (ip_header_t *)(data + offset);
 
-                // destination host unreachable?
+                /* Destination host unreachable? */
                 if ((type != ICMP_DEST_UNREACH) ||
                     (code != ICMP_HOST_UNREACH)) {
-                        // no, something else
+                        /* No, something else */
                         break;
                 }
@@ -1787 +1791 @@
                 route = ip_routes_get_index(&netif->routes, 0);
 
-                // from the same network?
+                /* From the same network? */
                 if (route && ((route->address.s_addr & route->netmask.s_addr) ==
                     (header->destination_address & route->netmask.s_addr))) {
-                        // clear the ARP mapping if any
+                        /* Clear the ARP mapping if any */
                         address.value = (uint8_t *) &header->destination_address;
                         address.length = sizeof(header->destination_address);
@@ -1844 +1848 @@
         fibril_rwlock_read_lock(&ip_globals.lock);
         route = ip_find_route(*dest);
-        // if the local host is the destination
+        /* If the local host is the destination */
         if (route && (route->address.s_addr == dest->s_addr) &&
             (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) {
-                // find the loopback device to deliver
+                /* Find the loopback device to deliver */
                 dest->s_addr = IPV4_LOCALHOST_ADDRESS;
                 route = ip_find_route(*dest);

uspace/srv/net/net/net.c

@@ -289 +289 @@
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME,
             (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME,
             (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME,
             (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service);
@@ -552 +555 @@
                 rc = read_netif_configuration(conf_files[i], netif);
                 if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return rc;
@@ -562 +565 @@
                 if (!setting) {
                         fprintf(stderr, "%s: Network interface name is missing\n", NAME);
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return EINVAL;
@@ -571 +574 @@
                 int index = netifs_add(&net_globals.netifs, netif->id, netif);
                 if (index < 0) {
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return index;
@@ -583 +586 @@
                     index);
                 if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration);
-                        netifs_exclude_index(&net_globals.netifs, index);
+                        measured_strings_destroy(&netif->configuration, free);
+                        netifs_exclude_index(&net_globals.netifs, index, free);
                         return rc;
                 }
@@ -590 +593 @@
                 rc = start_device(netif);
                 if (rc != EOK) {
-                        printf("%s: Error starting interface %s (%s)\n", NAME,
+                        printf("%s: Ignoring failed interface %s (%s)\n", NAME,
                             netif->name, str_error(rc));
-                        measured_strings_destroy(&netif->configuration);
-                        netifs_exclude_index(&net_globals.netifs, index);
-                        
-                        return rc;
+                        measured_strings_destroy(&netif->configuration, free);
+                        netifs_exclude_index(&net_globals.netifs, index, free);
+                        continue;
                 }
                 

uspace/srv/net/nil/eth/eth.c

@@ -214 +214 @@
         if (rc != EOK) {
                 free(eth_globals.broadcast_addr);
-                eth_devices_destroy(&eth_globals.devices);
+                eth_devices_destroy(&eth_globals.devices, free);
         }
 out:
@@ -531 +531 @@
                             proto->service);
                 } else {
-                        // drop invalid/unknown
+                        /* Drop invalid/unknown */
                         pq_release_remote(eth_globals.net_phone,
                             packet_get_id(packet));

uspace/srv/net/tl/tcp/tcp.c

@@ -299 +299 @@
                 return tcp_release_and_return(packet, NO_DATA);
 
-//      printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header),
-//          ntohs(header->destination_port));
-
+#if 0
+        printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header),
+            ntohs(header->destination_port));
+#endif
         result = packet_get_addr(packet, (uint8_t **) &src, (uint8_t **) &dest);
         if (result <= 0)
@@ -1062 +1063 @@
         tcp_process_acknowledgement(socket, socket_data, header);
 
-        socket_data->next_incoming = ntohl(header->sequence_number);    // + 1;
+        socket_data->next_incoming = ntohl(header->sequence_number); /* + 1; */
         pq_release_remote(tcp_globals.net_phone, packet_get_id(packet));
         socket_data->state = TCP_SOCKET_ESTABLISHED;
@@ -1707 +1708 @@
                 if (socket->port > 0) {
                         socket_ports_exclude(&tcp_globals.sockets,
-                            socket->port);
+                            socket->port, free);
                         socket->port = 0;
                 }
@@ -2492 +2493 @@
         rc = packet_dimensions_initialize(&tcp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&tcp_globals.sockets);
+                socket_ports_destroy(&tcp_globals.sockets, free);
                 goto out;
         }

uspace/srv/net/tl/tcp/tcp.h

@@ -190 +190 @@
         int backlog;
         
-//      /** Segment size. */
-//      size_t segment_size;
-
         /**
          * Parent listening socket identifier.

uspace/srv/net/tl/udp/udp.c

@@ -417 +417 @@
         rc = packet_dimensions_initialize(&udp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&udp_globals.sockets);
+                socket_ports_destroy(&udp_globals.sockets, free);
                 fibril_rwlock_write_unlock(&udp_globals.lock);
                 return rc;
@@ -434 +434 @@
             &data);
         if (rc != EOK) {
-                socket_ports_destroy(&udp_globals.sockets);
+                socket_ports_destroy(&udp_globals.sockets, free);
                 fibril_rwlock_write_unlock(&udp_globals.lock);
                 return rc;
@@ -499 +499 @@
         device_id_t device_id;
         packet_dimension_t *packet_dimension;
+        size_t size;
         int rc;
+
+        /* In case of error, do not update the data fragment size. */
+        *data_fragment_size = 0;
         
         rc = tl_get_address_port(addr, addrlen, &dest_port);
@@ -539 +543 @@
                 packet_dimension = &udp_globals.packet_dimension;
 //      }
+
+        /*
+         * Update the data fragment size based on what the lower layers can
+         * handle without fragmentation, but not more than the maximum allowed
+         * for UDP.
+         */
+        size = MAX_UDP_FRAGMENT_SIZE;
+        if (packet_dimension->content < size)
+            size = packet_dimension->content;
+        *data_fragment_size = size;
 
         /* Read the first packet fragment */
@@ -740 +754 @@
         int socket_id;
         size_t addrlen;
-        size_t size = 0;
+        size_t size;
         ipc_call_t answer;
         size_t answer_count;
@@ -786 +800 @@
                                 break;
                         
+                        size = MAX_UDP_FRAGMENT_SIZE;
                         if (tl_get_ip_packet_dimension(udp_globals.ip_phone,
                             &udp_globals.dimensions, DEVICE_INVALID_ID,
                             &packet_dimension) == EOK) {
-                                SOCKET_SET_DATA_FRAGMENT_SIZE(answer,
-                                    packet_dimension->content);
+                                if (packet_dimension->content < size)
+                                        size = packet_dimension->content;
                         }
-
-//                      SOCKET_SET_DATA_FRAGMENT_SIZE(answer,
-//                          MAX_UDP_FRAGMENT_SIZE);
+                        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size);
                         SOCKET_SET_HEADER_SIZE(answer, UDP_HEADER_SIZE);
                         answer_count = 3;

uspace/srv/vfs/vfs_ops.c

@@ -611 +611 @@
 void vfs_open_node(ipc_callid_t rid, ipc_call_t *request)
 {
-        // FIXME: check for sanity of the supplied fs, dev and index
+        /* FIXME: check for sanity of the supplied fs, dev and index */
         
         /*