Changes in uspace/lib/drv/include/driver.h [96b02eb9:22027b6e] in mainline

File:

• uspace/lib/drv/include/driver.h (modified) (6 diffs)

uspace/lib/drv/include/driver.h

@@ -41 +41 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <device/hw_res.h>
-#include <device/char.h>
 #include <assert.h>
 #include <ddi.h>
@@ -49 +47 @@
 #include <malloc.h>
 
+#include "dev_iface.h"
+
 struct device;
 typedef struct device device_t;
 
-/* device interface */
+/*
+ * Device class
+ */
 
-/*
- * First two parameters: device and interface structure registered by the
- * devices driver.
- */
-typedef void remote_iface_func_t(device_t *, void *, ipc_callid_t,
-    ipc_call_t *);
-typedef remote_iface_func_t *remote_iface_func_ptr_t;
-typedef void remote_handler_t(device_t *, ipc_callid_t, ipc_call_t *);
-
-typedef struct {
-        size_t method_count;
-        remote_iface_func_ptr_t *methods;
-} remote_iface_t;
-
-typedef struct {
-        remote_iface_t *ifaces[DEV_IFACE_COUNT];
-} iface_dipatch_table_t;
-
-
-static inline bool is_valid_iface_idx(int idx)
-{
-        return 0 <= idx && idx < DEV_IFACE_MAX;
-}
-
-remote_iface_t *get_remote_iface(int);
-remote_iface_func_ptr_t get_remote_method(remote_iface_t *, sysarg_t);
-
-
-/* device class */
-
-/** Devices operations. */
+/** Devices operations */
 typedef struct device_ops {
         /**
@@ -110 +82 @@
 
 
-/* device */
+/*
+ * Device
+ */
 
-/** The device. */
+/** Device structure */
 struct device {
         /**
@@ -121 +95 @@
         
         /**
-         * The phone to the parent device driver (if it is different from this
-         * driver).
+         * Phone to the parent device driver (if it is different from this
+         * driver)
          */
         int parent_phone;
         
-        /** Parent device if handled by this driver, NULL otherwise. */
+        /** Parent device if handled by this driver, NULL otherwise */
         device_t *parent;
-        /** The device's name. */
+        /** Device name */
         const char *name;
-        /** The list of device ids for device-to-driver matching. */
+        /** List of device ids for device-to-driver matching */
         match_id_list_t match_ids;
-        /** The device driver's data associated with this device. */
+        /** Driver-specific data associated with this device */
         void *driver_data;
-        /** The implementation of operations provided by this device. */
+        /** The implementation of operations provided by this device */
         device_ops_t *ops;
         
-        /**
-         * Pointer to the previous and next device in the list of devices
-         * handled by the driver.
-         */
+        /** Link in the list of devices handled by the driver */
         link_t link;
 };
 
+/*
+ * Driver
+ */
 
-/* driver */
-
-/** Generic device driver operations. */
+/** Generic device driver operations */
 typedef struct driver_ops {
-        /** Callback method for passing a new device to the device driver.*/
+        /** Callback method for passing a new device to the device driver */
         int (*add_device)(device_t *dev);
-        /* TODO add other generic driver operations */
+        /* TODO: add other generic driver operations */
 } driver_ops_t;
 
-/** The driver structure.*/
+/** Driver structure */
 typedef struct driver {
-        /** The name of the device driver. */
+        /** Name of the device driver */
         const char *name;
-        /** Generic device driver operations. */
+        /** Generic device driver operations */
         driver_ops_t *driver_ops;
 } driver_t;
@@ -168 +140 @@
  * @return              The device structure.
  */
-static inline device_t *create_device(void)
-{
-        device_t *dev = malloc(sizeof(device_t));
-        if (NULL != dev) {
-                memset(dev, 0, sizeof(device_t));
-                init_match_ids(&dev->match_ids);
-        }       
-        return dev;
-}
+extern device_t *create_device(void);
+extern void delete_device(device_t *);
+extern void *device_get_ops(device_t *, dev_inferface_idx_t);
 
-/** Delete device structure.
- *
- * @param dev           The device structure.
+extern int child_device_register(device_t *, device_t *);
+extern int child_device_register_wrapper(device_t *, const char *, const char *,
+    int);
+
+/*
+ * Interrupts
  */
-static inline void delete_device(device_t *dev)
-{
-        clean_match_ids(&dev->match_ids);
-        if (NULL != dev->name)
-                free(dev->name);
-        free(dev);
-}
-
-static inline void *device_get_iface(device_t *dev, dev_inferface_idx_t idx)
-{
-        assert(is_valid_iface_idx(idx));
-        if (NULL == dev->ops)
-                return NULL;
-        return dev->ops->interfaces[idx];
-}
-
-int child_device_register(device_t *, device_t *);
-int child_device_register_wrapper(device_t *, const char *, const char *, int);
-
-
-/* interrupts */
 
 typedef void interrupt_handler_t(device_t *, ipc_callid_t, ipc_call_t *);
@@ -220 +168 @@
 } interrupt_context_list_t;
 
