Changeset 0c968a17 in mainline for uspace/lib/drv/include/ops

Timestamp:

2011-02-15T22:58:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8b1ea2d4

Parents:

6a343bdf (diff), aa7dc64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge DDF and drivers refactoring work. Major points:

• Split driver.h into ddf/driver.h and ddf/interrupt.h
• Rename entities in ddf/driver.h (now they start with 'ddf_')
• Refactor driver.h API (ddf_fun_create/destroy/bind, for example)
• Refactor drivers to use soft-state structures for context

Location:

uspace/lib/drv/include/ops

Files:

• char_dev.h (modified) (1 diff)
• hw_res.h (modified) (1 diff)

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

@@ -36 +36 @@
 #define LIBDRV_OPS_CHAR_DEV_H_
 
-#include "../driver.h"
+#include "../ddf/driver.h"
 
 typedef struct {
-        int (*read)(device_t *, char *, size_t);
-        int (*write)(device_t *, char *, size_t);
+        int (*read)(ddf_fun_t *, char *, size_t);
+        int (*write)(ddf_fun_t *, char *, size_t);
 } char_dev_ops_t;
 

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

@@ -39 +39 @@
 #include <sys/types.h>
 
-#include "../driver.h"
+#include "../ddf/driver.h"
 
 typedef struct {
-         hw_resource_list_t *(*get_resource_list)(device_t *);
-         bool (*enable_interrupt)(device_t *);
+         hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
+         bool (*enable_interrupt)(ddf_fun_t *);
 } hw_res_ops_t;