Changeset a60e90b in mainline

Timestamp:

2013-09-10T20:15:58Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

08bc23d

Parents:

59dc181

Message:

Move rest of functionality from devman.c to other modules.

Location:

uspace/srv/devman

Files:

• Makefile (modified) (1 diff)
• devman.c (deleted)
• devman.h (modified) (2 diffs)
• driver.c (modified) (2 diffs)
• driver.h (modified) (1 diff)
• loc.c (added)
• loc.h (added)
• main.c (modified) (1 diff)
• match.c (modified) (2 diffs)
• match.h (added)

uspace/srv/devman/Makefile

@@ -35 +35 @@
         dev.c \
         devtree.c \
-        devman.c \
         driver.c \
+        loc.c \
         fun.c \
         main.c \

uspace/srv/devman/devman.h

@@ -48 +48 @@
 #define NAME "devman"
 
-#define MATCH_EXT ".ma"
-
 #define LOC_DEVICE_NAMESPACE "devices"
 #define LOC_SEPARATOR '\\'
@@ -235 +233 @@
 } dev_tree_t;
 
-/* Match ids and scores */
-
-extern int get_match_score(driver_t *, dev_node_t *);
-
-extern bool parse_match_ids(char *, match_id_list_t *);
-extern bool read_match_ids(const char *, match_id_list_t *);
-extern char *read_match_id(char **);
-extern char *read_id(const char **);
-
-/* Loc services */
-
-extern void loc_register_tree_function(fun_node_t *, dev_tree_t *);
-
-extern fun_node_t *find_loc_tree_function(dev_tree_t *, service_id_t);
-
-extern void tree_add_loc_function(dev_tree_t *, fun_node_t *);
-
 #endif
 

uspace/srv/devman/driver.c

@@ -44 +44 @@
 #include "devman.h"
 #include "driver.h"