-static inline interrupt_context_t *create_interrupt_context(void)
-{
-        interrupt_context_t *ctx;
-        
-        ctx = (interrupt_context_t *) malloc(sizeof(interrupt_context_t));
-        if (NULL != ctx)
-                memset(ctx, 0, sizeof(interrupt_context_t));
-        
-        return ctx;
-}
+extern interrupt_context_t *create_interrupt_context(void);
+extern void delete_interrupt_context(interrupt_context_t *);
+extern void init_interrupt_context_list(interrupt_context_list_t *);
+extern void add_interrupt_context(interrupt_context_list_t *,
+    interrupt_context_t *);
+extern void remove_interrupt_context(interrupt_context_list_t *,
+    interrupt_context_t *);
+extern interrupt_context_t *find_interrupt_context_by_id(
+    interrupt_context_list_t *, int);
+extern interrupt_context_t *find_interrupt_context(
+    interrupt_context_list_t *, device_t *, int);
 
-static inline void delete_interrupt_context(interrupt_context_t *ctx)
-{
-        if (NULL != ctx)
-                free(ctx);
-}
+extern int register_interrupt_handler(device_t *, int, interrupt_handler_t *,
+    irq_code_t *);
+extern int unregister_interrupt_handler(device_t *, int);
 
-static inline void init_interrupt_context_list(interrupt_context_list_t *list)
-{
-        memset(list, 0, sizeof(interrupt_context_list_t));
-        fibril_mutex_initialize(&list->mutex);
-        list_initialize(&list->contexts);
-}
-
-static inline void
-add_interrupt_context(interrupt_context_list_t *list, interrupt_context_t *ctx)
-{
-        fibril_mutex_lock(&list->mutex);
-        ctx->id = list->curr_id++;
-        list_append(&ctx->link, &list->contexts);
-        fibril_mutex_unlock(&list->mutex);
-}
-
-static inline void
-remove_interrupt_context(interrupt_context_list_t *list,
-    interrupt_context_t *ctx)
-{
-        fibril_mutex_lock(&list->mutex);
-        list_remove(&ctx->link);
-        fibril_mutex_unlock(&list->mutex);
-}
-
-static inline interrupt_context_t *
-find_interrupt_context_by_id(interrupt_context_list_t *list, int id)
-{
-        fibril_mutex_lock(&list->mutex);
-        
-        link_t *link = list->contexts.next;
-        interrupt_context_t *ctx;
-        
-        while (link != &list->contexts) {
-                ctx = list_get_instance(link, interrupt_context_t, link);
-                if (id == ctx->id) {
-                        fibril_mutex_unlock(&list->mutex);
-                        return ctx;
-                }
-                link = link->next;
-        }
-        
-        fibril_mutex_unlock(&list->mutex);
-        return NULL;
-}
-
-static inline interrupt_context_t *
-find_interrupt_context(interrupt_context_list_t *list, device_t *dev, int irq)
-{
-        fibril_mutex_lock(&list->mutex);
-        
-        link_t *link = list->contexts.next;
-        interrupt_context_t *ctx;
-        
-        while (link != &list->contexts) {
-                ctx = list_get_instance(link, interrupt_context_t, link);
-                if (irq == ctx->irq && dev == ctx->dev) {
-                        fibril_mutex_unlock(&list->mutex);
-                        return ctx;
-                }
-                link = link->next;
-        }
-        
-        fibril_mutex_unlock(&list->mutex);
-        return NULL;
-}
-
-int register_interrupt_handler(device_t *, int, interrupt_handler_t *,
-    irq_code_t *);
-int unregister_interrupt_handler(device_t *, int);
-
-
-/* default handler for client requests */
-
-static inline remote_handler_t *device_get_default_handler(device_t *dev)
-{
-        if (NULL == dev->ops)
-                return NULL;
-        return dev->ops->default_handler;
-}
-
-static inline int add_device_to_class(device_t *dev, const char *class_name)
-{
-        return devman_add_device_to_class(dev->handle, class_name);
-}
+extern remote_handler_t *device_get_default_handler(device_t *);
+extern int add_device_to_class(device_t *, const char *);
 
 #endif