Changeset 8b1e15ac in mainline

Timestamp:

2011-02-11T22:26:36Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68414f4a

Parents:

1b367b4

Message:

Finish splitting device node: devman client in C library, drv library. Update device drivers accordingly.

Location:

uspace

Files:

• app/tester/hw/serial/serial1.c (modified) (1 diff)
• drv/isa/isa.c (modified) (22 diffs)
• drv/ns8250/ns8250.c (modified) (10 diffs)
• drv/pciintel/pci.c (modified) (19 diffs)
• drv/pciintel/pci.h (modified) (2 diffs)
• drv/root/root.c (modified) (2 diffs)
• drv/rootpc/rootpc.c (modified) (9 diffs)
• drv/rootvirt/rootvirt.c (modified) (3 diffs)
• drv/test1/char.c (modified) (1 diff)
• drv/test1/test1.c (modified) (2 diffs)
• drv/test2/test2.c (modified) (4 diffs)
• lib/c/generic/devman.c (modified) (3 diffs)
• lib/c/include/devman.h (modified) (1 diff)
• lib/c/include/ipc/devman.h (modified) (2 diffs)
• lib/drv/generic/driver.c (modified) (16 diffs)
• lib/drv/generic/remote_char_dev.c (modified) (5 diffs)
• lib/drv/generic/remote_hw_res.c (modified) (5 diffs)
• lib/drv/include/dev_iface.h (modified) (2 diffs)
• lib/drv/include/driver.h (modified) (6 diffs)
• lib/drv/include/ops/char_dev.h (modified) (1 diff)
• lib/drv/include/ops/hw_res.h (modified) (1 diff)
• srv/devman/devman.c (modified) (2 diffs)
• srv/devman/devman.h (modified) (1 diff)
• srv/devman/main.c (modified) (7 diffs)

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

@@ -74 +74 @@
         
         devman_handle_t handle;
-        res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,
+        res = devman_device_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
             IPC_FLAG_BLOCKING);
         if (res != EOK)

uspace/drv/isa/isa.c

@@ -58 +58 @@
 
 #define NAME "isa"
-#define CHILD_DEV_CONF_PATH "/drv/isa/isa.dev"
+#define CHILD_FUN_CONF_PATH "/drv/isa/isa.dev"
 
 #define ISA_MAX_HW_RES 4
 
-typedef struct isa_child_data {
+typedef struct isa_fun_data {
         hw_resource_list_t hw_resources;
-} isa_child_data_t;
-
-static hw_resource_list_t *isa_get_child_resources(device_t *dev)
-{
-        isa_child_data_t *dev_data;
-
-        dev_data = (isa_child_data_t *)dev->driver_data;
-        if (dev_data == NULL)
+} isa_fun_data_t;
+
+static hw_resource_list_t *isa_get_fun_resources(function_t *fun)
+{
+        isa_fun_data_t *fun_data;
+
+        fun_data = (isa_fun_data_t *)fun->driver_data;
+        if (fun_data == NULL)
                 return NULL;
 
-        return &dev_data->hw_resources;
-}
-
-static bool isa_enable_child_interrupt(device_t *dev)
+        return &fun_data->hw_resources;
+}
+
+static bool isa_enable_fun_interrupt(function_t *fun)
 {
         // TODO
@@ -84 +84 @@
 }
 
-static hw_res_ops_t isa_child_hw_res_ops = {
-        &isa_get_child_resources,
-        &isa_enable_child_interrupt
+static hw_res_ops_t isa_fun_hw_res_ops = {
+        &isa_get_fun_resources,
+        &isa_enable_fun_interrupt
 };
 
-static device_ops_t isa_child_dev_ops;
+static device_ops_t isa_fun_dev_ops;
 
 static int isa_add_device(device_t *dev);
@@ -105 +105 @@
 
 
-static isa_child_data_t *create_isa_child_data() 
-{
-        isa_child_data_t *data;
-
-        data = (isa_child_data_t *) malloc(sizeof(isa_child_data_t));
+static isa_fun_data_t *create_isa_fun_data() 
+{
+        isa_fun_data_t *data;
+
+        data = (isa_fun_data_t *) malloc(sizeof(isa_fun_data_t));
         if (data != NULL)
-                memset(data, 0, sizeof(isa_child_data_t));
+                memset(data, 0, sizeof(isa_fun_data_t));
 
         return data;
 }
 
-static device_t *create_isa_child_dev()
-{
-        device_t *dev = create_device();
-        if (dev == NULL)
+static function_t *create_isa_fun()
+{
+        function_t *fun = create_function();
+        if (fun == NULL)
                 return NULL;
 
-        isa_child_data_t *data = create_isa_child_data();
+        isa_fun_data_t *data = create_isa_fun_data();
         if (data == NULL) {
-                delete_device(dev);
+                delete_function(fun);
                 return NULL;
         }
 
-        dev->driver_data = data;
-        return dev;
-}
-
-static char *read_dev_conf(const char *conf_path)
+        fun->driver_data = data;
+        return fun;
+}
+
+static char *read_fun_conf(const char *conf_path)
 {
         bool suc = false;
@@ -151 +151 @@
         lseek(fd, 0, SEEK_SET); 
         if (len == 0) {
-                printf(NAME ": read_dev_conf error: configuration file '%s' "
+                printf(NAME ": read_fun_conf error: configuration file '%s' "
                     "is empty.\n", conf_path);
                 goto cleanup;
@@ -158 +158 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                printf(NAME ": read_dev_conf error: memory allocation failed.\n");
+                printf(NAME ": read_fun_conf error: memory allocation failed.\n");
                 goto cleanup;
         }
 
         if (0 >= read(fd, buf, len)) {
-                printf(NAME ": read_dev_conf error: unable to read file '%s'.\n",
+                printf(NAME ": read_fun_conf error: unable to read file '%s'.\n",
                     conf_path);
                 goto cleanup;
@@ -249 +249 @@
 }
 
-static void isa_child_set_irq(device_t *dev, int irq)
-{
-        isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
+static void isa_fun_set_irq(function_t *fun, int irq)
+{
+        isa_fun_data_t *data = (isa_fun_data_t *)fun->driver_data;
 
         size_t count = data->hw_resources.count;
@@ -262 +262 @@
                 data->hw_resources.count++;
 
-                printf(NAME ": added irq 0x%x to device %s\n", irq, dev->name);
-        }
-}
-
-static void isa_child_set_io_range(device_t *dev, size_t addr, size_t len)
-{
-        isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
+                printf(NAME ": added irq 0x%x to function %s\n", irq, fun->name);
+        }
+}
+
+static void isa_fun_set_io_range(function_t *fun, size_t addr, size_t len)
+{
+        isa_fun_data_t *data = (isa_fun_data_t *)fun->driver_data;
 
         size_t count = data->hw_resources.count;
@@ -282 +282 @@
 
                 printf(NAME ": added io range (addr=0x%x, size=0x%x) to "
-                    "device %s\n", (unsigned int) addr, (unsigned int) len,
-                    dev->name);
-        }
-}
-
-static void get_dev_irq(device_t *dev, char *val)
+                    "function %s\n", (unsigned int) addr, (unsigned int) len,
+                    fun->name);
+        }
+}
+
+static void get_dev_irq(function_t *fun, char *val)
 {
         int irq = 0;
         char *end = NULL;
 
-        val = skip_spaces(val); 
+        val = skip_spaces(val);
         irq = (int)strtol(val, &end, 0x10);
 
         if (val != end)
-                isa_child_set_irq(dev, irq);
-}
-
-static void get_dev_io_range(device_t *dev, char *val)
+                isa_fun_set_irq(fun, irq);
+}
+
+static void get_dev_io_range(function_t *fun, char *val)
 {
         size_t addr, len;
         char *end = NULL;
 
-        val = skip_spaces(val); 
+        val = skip_spaces(val);
         addr = strtol(val, &end, 0x10);
 
@@ -310 +310 @@
                 return;
 
-        val = skip_spaces(end); 
+        val = skip_spaces(end);
         len = strtol(val, &end, 0x10);
 
@@ -316 +316 @@
                 return;
 
-        isa_child_set_io_range(dev, addr, len);
+        isa_fun_set_io_range(fun, addr, len);
 }
 
@@ -331 +331 @@
 }
 
-static void get_dev_match_id(device_t *dev, char *val)
+static void get_fun_match_id(function_t *fun, char *val)
 {
         char *id = NULL;
@@ -342 +342 @@
         if (val == end) {
                 printf(NAME " : error - could not read match score for "
-                    "device %s.\n", dev->name);
+                    "function %s.\n", fun->name);
                 return;
         }
@@ -348 +348 @@
         match_id_t *match_id = create_match_id();
         if (match_id == NULL) {
-                printf(NAME " : failed to allocate match id for device %s.\n",
-                    dev->name);
+                printf(NAME " : failed to allocate match id for function %s.\n",
+                    fun->name);
                 return;
         }
@@ -357 +357 @@
         if (id == NULL) {
                 printf(NAME " : error - could not read match id for "
-                    "device %s.\n", dev->name);
+                    "function %s.\n", fun->name);
                 delete_match_id(match_id);
                 return;
@@ -365 +365 @@
         match_id->score = score;
 
-        printf(NAME ": adding match id '%s' with score %d to device %s\n", id,
-            score, dev->name);
-        add_match_id(&dev->match_ids, match_id);
-}
-
-static bool read_dev_prop(device_t *dev, char *line, const char *prop,
-    void (*read_fn)(device_t *, char *))
+        printf(NAME ": adding match id '%s' with score %d to function %s\n", id,
+            score, fun->name);
+        add_match_id(&fun->match_ids, match_id);
+}
+
+static bool read_fun_prop(function_t *fun, char *line, const char *prop,
+    void (*read_fn)(function_t *, char *))
 {
         size_t proplen = str_size(prop);
@@ -378 +378 @@
                 line += proplen;
                 line = skip_spaces(line);
-                (*read_fn)(dev, line);
+                (*read_fn)(fun, line);
 
                 return true;
@@ -386 +386 @@
 }
 