+#include "match.h"
 
 /**
@@ -511 +512 @@
 }
 
+/** Pass a device to running driver.
+ *
+ * @param drv           The driver's structure.
+ * @param node          The device's node in the device tree.
+ */
+void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
+{
+        /*
+         * We do not expect to have driver's mutex locked as we do not
+         * access any structures that would affect driver_t.
+         */
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
+            drv->name, dev->pfun->name);
+        
+        /* Send the device to the driver. */
+        devman_handle_t parent_handle;
+        if (dev->pfun) {
+                parent_handle = dev->pfun->handle;
+        } else {
+                parent_handle = 0;
+        }
+        
+        async_exch_t *exch = async_exchange_begin(drv->sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(exch, DRIVER_DEV_ADD, dev->handle,
+            parent_handle, &answer);
+        
+        /* Send the device name to the driver. */
+        sysarg_t rc = async_data_write_start(exch, dev->pfun->name,
+            str_size(dev->pfun->name) + 1);
+        
+        async_exchange_end(exch);
+        
+        if (rc != EOK) {
+                /* TODO handle error */
+        }
+
+        /* Wait for answer from the driver. */
+        async_wait_for(req, &rc);
+
+        switch(rc) {
+        case EOK:
+                dev->state = DEVICE_USABLE;
+                break;
+        case ENOENT:
+                dev->state = DEVICE_NOT_PRESENT;
+                break;
+        default:
+                dev->state = DEVICE_INVALID;
+                break;
+        }
+        
+        dev->passed_to_driver = true;
+
+        return;
+}
+
 int driver_dev_remove(dev_tree_t *tree, dev_node_t *dev)
 {

uspace/srv/devman/driver.h

@@ -49 +49 @@
 extern void attach_driver(dev_tree_t *, dev_node_t *, driver_t *);
 extern void detach_driver(dev_tree_t *, dev_node_t *);
+extern bool start_driver(driver_t *);
 extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
-extern bool start_driver(driver_t *);
 extern int driver_dev_remove(dev_tree_t *, dev_node_t *);
 extern int driver_dev_gone(dev_tree_t *, dev_node_t *);

uspace/srv/devman/main.c

@@ -63 +63 @@
 #include "driver.h"
 #include "fun.h"
+#include "loc.h"
 
 #define DRIVER_DEFAULT_STORE  "/drv"

uspace/srv/devman/match.c

@@ -31 +31 @@
  */
 
+#include <fcntl.h>
+#include <io/log.h>
 #include <str.h>
+#include <str_error.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "devman.h"
+#include "match.h"
 
 /** Compute compound score of driver and device.
@@ -93 +99 @@
 }
 
+/** Read match id at the specified position of a string and set the position in
+ * the string to the first character following the id.
+ *
+ * @param buf           The position in the input string.
+ * @return              The match id.
+ */
+char *read_match_id(char **buf)
+{
+        char *res = NULL;
+        size_t len = get_nonspace_len(*buf);
+        
+        if (len > 0) {
+                res = malloc(len + 1);
+                if (res != NULL) {
+                        str_ncpy(res, len + 1, *buf, len);
+                        *buf += len;
+                }
+        }
+        
+        return res;
+}
+
+/**
+ * Read match ids and associated match scores from a string.
+ *
+ * Each match score in the string is followed by its match id.
+ * The match ids and match scores are separated by whitespaces.
+ * Neither match ids nor match scores can contain whitespaces.
+ *
+ * @param buf           The string from which the match ids are read.
+ * @param ids           The list of match ids into which the match ids and
+ *                      scores are added.
+ * @return              True if at least one match id and associated match score
+ *                      was successfully read, false otherwise.
+ */
+bool parse_match_ids(char *buf, match_id_list_t *ids)
+{
+        int score = 0;
+        char *id = NULL;
+        int ids_read = 0;
+        
+        while (true) {
+                /* skip spaces */
+                if (!skip_spaces(&buf))
+                        break;
+                
+                /* read score */
+                score = strtoul(buf, &buf, 10);
+                
+                /* skip spaces */
+                if (!skip_spaces(&buf))
+                        break;
+                
+                /* read id */
+                id = read_match_id(&buf);
+                if (NULL == id)
+                        break;
+                
+                /* create new match_id structure */
+                match_id_t *mid = create_match_id();
+                mid->id = id;
+                mid->score = score;
+                
+                /* add it to the list */
+                add_match_id(ids, mid);
+                
+                ids_read++;
+        }
+        
+        return ids_read > 0;
+}
+
+/**
+ * Read match ids and associated match scores from a file.
+ *
+ * Each match score in the file is followed by its match id.
+ * The match ids and match scores are separated by whitespaces.
+ * Neither match ids nor match scores can contain whitespaces.
+ *
+ * @param buf           The path to the file from which the match ids are read.
+ * @param ids           The list of match ids into which the match ids and
+ *                      scores are added.
+ * @return              True if at least one match id and associated match score
+ *                      was successfully read, false otherwise.
+ */
+bool read_match_ids(const char *conf_path, match_id_list_t *ids)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
+        
+        bool suc = false;
+        char *buf = NULL;
+        bool opened = false;
+        int fd;
+        size_t len = 0;
+        
+        fd = open(conf_path, O_RDONLY);
+        if (fd < 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",
+                    conf_path, str_error(fd));
+                goto cleanup;
+        }
+        opened = true;
+        
+        len = lseek(fd, 0, SEEK_END);
+        lseek(fd, 0, SEEK_SET);
+        if (len == 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Configuration file '%s' is empty.",
+                    conf_path);
+                goto cleanup;
+        }
+        
+        buf = malloc(len + 1);
+        if (buf == NULL) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed when parsing file "
+                    "'%s'.", conf_path);
+                goto cleanup;
+        }
+        
+        ssize_t read_bytes = read_all(fd, buf, len);
+        if (read_bytes <= 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
+                    read_bytes);
+                goto cleanup;
+        }
+        buf[read_bytes] = 0;
+        
+        suc = parse_match_ids(buf, ids);
+        
+cleanup:
+        free(buf);
+        
+        if (opened)
+                close(fd);
+        
+        return suc;
+}
+
 /** @}
  */