Changeset a1769ee in mainline for uspace/lib/libdrv/include/driver.h

Timestamp:

2010-03-31T20:30:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

52b7b1bb

Parents:

eff1a590

Message:

device interfaces - parts of code

File:

• uspace/lib/libdrv/include/driver.h (modified) (5 diffs)

uspace/lib/libdrv/include/driver.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Lenka Trochtova 
+ * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <adt/list.h>
 #include <ipc/devman.h>
+#include <ipc/dev_iface.h>
 
-typedef struct device {
+struct device;
+typedef struct device device_t;
+
+// device interface
+
+// 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 struct {
+        int 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 int get_iface_index(dev_inferface_id_t id)
+{
+        return id - DEV_IFACE_FIRST;
+}
+
+static inline bool is_valid_iface_id(dev_inferface_id_t id)
+{
+        return DEV_IFACE_FIRST <= id && id < DEV_IFACE_MAX;
+}
+
+// device
+
+struct device {
         device_handle_t handle;
-        ipcarg_t parent_phone;  
+        ipcarg_t parent_phone;
         const char *name;
         match_id_list_t match_ids;
         void *driver_data;
-        
+        void *interfaces[DEV_IFACE_COUNT];
+
         // TODO add more items
-        
+
         link_t link;
-} device_t;
+};
 
-typedef struct driver_ops {     
+
+// driver
+
+typedef struct driver_ops {
         bool (*add_device)(device_t *dev);
         // TODO add other generic driver operations
@@ -61 +96 @@
 } driver_t;
 
+
+
+
+
 int driver_main(driver_t *drv);
 
@@ -68 +107 @@
         if (NULL != dev) {
                 memset(dev, 0, sizeof(device_t));
-        }       
+        }
         list_initialize(&dev->match_ids.ids);
         return dev;
 }
 
-static inline void delete_device(device_t *dev) {
+static inline void delete_device(device_t *dev)
+{
         clean_match_ids(&dev->match_ids);
         if (NULL != dev->name) {
@@ -79 +119 @@
         }
         free(dev);
+}
+
+static inline void device_set_iface (device_t *dev, dev_inferface_id_t id, void *iface)
+{
+        assert(is_valid_iface_id(id));
+
+        int idx = get_iface_index(id);
+        dev->interfaces[idx] = iface;
 }