-static void get_dev_prop(device_t *dev, char *line)
+static void get_fun_prop(function_t *fun, char *line)
 {
         /* Skip leading spaces. */
         line = skip_spaces(line);
 
-        if (!read_dev_prop(dev, line, "io_range", &get_dev_io_range) &&
-            !read_dev_prop(dev, line, "irq", &get_dev_irq) &&
-            !read_dev_prop(dev, line, "match", &get_dev_match_id))
+        if (!read_fun_prop(fun, line, "io_range", &get_dev_io_range) &&
+            !read_fun_prop(fun, line, "irq", &get_dev_irq) &&
+            !read_fun_prop(fun, line, "match", &get_fun_match_id))
         {
             printf(NAME " error undefined device property at line '%s'\n",
@@ -400 +400 @@
 }
 
-static void child_alloc_hw_res(device_t *dev)
-{
-        isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
+static void child_alloc_hw_res(function_t *fun)
+{
+        isa_fun_data_t *data = (isa_fun_data_t *)fun->driver_data;
         data->hw_resources.resources = 
             (hw_resource_t *)malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
 }
 
-static char *read_isa_dev_info(char *dev_conf, device_t *parent)
+static char *read_isa_fun_info(char *fun_conf, device_t *dev)
 {
         char *line;
-        char *dev_name = NULL;
+        char *fun_name = NULL;
 
         /* Skip empty lines. */
         while (true) {
-                line = str_get_line(dev_conf, &dev_conf);
+                line = str_get_line(fun_conf, &fun_conf);
 
                 if (line == NULL) {
@@ -426 +426 @@
 
         /* Get device name. */
-        dev_name = get_device_name(line);
-        if (dev_name == NULL)
+        fun_name = get_device_name(line);
+        if (fun_name == NULL)
                 return NULL;
 
-        device_t *dev = create_isa_child_dev();
-        if (dev == NULL) {
-                free(dev_name);
+        function_t *fun = create_isa_fun();
+        if (fun == NULL) {
+                free(fun_name);
                 return NULL;
         }
 
-        dev->name = dev_name;
+        fun->name = fun_name;
+        fun->ftype = fun_inner;
 
         /* Allocate buffer for the list of hardware resources of the device. */
-        child_alloc_hw_res(dev);
+        child_alloc_hw_res(fun);
 
         /* Get properties of the device (match ids, irq and io range). */
         while (true) {
-                line = str_get_line(dev_conf, &dev_conf);
+                line = str_get_line(fun_conf, &fun_conf);
 
                 if (line_empty(line)) {
@@ -454 +455 @@
                  * and store it in the device structure.
                  */
-                get_dev_prop(dev, line);
-
-                //printf(NAME ": next line ='%s'\n", dev_conf);
+                get_fun_prop(fun, line);
+
+                //printf(NAME ": next line ='%s'\n", fun_conf);
                 //printf(NAME ": current line ='%s'\n", line);
         }
 
         /* Set device operations to the device. */
-        dev->ops = &isa_child_dev_ops;
-
-        printf(NAME ": child_device_register(dev, parent); device is %s.\n",
-            dev->name);
-        child_device_register(dev, parent);
-
-        return dev_conf;
-}
-
-static void parse_dev_conf(char *conf, device_t *parent)
+        fun->ops = &isa_fun_dev_ops;
+
+        printf(NAME ": register_function(fun, dev); function is %s.\n",
+            fun->name);
+        register_function(fun, dev);
+
+        return fun_conf;
+}
+
+static void parse_fun_conf(char *conf, device_t *dev)
 {
         while (conf != NULL && *conf != '\0') {
-                conf = read_isa_dev_info(conf, parent);
-        }
-}
-
-static void add_legacy_children(device_t *parent)
-{
-        char *dev_conf;
-
-        dev_conf = read_dev_conf(CHILD_DEV_CONF_PATH);
-        if (dev_conf != NULL) {
-                parse_dev_conf(dev_conf, parent);
-                free(dev_conf);
+                conf = read_isa_fun_info(conf, dev);
+        }
+}
+
+static void add_legacy_children(device_t *dev)
+{
+        char *fun_conf;
+
+        fun_conf = read_fun_conf(CHILD_FUN_CONF_PATH);
+        if (fun_conf != NULL) {
+                parse_fun_conf(fun_conf, dev);
+                free(fun_conf);
         }
 }
@@ -492 +493 @@
         printf(NAME ": isa_add_device, device handle = %d\n",
             (int) dev->handle);
+
+        /* Make the bus device more visible. Does not do anything. */
+        printf(NAME ": adding a 'ctl' function\n");
+
+        function_t *ctl = create_function();
+        ctl->ftype = fun_exposed;
+        ctl->name = "ctl";
+        register_function(ctl, dev);
 
         /* Add child devices. */
@@ -502 +511 @@
 static void isa_init() 
 {
-        isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_hw_res_ops;
+        isa_fun_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops;
 }
 

uspace/drv/ns8250/ns8250.c

@@ -1 @@
-/*
+/*                        
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -178 +178 @@
  *                      error number otherwise.
  */
-static int ns8250_read(device_t *dev, char *buf, size_t count)
+static int ns8250_read(function_t *fun, char *buf, size_t count)
 {
         int ret = EOK;
-        ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
+        ns8250_dev_data_t *data = (ns8250_dev_data_t *) fun->dev->driver_data;
         
         fibril_mutex_lock(&data->mutex);
@@ -212 +212 @@
  * @return              Zero on success.
  */
-static int ns8250_write(device_t *dev, char *buf, size_t count) 
-{
-        ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
+static int ns8250_write(function_t *fun, char *buf, size_t count)
+{
+        ns8250_dev_data_t *data = (ns8250_dev_data_t *) fun->dev->driver_data;
         size_t idx;
         
@@ -719 +719 @@
 static int ns8250_add_device(device_t *dev)
 {
+        function_t *fun;
+
         printf(NAME ": ns8250_add_device %s (handle = %d)\n",
             dev->name, (int) dev->handle);
@@ -756 +758 @@
                 return res;
         }
+
+        fun = create_function();
+        fun->ftype = fun_exposed;
+        fun->name = "a";
         
         /* Set device operations. */
-        dev->ops = &ns8250_dev_ops;
-        
-        add_device_to_class(dev, "serial");
+        fun->ops = &ns8250_dev_ops;
+        register_function(fun, dev);
+        
+        add_function_to_class(fun, "serial");
         
         printf(NAME ": the %s device has been successfully initialized.\n",
@@ -775 +782 @@
  * @param dev           The device.
  */
-static int ns8250_open(device_t *dev)
-{
-        ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
+static int ns8250_open(function_t *fun)
+{
+        ns8250_dev_data_t *data = (ns8250_dev_data_t *) fun->dev->driver_data;
         int res;
         
@@ -799 +806 @@
  * @param dev           The device.
  */
-static void ns8250_close(device_t *dev)
-{
-        ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
+static void ns8250_close(function_t *fun)
+{
+        ns8250_dev_data_t *data = (ns8250_dev_data_t *) fun->dev->driver_data;
         
         fibril_mutex_lock(&data->mutex);
@@ -877 +884 @@
  * Configure the parameters of the serial communication.
  */
-static void ns8250_default_handler(device_t *dev, ipc_callid_t callid,
+static void ns8250_default_handler(function_t *fun, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -886 +893 @@
         switch (method) {
         case SERIAL_GET_COM_PROPS:
-                ns8250_get_props(dev, &baud_rate, &parity, &word_length,
+                ns8250_get_props(fun->dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
                 async_answer_4(callid, EOK, baud_rate, parity, word_length,
@@ -897 +904 @@
                 word_length = IPC_GET_ARG3(*call);
                 stop_bits = IPC_GET_ARG4(*call);
-                ret = ns8250_set_props(dev, baud_rate, parity, word_length,
+                ret = ns8250_set_props(fun->dev, baud_rate, parity, word_length,
                     stop_bits);
                 async_answer_0(callid, ret);

uspace/drv/pciintel/pci.c

@@ -61 +61 @@
         ((1 << 31) | (bus << 16) | (dev << 11) | (fn << 8) | (reg & ~3))
 
-static hw_resource_list_t *pciintel_get_child_resources(device_t *dev)
-{
-        pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
-        
-        if (dev_data == NULL)
+static hw_resource_list_t *pciintel_get_child_resources(function_t *fun)
+{
+        pci_fun_data_t *fun_data = (pci_fun_data_t *) fun->driver_data;
+        
+        if (fun_data == NULL)
                 return NULL;
-        return &dev_data->hw_resources;
-}
-
-static bool pciintel_enable_child_interrupt(device_t *dev)
+        return &fun_data->hw_resources;
+}
+
+static bool pciintel_enable_child_interrupt(function_t *fun)
 {
         /* TODO */
@@ -122 +122 @@
 }
 
-static void pci_conf_read(device_t *dev, int reg, uint8_t *buf, size_t len)
-{
-        assert(dev->parent != NULL);
-        
-        pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
-        pci_bus_data_t *bus_data = (pci_bus_data_t *) dev->parent->driver_data;
+static void pci_conf_read(function_t *fun, int reg, uint8_t *buf, size_t len)
+{
+        assert(fun->dev != NULL);
+        
+        pci_fun_data_t *fun_data = (pci_fun_data_t *) fun->driver_data;
+        pci_bus_data_t *bus_data = (pci_bus_data_t *) fun->dev->driver_data;
         
         fibril_mutex_lock(&bus_data->conf_mutex);
         
         uint32_t conf_addr;
-        conf_addr = CONF_ADDR(dev_data->bus, dev_data->dev, dev_data->fn, reg);
+        conf_addr = CONF_ADDR(fun_data->bus, fun_data->dev, fun_data->fn, reg);
         void *addr = bus_data->conf_data_port + (reg & 3);
         
@@ -152 +152 @@
 }
 
-static void pci_conf_write(device_t *dev, int reg, uint8_t *buf, size_t len)
-{
-        assert(dev->parent != NULL);
-        
-        pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
-        pci_bus_data_t *bus_data = (pci_bus_data_t *) dev->parent->driver_data;
+static void pci_conf_write(function_t *fun, int reg, uint8_t *buf, size_t len)
+{
+        assert(fun->dev != NULL);
+        
+        pci_fun_data_t *fun_data = (pci_fun_data_t *) fun->driver_data;
+        pci_bus_data_t *bus_data = (pci_bus_data_t *) fun->dev->driver_data;
         
         fibril_mutex_lock(&bus_data->conf_mutex);
         
         uint32_t conf_addr;
-        conf_addr = CONF_ADDR(dev_data->bus, dev_data->dev, dev_data->fn, reg);
+        conf_addr = CONF_ADDR(fun_data->bus, fun_data->dev, fun_data->fn, reg);
         void *addr = bus_data->conf_data_port + (reg & 3);
         
@@ -182 +182 @@
 }
 
-uint8_t pci_conf_read_8(device_t *dev, int reg)
+uint8_t pci_conf_read_8(function_t *fun, int reg)
 {
         uint8_t res;
-        pci_conf_read(dev, reg, &res, 1);
+        pci_conf_read(fun, reg, &res, 1);
         return res;
 }
 
-uint16_t pci_conf_read_16(device_t *dev, int reg)
+uint16_t pci_conf_read_16(function_t *fun, int reg)
 {
         uint16_t res;
-        pci_conf_read(dev, reg, (uint8_t *) &res, 2);
+        pci_conf_read(fun, reg, (uint8_t *) &res, 2);
         return res;
 }
 
-uint32_t pci_conf_read_32(device_t *dev, int reg)
+uint32_t pci_conf_read_32(function_t *fun, int reg)
 {
         uint32_t res;
-        pci_conf_read(dev, reg, (uint8_t *) &res, 4);
+        pci_conf_read(fun, reg, (uint8_t *) &res, 4);
         return res;
 }
 
-void pci_conf_write_8(device_t *dev, int reg, uint8_t val)
-{
-        pci_conf_write(dev, reg, (uint8_t *) &val, 1);
-}
-
-void pci_conf_write_16(device_t *dev, int reg, uint16_t val)
-{
-        pci_conf_write(dev, reg, (uint8_t *) &val, 2);
-}
-
-void pci_conf_write_32(device_t *dev, int reg, uint32_t val)
-{
-        pci_conf_write(dev, reg, (uint8_t *) &val, 4);
-}
-
-void create_pci_match_ids(device_t *dev)
-{
-        pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
+void pci_conf_write_8(function_t *fun, int reg, uint8_t val)
+{
+        pci_conf_write(fun, reg, (uint8_t *) &val, 1);
+}
+
+void pci_conf_write_16(function_t *fun, int reg, uint16_t val)
+{
+        pci_conf_write(fun, reg, (uint8_t *) &val, 2);
+}
+
+void pci_conf_write_32(function_t *fun, int reg, uint32_t val)
+{
+        pci_conf_write(fun, reg, (uint8_t *) &val, 4);
+}
+
+void create_pci_match_ids(function_t *fun)
+{
+        pci_fun_data_t *fun_data = (pci_fun_data_t *) fun->driver_data;
         match_id_t *match_id = NULL;
         char *match_id_str;
@@ -227 +227 @@
         if (match_id != NULL) {
                 asprintf(&match_id_str, "pci/ven=%04x&dev=%04x",
-                    dev_data->vendor_id, dev_data->device_id);
+                    fun_data->vendor_id, fun_data->device_id);
                 match_id->id = match_id_str;
                 match_id->score = 90;
-                add_match_id(&dev->match_ids, match_id);
+                add_match_id(&fun->match_ids, match_id);
         }
 
@@ -237 +237 @@
 
 void
-pci_add_range(device_t *dev, uint64_t range_addr, size_t range_size, bool io)
-{
-        pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
-        hw_resource_list_t *hw_res_list = &dev_data->hw_resources;
+pci_add_range(function_t *fun, uint64_t range_addr, size_t range_size, bool io)
+{
+        pci_fun_data_t *fun_data = (pci_fun_data_t *) fun->driver_data;
+        hw_resource_list_t *hw_res_list = &fun_data->hw_resources;
         hw_resource_t *hw_resources =  hw_res_list->resources;
         size_t count = hw_res_list->count;
@@ -270 +270 @@
  * @return      The addr the address of the BAR which should be read next.
  */
-int pci_read_bar(device_t *dev, int addr)
+int pci_read_bar(function_t *fun, int addr)
 {       
         /* Value of the BAR */
@@ -285 +285 @@
         
         /* Get the value of the BAR. */
-        val = pci_conf_read_32(dev, addr);
+        val = pci_conf_read_32(fun, addr);
         
         io = (bool) (val & 1);
@@ -305 +305 @@
         
         /* Get the address mask. */
-        pci_conf_write_32(dev, addr, 0xffffffff);
-        mask = pci_conf_read_32(dev, addr);
+        pci_conf_write_32(fun, addr, 0xffffffff);
+        mask = pci_conf_read_32(fun, addr);
         
         /* Restore the original value. */
-        pci_conf_write_32(dev, addr, val);
-        val = pci_conf_read_32(dev, addr);
+        pci_conf_write_32(fun, addr, val);
+        val = pci_conf_read_32(fun, addr);
         
         range_size = pci_bar_mask_to_size(mask);
         
         if (addrw64) {
-                range_addr = ((uint64_t)pci_conf_read_32(dev, addr + 4) << 32) |
+                range_addr = ((uint64_t)pci_conf_read_32(fun, addr + 4) << 32) |
                     (val & 0xfffffff0);
         } else {
@@ -322 +322 @@
         
         if (range_addr != 0) {
-                printf(NAME ": device %s : ", dev->name);
+                printf(NAME ": function %s : ", fun->name);
                 printf("address = %" PRIx64, range_addr);
                 printf(", size = %x\n", (unsigned int) range_size);
         }
         
-        pci_add_range(dev, range_addr, range_size, io);
+        pci_add_range(fun, range_addr, range_size, io);
         
         if (addrw64)
@@ -335 +335 @@
 }
 
-void pci_add_interrupt(device_t *dev, int irq)
-{
-        pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
-        hw_resource_list_t *hw_res_list = &dev_data->hw_resources;
+void pci_add_interrupt(function_t *fun, int irq)
+{
+        pci_fun_data_t *fun_data = (pci_fun_data_t *) fun->driver_data;
+        hw_resource_list_t *hw_res_list = &fun_data->hw_resources;
         hw_resource_t *hw_resources = hw_res_list->resources;
         size_t count = hw_res_list->count;
@@ -350 +350 @@
         hw_res_list->count++;
         
-        printf(NAME ": device %s uses irq %x.\n", dev->name, irq);
-}
-
-void pci_read_interrupt(device_t *dev)
-{
-        uint8_t irq = pci_conf_read_8(dev, PCI_BRIDGE_INT_LINE);
+        printf(NAME ": function %s uses irq %x.\n", fun->name, irq);
+}
+
+void pci_read_interrupt(function_t *fun)
+{
+        uint8_t irq = pci_conf_read_8(fun, PCI_BRIDGE_INT_LINE);
         if (irq != 0xff)
-                pci_add_interrupt(dev, irq);
+                pci_add_interrupt(fun, irq);
 }
 
 /** Enumerate (recursively) and register the devices connected to a pci bus.
  *
- * @param parent        The host-to-pci bridge device.
+ * @param dev           The host-to-pci bridge device.
  * @param bus_num       The bus number.
  */
-void pci_bus_scan(device_t *parent, int bus_num) 
-{
-        device_t *dev = create_device();
-        pci_dev_data_t *dev_data = create_pci_dev_data();
-        dev->driver_data = dev_data;
-        dev->parent = parent;
+void pci_bus_scan(device_t *dev, int bus_num) 
+{
+        function_t *fun = create_function();
+        pci_fun_data_t *fun_data = create_pci_fun_data();
+        fun->driver_data = fun_data;
         
         int child_bus = 0;
         int dnum, fnum;
         bool multi;
-        uint8_t header_type; 
+        uint8_t header_type;
+
+        /* We need this early, before registering. */
+        fun->dev = dev;
         
         for (dnum = 0; dnum < 32; dnum++) {
                 multi = true;
                 for (fnum = 0; multi && fnum < 8; fnum++) {
-                        init_pci_dev_data(dev_data, bus_num, dnum, fnum);
-                        dev_data->vendor_id = pci_conf_read_16(dev,
+                        init_pci_fun_data(fun_data, bus_num, dnum, fnum);
+                        fun_data->vendor_id = pci_conf_read_16(fun,
                             PCI_VENDOR_ID);
-                        dev_data->device_id = pci_conf_read_16(dev,
+                        fun_data->device_id = pci_conf_read_16(fun,
                             PCI_DEVICE_ID);
-                        if (dev_data->vendor_id == 0xffff) {
+                        if (fun_data->vendor_id == 0xffff) {
                                 /*
                                  * The device is not present, go on scanning the
@@ -396 +398 @@
                         }
                         
-                        header_type = pci_conf_read_8(dev, PCI_HEADER_TYPE);
+                        header_type = pci_conf_read_8(fun, PCI_HEADER_TYPE);
                         if (fnum == 0) {
                                 /* Is the device multifunction? */
@@ -404 +406 @@
                         header_type = header_type & 0x7F;
                         
-                        create_pci_dev_name(dev);
-                        
-                        pci_alloc_resource_list(dev);
-                        pci_read_bars(dev);
-                        pci_read_interrupt(dev);
-                        
-                        dev->ops = &pci_child_ops;
-                        
-                        printf(NAME ": adding new child device %s.\n",
-                            dev->name);
-                        
-                        create_pci_match_ids(dev);
-                        
-                        if (child_device_register(dev, parent) != EOK) {
-                                pci_clean_resource_list(dev);
-                                clean_match_ids(&dev->match_ids);
-                                free((char *) dev->name);
-                                dev->name = NULL;
+                        create_pci_fun_name(fun);
+                        
+                        pci_alloc_resource_list(fun);
+                        pci_read_bars(fun);
+                        pci_read_interrupt(fun);
+                        
+                        fun->ftype = fun_inner;
+                        fun->ops = &pci_child_ops;
+                        
+                        printf(NAME ": adding new function %s.\n",
+                            fun->name);
+                        
+                        create_pci_match_ids(fun);
+                        
+                        if (register_function(fun, dev) != EOK) {
+                                pci_clean_resource_list(fun);
+                                clean_match_ids(&fun->match_ids);
+                                free((char *) fun->name);
+                                fun->name = NULL;
                                 continue;
                         }
@@ -427 +430 @@
                         if (header_type == PCI_HEADER_TYPE_BRIDGE ||
                             header_type == PCI_HEADER_TYPE_CARDBUS) {
-                                child_bus = pci_conf_read_8(dev,
+                                child_bus = pci_conf_read_8(fun,
                                     PCI_BRIDGE_SEC_BUS_NUM);
                                 printf(NAME ": device is pci-to-pci bridge, "
                                     "secondary bus number = %d.\n", bus_num);
                                 if (child_bus > bus_num)
-                                        pci_bus_scan(parent, child_bus);
+                                        pci_bus_scan(dev, child_bus);
                         }
                         
-                        /* Alloc new aux. dev. structure. */
-                        dev = create_device();
-                        dev_data = create_pci_dev_data();
-                        dev->driver_data = dev_data;
-                        dev->parent = parent;
+                        /* Alloc new aux. fun. structure. */
+                        fun = create_function();
+
+                        /* We need this early, before registering. */
+                        fun->dev = dev;
+
+                        fun_data = create_pci_fun_data();
+                        fun->driver_data = fun_data;
                 }
         }
         
-        if (dev_data->vendor_id == 0xffff) {
-                delete_device(dev);
-                /* Free the auxiliary device structure. */
-                delete_pci_dev_data(dev_data);
+        if (fun_data->vendor_id == 0xffff) {
+                delete_function(fun);
+                /* Free the auxiliary function structure. */
+                delete_pci_fun_data(fun_data);
         }
 }
@@ -504 +510 @@
         dev->driver_data = bus_data;
         
+        /* Make the bus device more visible. Does not do anything. */
+        printf(NAME ": adding a 'ctl' function\n");
+
+        function_t *ctl = create_function();
+        ctl->ftype = fun_exposed;
+        ctl->name = "ctl";
+        register_function(ctl, dev);
+        
         /* Enumerate child devices. */
         printf(NAME ": scanning the bus\n");
@@ -518 +532 @@
 }
 
-pci_dev_data_t *create_pci_dev_data(void)
-{
-        pci_dev_data_t *res = (pci_dev_data_t *) malloc(sizeof(pci_dev_data_t));
+pci_fun_data_t *create_pci_fun_data(void)
+{
+        pci_fun_data_t *res = (pci_fun_data_t *) malloc(sizeof(pci_fun_data_t));
         
         if (res != NULL)
-                memset(res, 0, sizeof(pci_dev_data_t));
+                memset(res, 0, sizeof(pci_fun_data_t));
         return res;
 }
 
-void init_pci_dev_data(pci_dev_data_t *dev_data, int bus, int dev, int fn)
-{
-        dev_data->bus = bus;
-        dev_data->dev = dev;
-        dev_data->fn = fn;
-}
-
-void delete_pci_dev_data(pci_dev_data_t *dev_data)
-{
-        if (dev_data != NULL) {
-                hw_res_clean_resource_list(&dev_data->hw_resources);
-                free(dev_data);
-        }
-}
-
-void create_pci_dev_name(device_t *dev)
-{
-        pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
+void init_pci_fun_data(pci_fun_data_t *fun_data, int bus, int dev, int fn)
+{
+        fun_data->bus = bus;
+        fun_data->dev = dev;
+        fun_data->fn = fn;
+}
+
+void delete_pci_fun_data(pci_fun_data_t *fun_data)
+{
+        if (fun_data != NULL) {
+                hw_res_clean_resource_list(&fun_data->hw_resources);
+                free(fun_data);
+        }
+}
+
+void create_pci_fun_name(function_t *fun)
+{
+        pci_fun_data_t *fun_data = (pci_fun_data_t *) fun->driver_data;
         char *name = NULL;
         
-        asprintf(&name, "%02x:%02x.%01x", dev_data->bus, dev_data->dev,
-            dev_data->fn);
-        dev->name = name;
-}
-
-bool pci_alloc_resource_list(device_t *dev)
-{
-        pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
-        
-        dev_data->hw_resources.resources =
+        asprintf(&name, "%02x:%02x.%01x", fun_data->bus, fun_data->dev,
+            fun_data->fn);
+        fun->name = name;
+}
+
+bool pci_alloc_resource_list(function_t *fun)
+{
+        pci_fun_data_t *fun_data = (pci_fun_data_t *)fun->driver_data;
+        
+        fun_data->hw_resources.resources =
             (hw_resource_t *) malloc(PCI_MAX_HW_RES * sizeof(hw_resource_t));
-        return dev_data->hw_resources.resources != NULL;
-}
-
-void pci_clean_resource_list(device_t *dev)
-{
-        pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
-        
-        if (dev_data->hw_resources.resources != NULL) {
-                free(dev_data->hw_resources.resources);
-                dev_data->hw_resources.resources = NULL;
+        return fun_data->hw_resources.resources != NULL;
+}
+
+void pci_clean_resource_list(function_t *fun)
+{
+        pci_fun_data_t *fun_data = (pci_fun_data_t *) fun->driver_data;
+        
+        if (fun_data->hw_resources.resources != NULL) {
+                free(fun_data->hw_resources.resources);
+                fun_data->hw_resources.resources = NULL;
         }
 }
@@ -576 +590 @@
  * @param dev the pci device.
  */
-void pci_read_bars(device_t *dev)
+void pci_read_bars(function_t *fun)
 {
         /*
@@ -585 +599 @@
         
         while (addr <= PCI_BASE_ADDR_5)
-                addr = pci_read_bar(dev, addr);
+                addr = pci_read_bar(fun, addr);
 }
 

uspace/drv/pciintel/pci.h

@@ -44 +44 @@
 #define PCI_MAX_HW_RES 8
 
-typedef struct pci_dev_data {
+typedef struct pci_fun_data {
         int bus;
         int dev;
@@ -51 +51 @@
         int device_id;
         hw_resource_list_t hw_resources;
-} pci_dev_data_t;
+} pci_fun_data_t;
 
-extern void create_pci_match_ids(device_t *);
+extern void create_pci_match_ids(function_t *);
 
-extern uint8_t pci_conf_read_8(device_t *, int);
-extern uint16_t pci_conf_read_16(device_t *, int);
-extern uint32_t pci_conf_read_32(device_t *, int);
-extern void pci_conf_write_8(device_t *, int, uint8_t);
-extern void pci_conf_write_16(device_t *, int, uint16_t);
-extern void pci_conf_write_32(device_t *, int, uint32_t);
+extern uint8_t pci_conf_read_8(function_t *, int);
+extern uint16_t pci_conf_read_16(function_t *, int);
+extern uint32_t pci_conf_read_32(function_t *, int);
+extern void pci_conf_write_8(function_t *, int, uint8_t);
+extern void pci_conf_write_16(function_t *, int, uint16_t);
+extern void pci_conf_write_32(function_t *, int, uint32_t);
 
-extern void pci_add_range(device_t *, uint64_t, size_t, bool);
-extern int pci_read_bar(device_t *, int);
-extern void pci_read_interrupt(device_t *);
-extern void pci_add_interrupt(device_t *, int);
+extern void pci_add_range(function_t *, uint64_t, size_t, bool);
+extern int pci_read_bar(function_t *, int);
+extern void pci_read_interrupt(function_t *);
+extern void pci_add_interrupt(function_t *, int);
 
 extern void pci_bus_scan(device_t *, int);
 
-extern pci_dev_data_t *create_pci_dev_data(void);
-extern void init_pci_dev_data(pci_dev_data_t *, int, int, int);
-extern void delete_pci_dev_data(pci_dev_data_t *);
-extern void create_pci_dev_name(device_t *);
+extern pci_fun_data_t *create_pci_fun_data(void);
+extern void init_pci_fun_data(pci_fun_data_t *, int, int, int);
+extern void delete_pci_fun_data(pci_fun_data_t *);
+extern void create_pci_fun_name(function_t *);
 
-extern bool pci_alloc_resource_list(device_t *);
-extern void pci_clean_resource_list(device_t *);
+extern bool pci_alloc_resource_list(function_t *);
+extern void pci_clean_resource_list(function_t *);
 
-extern void pci_read_bars(device_t *);
+extern void pci_read_bars(function_t *);
 extern size_t pci_bar_mask_to_size(uint32_t);
 

uspace/drv/root/root.c

@@ -87 +87 @@
             VIRTUAL_DEVICE_MATCH_SCORE, VIRTUAL_DEVICE_MATCH_ID);
 
-        int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
+        int res = register_function_wrapper(parent, VIRTUAL_DEVICE_NAME,
             VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
 
@@ -135 +135 @@
             PLATFORM_DEVICE_MATCH_SCORE, match_id);
 
-        res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
+        res = register_function_wrapper(parent, PLATFORM_DEVICE_NAME,
             match_id, PLATFORM_DEVICE_MATCH_SCORE);
 

uspace/drv/rootpc/rootpc.c

@@ -55 +55 @@
 #define NAME "rootpc"
 
-typedef struct rootpc_child_dev_data {
+typedef struct rootpc_fun_data {
         hw_resource_list_t hw_resources;
-} rootpc_child_dev_data_t;
+} rootpc_fun_data_t;
 
 static int rootpc_add_device(device_t *dev);
@@ -82 +82 @@
 };
 
-static rootpc_child_dev_data_t pci_data = {
+static rootpc_fun_data_t pci_data = {
         .hw_resources = {
                 1,
@@ -89 +89 @@
 };
 
-static hw_resource_list_t *rootpc_get_child_resources(device_t *dev)
-{
-        rootpc_child_dev_data_t *data;
-        
-        data = (rootpc_child_dev_data_t *) dev->driver_data;
+static hw_resource_list_t *rootpc_get_fun_resources(function_t *fun)
+{
+        rootpc_fun_data_t *data;
+        
+        data = (rootpc_fun_data_t *) fun->driver_data;
         if (NULL == data)
                 return NULL;
@@ -100 +100 @@
 }
 
-static bool rootpc_enable_child_interrupt(device_t *dev)
+static bool rootpc_enable_fun_interrupt(function_t *fun)
 {
         /* TODO */
@@ -107 +107 @@
 }
 
-static hw_res_ops_t child_hw_res_ops = {
-        &rootpc_get_child_resources,
-        &rootpc_enable_child_interrupt
+static hw_res_ops_t fun_hw_res_ops = {
+        &rootpc_get_fun_resources,
+        &rootpc_enable_fun_interrupt
 };
 
 /* Initialized in root_pc_init() function. */
-static device_ops_t rootpc_child_ops;
+static device_ops_t rootpc_fun_ops;
 
 static bool
-rootpc_add_child(device_t *parent, const char *name, const char *str_match_id,
-    rootpc_child_dev_data_t *drv_data)
-{
-        printf(NAME ": adding new child device '%s'.\n", name);
-        
-        device_t *child = NULL;
+rootpc_add_fun(device_t *parent, const char *name, const char *str_match_id,
+    rootpc_fun_data_t *drv_data)
+{
+        printf(NAME ": adding new function '%s'.\n", name);
+        
+        function_t *fun = NULL;
         match_id_t *match_id = NULL;
         
         /* Create new device. */
-        child = create_device();
-        if (NULL == child)
+        fun = create_function();
+        if (fun == NULL)
                 goto failure;
         
-        child->name = name;
-        child->driver_data = drv_data;
+        fun->name = name;
+        fun->driver_data = drv_data;
+        fun->ftype = fun_inner;
         
         /* Initialize match id list */
@@ -139 +140 @@
         match_id->id = str_match_id;
         match_id->score = 100;
-        add_match_id(&child->match_ids, match_id);
+        add_match_id(&fun->match_ids, match_id);
         
         /* Set provided operations to the device. */
-        child->ops = &rootpc_child_ops;
-        
-        /* Register child device. */
-        if (EOK != child_device_register(child, parent))
+        fun->ops = &rootpc_fun_ops;
+        
+        /* Register function. */
+        if (EOK != register_function(fun, parent))
                 goto failure;
+        printf(NAME ": registered function handle = %u\n", fun->handle);
         
         return true;
@@ -154 +156 @@
                 match_id->id = NULL;
         
-        if (NULL != child) {
-                child->name = NULL;
-                delete_device(child);
-        }
-        
-        printf(NAME ": failed to add child device '%s'.\n", name);
+        if (NULL != fun) {
+                fun->name = NULL;
+                delete_function(fun);
+        }
+        
+        printf(NAME ": failed to add function '%s'.\n", name);
         
         return false;
 }
 
-static bool rootpc_add_children(device_t *dev)
-{
-        return rootpc_add_child(dev, "pci0", "intel_pci", &pci_data);
+static bool rootpc_add_functions(device_t *dev)
+{
+        return rootpc_add_fun(dev, "pci0", "intel_pci", &pci_data);
 }
 
@@ -180 +182 @@
             (int)dev->handle);
         
-        /* Register child devices. */
-        if (!rootpc_add_children(dev)) {
-                printf(NAME ": failed to add child devices for PC platform.\n");
+        /* Register functions. */
+        if (!rootpc_add_functions(dev)) {
+                printf(NAME ": failed to add functions for PC platform.\n");
         }
         
@@ -190 +192 @@
 static void root_pc_init(void)
 {
-        rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_hw_res_ops;
+        rootpc_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
 }
 

uspace/drv/rootvirt/rootvirt.c

@@ -43 +43 @@
 #define NAME "rootvirt"
 
-/** Virtual device entry. */
+/** Virtual function entry */
 typedef struct {
-        /** Device name. */
+        /** Function name */
         const char *name;
-        /** Device match id. */
+        /** Function match ID */
         const char *match_id;
-} virtual_device_t;
+} virtual_function_t;
 
-/** List of existing virtual devices. */
-virtual_device_t virtual_devices[] = {
+/** List of existing virtual functions */
+virtual_function_t virtual_functions[] = {
 #include "devices.def"
-        /* Terminating item. */
+        /* Terminating item */
         {
                 .name = NULL,
@@ -72 +72 @@
 };
 
-/** Add child device.
+/** Add function to the virtual device.
  *
- * @param parent Parent device.
- * @param virt_dev Virtual device to add.
- * @return Error code.
+ * @param vdev          The virtual device
+ * @param vfun          Virtual function description
+ * @return              EOK on success or negative error code.
  */
-static int add_child(device_t *parent, virtual_device_t *virt_dev)
+static int add_child(device_t *vdev, virtual_function_t *vfun)
 {
-        printf(NAME ": registering child device `%s' (match \"%s\")\n",
-            virt_dev->name, virt_dev->match_id);
+        printf(NAME ": registering function `%s' (match \"%s\")\n",
+            vfun->name, vfun->match_id);
 
-        int rc = child_device_register_wrapper(parent, virt_dev->name,
-            virt_dev->match_id, 10);
+        int rc = register_function_wrapper(vdev, vfun->name,
+            vfun->match_id, 10);
 
         if (rc == EOK) {
                 printf(NAME ": registered child device `%s'\n",
-                    virt_dev->name);
+                    vfun->name);
         } else {
                 printf(NAME ": failed to register child device `%s': %s\n",
-                    virt_dev->name, str_error(rc));
+                    vfun->name, str_error(rc));
         }
 
@@ -109 +109 @@
         }
 
-        printf(NAME ": add_device(name=\"%s\", handle=%d)\n",
-            dev->name, (int)dev->handle);
+        printf(NAME ": add_device(handle=%d)\n", (int)dev->handle);
         
         /*
-         * Go through all virtual devices and try to add them.
+         * Go through all virtual functions and try to add them.
          * We silently ignore failures.
          */
-        virtual_device_t *virt_dev = virtual_devices;
-        while (virt_dev->name != NULL) {
-                (void) add_child(dev, virt_dev);
-                virt_dev++;
+        virtual_function_t *vfun = virtual_functions;
+        while (vfun->name != NULL) {
+                (void) add_child(dev, vfun);
+                vfun++;
         }
 

uspace/drv/test1/char.c

@@ -37 +37 @@
 #include "test1.h"
 
-static int impl_char_read(device_t *dev, char *buf, size_t count) {
+static int impl_char_read(function_t *fun, char *buf, size_t count) {
         memset(buf, 0, count);
         return count;
 }
 
-static int imp_char_write(device_t *dev, char *buf, size_t count) {
+static int imp_char_write(function_t *fun, char *buf, size_t count) {
         return count;
 }

uspace/drv/test1/test1.c

@@ -61 +61 @@
            name, message);
 
-        int rc = child_device_register_wrapper(parent, name,
+        int rc = register_function_wrapper(parent, name,
             match_id, match_score);
 
         if (rc == EOK) {
-                printf(NAME ": registered child device `%s'.\n", name);
+                printf(NAME ": registered function `%s'.\n", name);
         } else {
-                printf(NAME ": failed to register child `%s' (%s).\n",
+                printf(NAME ": failed to register function `%s' (%s).\n",
                     name, str_error(rc));
         }
@@ -91 +91 @@
 static int add_device(device_t *dev)
 {
+        function_t *fun_a;
+
         printf(NAME ": add_device(name=\"%s\", handle=%d)\n",
             dev->name, (int) dev->handle);
 
-        add_device_to_class(dev, "virtual");
+        fun_a = create_function();
+        fun_a->ftype = fun_exposed;
+        fun_a->name = "a";
+
+        register_function(fun_a, dev);
+
+        add_function_to_class(fun_a, "virtual");
 
         if (str_cmp(dev->name, "null") == 0) {
-                dev->ops = &char_device_ops;
-                add_device_to_class(dev, "virt-null");
-        } else if (dev->parent == NULL) {
+                fun_a->ops = &char_device_ops;
+                add_function_to_class(fun_a, "virt-null");
+        } else if (str_cmp(dev->name, "test1") == 0) {
                 register_child_verbose(dev, "cloning myself ;-)", "clone",
                     "virtual&test1", 10);

uspace/drv/test2/test2.c

@@ -63 +63 @@
            name, message);
 
-        int rc = child_device_register_wrapper(parent, name,
+        int rc = register_function_wrapper(parent, name,
             match_id, match_score);
 
@@ -82 +82 @@
 {
         device_t *dev = (device_t *) arg;
+        function_t *fun;
 
         async_usleep(1000);
@@ -90 +91 @@
             "test1", "virtual&test1", 10);
 
-        add_device_to_class(dev, "virtual");
+        fun = create_function();
+        fun->ftype = fun_exposed;
+        fun->name = "a";
+
+        register_function(fun, dev);
+
+        add_function_to_class(fun, "virtual");
 
         return EOK;
 }
-
 
 static int add_device(device_t *dev)
@@ -101 +107 @@
             dev->name, (int) dev->handle);
 
-        if (dev->parent == NULL) {
+        if (str_cmp(dev->name, "child") != 0) {
                 fid_t postpone = fibril_create(postponed_birth, dev);
                 if (postpone == 0) {

uspace/lib/c/generic/devman.c

@@ -158 +158 @@
 }
 
-int devman_child_device_register(const char *name, match_id_list_t *match_ids,
-    devman_handle_t parent_handle, devman_handle_t *handle)
+/** Add function to a device.
+ *
+ * Request devman to add a new function to the specified device owned by
+ * this driver task.
+ *
+ * @param name          Name of the new function
+ * @param ftype         Function type, fun_inner or fun_exposed
+ * @param match_ids     Match IDs (should be empty for fun_exposed)
+ * @param devh          Devman handle of the device
+ * @param funh          Place to store handle of the new function
+ *
+ * @return              EOK on success or negative error code.
+ */
+int devman_add_function(const char *name, fun_type_t ftype,
+    match_id_list_t *match_ids, devman_handle_t devh, devman_handle_t *funh)
 {
         int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
+        int fun_handle;
         
         if (phone < 0)
@@ -168 +182 @@
         async_serialize_start();
         
-        int match_count = list_count(&match_ids->ids);  
-        ipc_call_t answer;
-        aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count,
-            &answer);
+        int match_count = list_count(&match_ids->ids);
+        ipc_call_t answer;
+
+        aid_t req = async_send_3(phone, DEVMAN_ADD_FUNCTION, (sysarg_t) ftype,
+            devh, match_count, &answer);
 
         sysarg_t retval = async_data_write_start(phone, name, str_size(name));
@@ -186 +201 @@
         async_serialize_end();
         
-        if (retval != EOK) {
-                if (handle != NULL)
-                        *handle = -1;
-
-                return retval;
-        }
-        
-        if (handle != NULL)
-                *handle = (int) IPC_GET_ARG1(answer);
-                
+        if (retval == EOK)
+                fun_handle = (int) IPC_GET_ARG1(answer);
+        else
+                fun_handle = -1;
+        
+        *funh = fun_handle;
+
         return retval;
 }

uspace/lib/c/include/devman.h

@@ -45 +45 @@
 
 extern int devman_driver_register(const char *, async_client_conn_t);
-extern int devman_child_device_register(const char *, match_id_list_t *,
+extern int devman_add_function(const char *, fun_type_t, match_id_list_t *,
     devman_handle_t, devman_handle_t *);
 

uspace/lib/c/include/ipc/devman.h

@@ -42 +42 @@
 
 typedef sysarg_t devman_handle_t;
+
+typedef enum {
+        /** Invalid value for debugging purposes */
+        fun_invalid = 0,
+        /** Function to which child devices attach */
+        fun_inner,
+        /** Fuction exported to external clients (leaf function) */
+        fun_exposed
+} fun_type_t;
 
 /** Ids of device models used for device-to-driver matching.
@@ -127 +136 @@
 typedef enum {
         DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
-        DEVMAN_ADD_CHILD_DEVICE,
+        DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
         DEVMAN_ADD_DEVICE_TO_CLASS

uspace/lib/drv/generic/driver.c

@@ -59 +59 @@
 
 /** Devices */
-LIST_INITIALIZE(devices);
-FIBRIL_MUTEX_INITIALIZE(devices_mutex);
+LIST_INITIALIZE(functions);
+FIBRIL_MUTEX_INITIALIZE(functions_mutex);
 
 /** Interrupts */
@@ -209 +209 @@
 }
 
-static void add_to_devices_list(device_t *dev)
-{
-        fibril_mutex_lock(&devices_mutex);
-        list_append(&dev->link, &devices);
-        fibril_mutex_unlock(&devices_mutex);
-}
-
-static void remove_from_devices_list(device_t *dev)
-{
-        fibril_mutex_lock(&devices_mutex);
-        list_remove(&dev->link);
-        fibril_mutex_unlock(&devices_mutex);
-}
-
-static device_t *driver_get_device(link_t *devices, devman_handle_t handle)
-{
-        device_t *dev = NULL;
-        
-        fibril_mutex_lock(&devices_mutex);
-        link_t *link = devices->next;
-        
-        while (link != devices) {
-                dev = list_get_instance(link, device_t, link);
-                if (dev->handle == handle) {
-                        fibril_mutex_unlock(&devices_mutex);
-                        return dev;
+static void add_to_functions_list(function_t *fun)
+{
+        fibril_mutex_lock(&functions_mutex);
+        list_append(&fun->link, &functions);
+        fibril_mutex_unlock(&functions_mutex);
+}
+
+static void remove_from_functions_list(function_t *fun)
+{
+        fibril_mutex_lock(&functions_mutex);
+        list_remove(&fun->link);
+        fibril_mutex_unlock(&functions_mutex);
+}
+
+static function_t *driver_get_function(link_t *functions, devman_handle_t handle)
+{
+        function_t *fun = NULL;
+        printf("driver_get_function handle=%" PRIun "\n", handle);
+        
+        fibril_mutex_lock(&functions_mutex);
+        link_t *link = functions->next;
+        
+        while (link != functions) {
+                fun = list_get_instance(link, function_t, link);
+                printf(" - fun handle %" PRIun "\n", fun->handle);
+                if (fun->handle == handle) {
+                        fibril_mutex_unlock(&functions_mutex);
+                        return fun;
                 }
+                
                 link = link->next;
         }
         
-        fibril_mutex_unlock(&devices_mutex);
+        fibril_mutex_unlock(&functions_mutex);
         
         return NULL;
@@ -250 +253 @@
         
         devman_handle_t dev_handle = IPC_GET_ARG1(*icall);
-        devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
+        devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall);
         
         device_t *dev = create_device();
         dev->handle = dev_handle;
-        
+
         async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0);
         dev->name = dev_name;
-        
-        add_to_devices_list(dev);
-        dev->parent = driver_get_device(&devices, parent_dev_handle);
+
+        /*
+         * Currently not used, parent fun handle is stored in context
+         * of the connection to the parent device driver.
+         */
+        (void) parent_fun_handle;
         
         res = driver->driver_ops->add_device(dev);
@@ -268 +274 @@
                 printf("%s: failed to add a new device with handle = %" PRIun ".\n",
                     driver->name, dev_handle);
-                remove_from_devices_list(dev);
                 delete_device(dev);
         }
@@ -311 +316 @@
          */
         devman_handle_t handle = IPC_GET_ARG2(*icall);
-        device_t *dev = driver_get_device(&devices, handle);
-
-        if (dev == NULL) {
-                printf("%s: driver_connection_gen error - no device with handle"
+        function_t *fun = driver_get_function(&functions, handle);
+
+        if (fun == NULL) {
+                printf("%s: driver_connection_gen error - no function with handle"
                     " %" PRIun " was found.\n", driver->name, handle);
                 async_answer_0(iid, ENOENT);
@@ -327 +332 @@
         
         int ret = EOK;
-        /* open the device */
-        if (dev->ops != NULL && dev->ops->open != NULL)
-                ret = (*dev->ops->open)(dev);
+        /* Open device function */
+        if (fun->ops != NULL && fun->ops->open != NULL)
+                ret = (*fun->ops->open)(fun);
         
         async_answer_0(iid, ret);
@@ -344 +349 @@
                 switch  (method) {
                 case IPC_M_PHONE_HUNGUP:
-                        /* close the device */
-                        if (dev->ops != NULL && dev->ops->close != NULL)
-                                (*dev->ops->close)(dev);
+                        /* Close device function */
+                        if (fun->ops != NULL && fun->ops->close != NULL)
+                                (*fun->ops->close)(fun);
                         async_answer_0(callid, EOK);
                         return;
@@ -356 +361 @@
                         if (!is_valid_iface_idx(iface_idx)) {
                                 remote_handler_t *default_handler =
-                                    device_get_default_handler(dev);
+                                    function_get_default_handler(fun);
                                 if (default_handler != NULL) {
-                                        (*default_handler)(dev, callid, &call);
+                                        (*default_handler)(fun, callid, &call);
                                         break;
                                 }
+                                
                                 /*
-                                 * This is not device's interface and the
+                                 * Function has no such interface and
                                  * default handler is not provided.
                                  */
@@ -372 +378 @@
                         }
                         
-                        /* calling one of the device's interfaces */
+                        /* calling one of the function's interfaces */
                         
                         /* Get the interface ops structure. */
-                        void *ops = device_get_ops(dev, iface_idx);
+                        void *ops = function_get_ops(fun, iface_idx);
                         if (ops == NULL) {
                                 printf("%s: driver_connection_gen error - ",
                                     driver->name);
-                                printf("device with handle %" PRIun " has no interface "
+                                printf("Function with handle %" PRIun " has no interface "
                                     "with id %d.\n", handle, iface_idx);
                                 async_answer_0(callid, ENOTSUP);
@@ -408 +414 @@
                          * receive parameters from the remote client and it will
                          * pass it to the corresponding local interface method
-                         * associated with the device by its driver.
+                         * associated with the function by its driver.
                          */
-                        (*iface_method_ptr)(dev, ops, callid, &call);
+                        (*iface_method_ptr)(fun, ops, callid, &call);
                         break;
                 }
@@ -425 +431 @@
         driver_connection_gen(iid, icall, false);
 }
-
 
 /** Function for handling connections to device driver. */
@@ -456 +461 @@
 device_t *create_device(void)
 {
-        device_t *dev = malloc(sizeof(device_t));
-
-        if (dev != NULL) {
-                memset(dev, 0, sizeof(device_t));
-                init_match_ids(&dev->match_ids);
-        }
-
+        device_t *dev;
+
+        dev = malloc(sizeof(device_t));
+        if (dev == NULL)
+                return NULL;
+
+        memset(dev, 0, sizeof(device_t));
         return dev;
 }
 
+/** Create new function structure.
+ *
+ * @return              The device structure.
+ */
+function_t *create_function(void)
+{
+        function_t *fun;
+
+        fun = malloc(sizeof(function_t));
+        if (fun == NULL)
+                return NULL;
+
+        memset(fun, 0, sizeof(device_t));
+
+        init_match_ids(&fun->match_ids);
+        link_initialize(&fun->link);
+
+        return fun;
+}
+
 /** Delete device structure.
  *
@@ -472 +497 @@
 void delete_device(device_t *dev)
 {
-        clean_match_ids(&dev->match_ids);
-        if (dev->name != NULL)
-                free(dev->name);
         free(dev);
 }
 
-void *device_get_ops(device_t *dev, dev_inferface_idx_t idx)
+/** Delete device structure.
+ *
+ * @param dev           The device structure.
+ */
+void delete_function(function_t *fun)
+{
+        clean_match_ids(&fun->match_ids);
+        if (fun->name != NULL)
+                free(fun->name);
+        free(fun);
+}
+
+void *function_get_ops(function_t *fun, dev_inferface_idx_t idx)
 {
         assert(is_valid_iface_idx(idx));
-        if (dev->ops == NULL)
+        if (fun->ops == NULL)
                 return NULL;
-        return dev->ops->interfaces[idx];
-}
-
-int child_device_register(device_t *child, device_t *parent)
-{
-        assert(child->name != NULL);
+        return fun->ops->interfaces[idx];
+}
+
+int register_function(function_t *fun, device_t *dev)
+{
+        assert(fun->name != NULL);
         
         int res;
         
-        add_to_devices_list(child);
-        res = devman_child_device_register(child->name, &child->match_ids,
-            parent->handle, &child->handle);
+        fun->dev = dev;
+        
+        add_to_functions_list(fun);
+        res = devman_add_function(fun->name, fun->ftype, &fun->match_ids,
+            dev->handle, &fun->handle);
         if (res != EOK) {
-                remove_from_devices_list(child);
+                remove_from_functions_list(fun);
                 return res;
         }
@@ -511 +547 @@
  * @return Error code.
  */
-int child_device_register_wrapper(device_t *parent, const char *child_name,
-    const char *child_match_id, int child_match_score)
-{
-        device_t *child = NULL;
-        match_id_t *match_id = NULL;
+int register_function_wrapper(device_t *dev, const char *fun_name,
+    const char *match_id, int match_score)
+{
+        function_t *fun = NULL;
+        match_id_t *m_id = NULL;
         int rc;
         
-        child = create_device();
-        if (child == NULL) {
+        fun = create_function();
+        if (fun == NULL) {
                 rc = ENOMEM;
                 goto failure;
         }
         
-        child->name = child_name;
-        
-        match_id = create_match_id();
-        if (match_id == NULL) {
+        fun->dev = dev;
+        fun->name = fun_name;
+        fun->ftype = fun_inner;
+        
+        m_id = create_match_id();
+        if (m_id == NULL) {
                 rc = ENOMEM;
                 goto failure;
         }
         
-        match_id->id = child_match_id;
-        match_id->score = child_match_score;
-        add_match_id(&child->match_ids, match_id);
-        
-        rc = child_device_register(child, parent);
+        m_id->id = match_id;
+        m_id->score = match_score;
+        add_match_id(&fun->match_ids, m_id);
+        
+        rc = register_function(fun, dev);
         if (rc != EOK)
                 goto failure;
@@ -543 +581 @@
         
 failure:
-        if (match_id != NULL) {
-                match_id->id = NULL;
-                delete_match_id(match_id);
-        }
-        
-        if (child != NULL) {
-                child->name = NULL;
-                delete_device(child);
+        if (m_id != NULL) {
+                m_id->id = NULL;
+                delete_match_id(m_id);
+        }
+        
+        if (fun != NULL) {
+                fun->name = NULL;
+                delete_function(fun);
         }
         
@@ -557 +595 @@
 
 /** Get default handler for client requests */
-remote_handler_t *device_get_default_handler(device_t *dev)
-{
-        if (dev->ops == NULL)
+remote_handler_t *function_get_default_handler(function_t *fun)
+{
+        if (fun->ops == NULL)
                 return NULL;
-        return dev->ops->default_handler;
-}
-
-int add_device_to_class(device_t *dev, const char *class_name)
-{
-        return devman_add_device_to_class(dev->handle, class_name);
+        return fun->ops->default_handler;
+}
+
+int add_function_to_class(function_t *fun, const char *class_name)
+{
+        return devman_add_device_to_class(fun->handle, class_name);
 }
 

uspace/lib/drv/generic/remote_char_dev.c

@@ -41 +41 @@
 #define MAX_CHAR_RW_COUNT 256
 
-static void remote_char_read(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_char_write(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_char_read(function_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_char_write(function_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** Remote character interface operations. */
@@ -67 +67 @@
  * local interface to the remote client.
  *
- * @param dev           The device from which the data are read.
+ * @param fun           The function from which the data are read.
  * @param ops           The local ops structure.
  */
 static void
-remote_char_read(device_t *dev, void *ops, ipc_callid_t callid,
+remote_char_read(function_t *fun, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -94 +94 @@
         
         char buf[MAX_CHAR_RW_COUNT];
-        int ret = (*char_dev_ops->read)(dev, buf, len);
+        int ret = (*char_dev_ops->read)(fun, buf, len);
         
         if (ret < 0) {
@@ -114 +114 @@
  * local interface to the remote client.
  *
- * @param dev           The device to which the data are written.
+ * @param fun           The function to which the data are written.
  * @param ops           The local ops structure.
  */
 static void
-remote_char_write(device_t *dev, void *ops, ipc_callid_t callid,
+remote_char_write(function_t *fun, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -144 +144 @@
         async_data_write_finalize(cid, buf, len);
         
-        int ret = (*char_dev_ops->write)(dev, buf, len);
+        int ret = (*char_dev_ops->write)(fun, buf, len);
         if (ret < 0) {
                 /* Some error occured. */

uspace/lib/drv/generic/remote_hw_res.c

@@ -39 +39 @@
 #include "driver.h"
 
-static void remote_hw_res_get_resource_list(device_t *, void *, ipc_callid_t,
+static void remote_hw_res_get_resource_list(function_t *, void *, ipc_callid_t,
     ipc_call_t *);
-static void remote_hw_res_enable_interrupt(device_t *, void *, ipc_callid_t,
+static void remote_hw_res_enable_interrupt(function_t *, void *, ipc_callid_t,
     ipc_call_t *);
 
@@ -55 +55 @@
 };
 
-static void remote_hw_res_enable_interrupt(device_t *dev, void *ops,
+static void remote_hw_res_enable_interrupt(function_t *fun, void *ops,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -62 +62 @@
         if (hw_res_ops->enable_interrupt == NULL)
                 async_answer_0(callid, ENOTSUP);
-        else if (hw_res_ops->enable_interrupt(dev))
+        else if (hw_res_ops->enable_interrupt(fun))
                 async_answer_0(callid, EOK);
         else
@@ -68 +68 @@
 }
 
-static void remote_hw_res_get_resource_list(device_t *dev, void *ops,
+static void remote_hw_res_get_resource_list(function_t *fun, void *ops,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -78 +78 @@
         }
         
-        hw_resource_list_t *hw_resources = hw_res_ops->get_resource_list(dev);
+        hw_resource_list_t *hw_resources = hw_res_ops->get_resource_list(fun);
         if (hw_resources == NULL){
                 async_answer_0(callid, ENOENT);

uspace/lib/drv/include/dev_iface.h

@@ -43 +43 @@
  */
 
-struct device;
+struct function;
 
 /*
@@ -49 +49 @@
  * devices driver.
  */
-typedef void remote_iface_func_t(struct device *, void *, ipc_callid_t,
+typedef void remote_iface_func_t(struct function *, void *, ipc_callid_t,
     ipc_call_t *);
 typedef remote_iface_func_t *remote_iface_func_ptr_t;
-typedef void remote_handler_t(struct device *, ipc_callid_t, ipc_call_t *);
+typedef void remote_handler_t(struct function *, ipc_callid_t, ipc_call_t *);
 
 typedef struct {

uspace/lib/drv/include/driver.h

@@ -52 +52 @@
 typedef struct device device_t;
 
+struct function;
+typedef struct function function_t;
+
 /*
  * Device class
@@ -62 +65 @@
          * device.
          */
-        int (*open)(device_t *);
+        int (*open)(function_t *);
         
         /**
@@ -68 +71 @@
          * the device.
          */
-        void (*close)(device_t *);
+        void (*close)(function_t *);
         
         /** The table of standard interfaces implemented by the device. */
@@ -100 +103 @@
         int parent_phone;
         
-        /** Parent device if handled by this driver, NULL otherwise */
-        device_t *parent;
         /** Device name */
         const char *name;
-        /** List of device ids for device-to-driver matching */
-        match_id_list_t match_ids;
+        
         /** Driver-specific data associated with this device */
         void *driver_data;
-        /** The implementation of operations provided by this device */
+        
+        /** Link in the list of devices handled by the driver */
+        link_t link;
+};
+
+/** Function structure */
+struct function {
+        /** Function indentifier (asigned by device manager) */
+        devman_handle_t handle;
+        
+        /** Device which this function belogs to */
+        device_t *dev;
+        
+        /** Function type */
+        fun_type_t ftype;
+        /** Function name */
+        const char *name;
+        /** List of device ids for driver matching */
+        match_id_list_t match_ids;
+        /** Driver-specific data associated with this function */
+        void *driver_data;
+        /** Implementation of operations provided by this function */
         device_ops_t *ops;
         
-        /** Link in the list of devices handled by the driver */
+        /** Link in the list of functions handled by the driver */
         link_t link;
 };
@@ -142 +163 @@
 extern device_t *create_device(void);
 extern void delete_device(device_t *);
-extern void *device_get_ops(device_t *, dev_inferface_idx_t);
-
-extern int child_device_register(device_t *, device_t *);
-extern int child_device_register_wrapper(device_t *, const char *, const char *,
+extern function_t *create_function(void);
+extern void delete_function(function_t *);
+extern void *function_get_ops(function_t *, dev_inferface_idx_t);
+
+extern int register_function(function_t *, device_t *);
+extern int register_function_wrapper(device_t *, const char *, const char *,
     int);
 
@@ -184 +207 @@
 extern int unregister_interrupt_handler(device_t *, int);
 
-extern remote_handler_t *device_get_default_handler(device_t *);
-extern int add_device_to_class(device_t *, const char *);
+extern remote_handler_t *function_get_default_handler(function_t *);
+extern int add_function_to_class(function_t *fun, const char *class_name);
 
 #endif

uspace/lib/drv/include/ops/char_dev.h

@@ -39 +39 @@
 
 typedef struct {
-        int (*read)(device_t *, char *, size_t);
-        int (*write)(device_t *, char *, size_t);
+        int (*read)(function_t *, char *, size_t);
+        int (*write)(function_t *, char *, size_t);
 } char_dev_ops_t;
 

uspace/lib/drv/include/ops/hw_res.h

@@ -42 +42 @@
 
 typedef struct {
-         hw_resource_list_t *(*get_resource_list)(device_t *);
-         bool (*enable_interrupt)(device_t *);
+         hw_resource_list_t *(*get_resource_list)(function_t *);
+         bool (*enable_interrupt)(function_t *);
 } hw_res_ops_t;
 

uspace/srv/devman/devman.c

@@ -709 +709 @@
 
 /** Create devmap path and name for the function. */
-static void devmap_register_tree_function(fun_node_t *fun, dev_tree_t *tree)
+void devmap_register_tree_function(fun_node_t *fun, dev_tree_t *tree)
 {
         char *devmap_pathname = NULL;
@@ -777 +777 @@
         case EOK:
                 dev->state = DEVICE_USABLE;
-                // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-                if (0) devmap_register_tree_function(NULL, tree);
-                // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                 break;
         case ENOENT:

uspace/srv/devman/devman.h

@@ -363 +363 @@
 /* Devmap devices */
 
+extern void devmap_register_tree_function(fun_node_t *, dev_tree_t *);
+
 extern fun_node_t *find_devmap_tree_function(dev_tree_t *, devmap_handle_t);
 extern fun_node_t *find_devmap_class_function(class_list_t *, devmap_handle_t);

uspace/srv/devman/main.c

@@ -204 +204 @@
 }
 
-/** Handle child device registration.
+/** Handle function registration.
  *
  * Child devices are registered by their parent's device driver.
  */
-static void devman_add_child(ipc_callid_t callid, ipc_call_t *call)
-{
-        devman_handle_t parent_handle = IPC_GET_ARG1(*call);
-        sysarg_t match_count = IPC_GET_ARG2(*call);
+static void devman_add_function(ipc_callid_t callid, ipc_call_t *call)
+{
+        fun_type_t ftype = (fun_type_t) IPC_GET_ARG1(*call);
+        devman_handle_t dev_handle = IPC_GET_ARG2(*call);
+        sysarg_t match_count = IPC_GET_ARG3(*call);
         dev_tree_t *tree = &device_tree;
         
         fibril_rwlock_write_lock(&tree->rwlock);
-        dev_node_t *pdev = find_dev_node_no_lock(&device_tree, parent_handle);
+
+        dev_node_t *dev = NULL;
+        dev_node_t *pdev = find_dev_node_no_lock(&device_tree, dev_handle);
         
         if (pdev == NULL) {
                 fibril_rwlock_write_unlock(&tree->rwlock);
                 async_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        if (ftype != fun_inner && ftype != fun_exposed) {
+                /* Unknown function type */
+                printf(NAME ": Error, unknown function type provided by driver!\n");
+
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                async_answer_0(callid, EINVAL);
                 return;
         }
@@ -239 +251 @@
         }
 
-        dev_node_t *dev;
-
-        dev = create_dev_node();
-        if (dev == NULL) {
-                fibril_rwlock_write_unlock(&tree->rwlock);
-                delete_fun_node(fun);
-                async_answer_0(callid, ENOMEM);
-                return;
-        }
-
-        insert_dev_node(tree, dev, fun);
+        if (ftype == fun_inner) {
+                dev = create_dev_node();
+                if (dev == NULL) {
+                        fibril_rwlock_write_unlock(&tree->rwlock);
+                        delete_fun_node(fun);
+                        async_answer_0(callid, ENOMEM);
+                        return;
+                }
+
+                insert_dev_node(tree, dev, fun);
+        }
 
         fibril_rwlock_write_unlock(&tree->rwlock);
         
-        printf(NAME ": devman_add_child %s\n", fun->pathname);
+        printf(NAME ": devman_add_function %s\n", fun->pathname);
         
         devman_receive_match_ids(match_count, &fun->match_ids);
 
-        /*
-         * Try to find a suitable driver and assign it to the device.  We do
-         * not want to block the current fibril that is used for processing
-         * incoming calls: we will launch a separate fibril to handle the
-         * driver assigning. That is because assign_driver can actually include
-         * task spawning which could take some time.
-         */
-        fid_t assign_fibril = fibril_create(assign_driver_fibril, dev);
-        if (assign_fibril == 0) {
+        if (ftype == fun_inner) {
+                assert(dev != NULL);
                 /*
-                 * Fallback in case we are out of memory.
-                 * Probably not needed as we will die soon anyway ;-).
+                 * Try to find a suitable driver and assign it to the device.  We do
+                 * not want to block the current fibril that is used for processing
+                 * incoming calls: we will launch a separate fibril to handle the
+                 * driver assigning. That is because assign_driver can actually include
+                 * task spawning which could take some time.
                  */
-                (void) assign_driver_fibril(fun);
+                fid_t assign_fibril = fibril_create(assign_driver_fibril, dev);
+                if (assign_fibril == 0) {
+                        /*
+                         * Fallback in case we are out of memory.
+                         * Probably not needed as we will die soon anyway ;-).
+                         */
+                        (void) assign_driver_fibril(fun);
+                } else {
+                        fibril_add_ready(assign_fibril);
+                }
         } else {
-                fibril_add_ready(assign_fibril);
-        }
-
+                devmap_register_tree_function(fun, tree);
+        }
+        
         /* Return device handle to parent's driver. */
         async_answer_1(callid, EOK, fun->handle);
@@ -384 +401 @@
                         cont = false;
                         continue;
-                case DEVMAN_ADD_CHILD_DEVICE:
-                        devman_add_child(callid, &call);
+                case DEVMAN_ADD_FUNCTION:
+                        devman_add_function(callid, &call);
                         break;
                 case DEVMAN_ADD_DEVICE_TO_CLASS:
@@ -409 +426 @@
         }
         
-        fun_node_t * fun = find_fun_node_by_path(&device_tree, pathname);
+        fun_node_t *fun = find_fun_node_by_path(&device_tree, pathname);
         
         free(pathname);
@@ -417 +434 @@
                 return;
         }
-        
+
         async_answer_1(iid, EOK, fun->handle);
 }
@@ -450 +467 @@
 {
         devman_handle_t handle = IPC_GET_ARG2(*icall);
-        
-        fun_node_t *fun = find_fun_node(&device_tree, handle);
-        if (fun == NULL) {
-                printf(NAME ": devman_forward error - no device function with "
+        devman_handle_t fwd_h;
+        fun_node_t *fun = NULL;
+        dev_node_t *dev = NULL;
+        
+        fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL)
+                dev = find_dev_node(&device_tree, handle);
+        else
+                dev = fun->dev;
+
+        if (fun == NULL && dev == NULL) {
+                printf(NAME ": devman_forward error - no device or function with "
                     "handle %" PRIun " was found.\n", handle);
                 async_answer_0(iid, ENOENT);
                 return;
         }
+
+        if (fun == NULL && !drv_to_parent) {
+                printf(NAME ": devman_forward error - cannot connect to "
+                    "handle %d, refers to a device.\n", handle);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
         
         driver_t *driver = NULL;
         
         if (drv_to_parent) {
-                if (fun->dev->pfun != NULL)
-                        driver = fun->dev->pfun->dev->drv;
-        } else if (fun->dev->state == DEVICE_USABLE) {
-                driver = fun->dev->drv;
+                /* Connect to parent function of a device (or device function). */
+                if (dev->pfun->dev != NULL)
+                        driver = dev->pfun->dev->drv;
+                fwd_h = dev->pfun->handle;
+        } else if (dev->state == DEVICE_USABLE) {
+                /* Connect to the specified function */
+                driver = dev->drv;
                 assert(driver != NULL);
+
+                fwd_h = handle;
         }
         
@@ -490 +527 @@
         }
 
-        printf(NAME ": devman_forward: forward connection to function %s to "
-            "driver %s.\n", fun->pathname, driver->name);
-        async_forward_fast(iid, driver->phone, method, fun->handle, 0, IPC_FF_NONE);
+        if (fun != NULL) {
+                printf(NAME ": devman_forward: forward connection to function %s to "
+                    "driver %s.\n", fun->pathname, driver->name);
+        } else {
+                printf(NAME ": devman_forward: forward connection to device %s to "
+                    "driver %s.\n", dev->pfun->pathname, driver->name);
+        }
+
+        async_forward_fast(iid, driver->phone, method, fwd_h, 0, IPC_FF_NONE);
 }