Changeset b5e68c8 in mainline for uspace/lib/drv/include/ops/hw_res.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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 mainline changes.

File:

• uspace/lib/drv/include/ops/hw_res.h (moved) (moved from uspace/lib/drv/include/resource.h ) (1 diff)

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 *);
-         bool (*enable_interrupt)(device_t *);
-} resource_iface_t;
+#include "../ddf/driver.h"
 
+typedef struct {
+         hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
+         bool (*enable_interrupt)(ddf_fun_t *);
+} hw_res_ops_t;
 
 #endif