Changeset d6b1359 in mainline for uspace/lib/drv/include

Timestamp:

2011-01-09T18:00:14Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

80bffdb0

Parents:

0c70f7e (diff), 8871dba (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 mildly aggressive DDF cleanup (char_dev and hw_res interfaces, ops structures).

Location:

uspace/lib/drv/include

Files:

• driver.h (modified) (1 diff)
• ops/char_dev.h (moved) (moved from uspace/lib/drv/include/char.h ) (1 diff)
• ops/hw_res.h (moved) (moved from uspace/lib/drv/include/resource.h ) (1 diff)
• remote_char_dev.h (moved) (moved from uspace/lib/drv/include/remote_res.h ) (1 diff)
• remote_hw_res.h (moved) (moved from uspace/lib/drv/include/remote_char.h ) (1 diff)

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>

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

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_CHAR_H_
-#define LIBDRV_CHAR_H_
+#ifndef LIBDRV_OPS_CHAR_DEV_H_
+#define LIBDRV_OPS_CHAR_DEV_H_
 
-#include "driver.h"
+#include "../driver.h"
 
-typedef struct char_iface {
+typedef struct {
         int (*read)(device_t *, char *, size_t);
         int (*write)(device_t *, char *, size_t);
-} char_iface_t;
+} char_dev_ops_t;
 
 #endif

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

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_RESOURCE_H_
-#define LIBDRV_RESOURCE_H_
+#ifndef LIBDRV_OPS_HW_RES_H_
+#define LIBDRV_OPS_HW_RES_H_
 
-#include "driver.h"
+#include <device/hw_res.h>
+#include <sys/types.h>
 
-typedef struct resource_iface {
-         hw_resource_list_t *(* get_resources)(device_t *);
+#include "../driver.h"
+
+typedef struct {
+         hw_resource_list_t *(*get_resource_list)(device_t *);
          bool (*enable_interrupt)(device_t *);
-} resource_iface_t;
-
+} hw_res_ops_t;
 
 #endif

uspace/lib/drv/include/remote_char_dev.h

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_REMOTE_RES_H_
-#define LIBDRV_REMOTE_RES_H_
+#ifndef LIBDRV_REMOTE_CHAR_DEV_H_
+#define LIBDRV_REMOTE_CHAR_DEV_H_
 
-remote_iface_t remote_res_iface;
+extern remote_iface_t remote_char_dev_iface;
 
 #endif

uspace/lib/drv/include/remote_hw_res.h

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_REMOTE_CHAR_H_
-#define LIBDRV_REMOTE_CHAR_H_
+#ifndef LIBDRV_REMOTE_HW_RES_H_
+#define LIBDRV_REMOTE_HW_RES_H_
 
-remote_iface_t remote_char_iface;
+extern remote_iface_t remote_hw_res_iface;
 
 #endif