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

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/drv/include/ops/hw_res.h (modified) (1 diff)

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

@@ -39 +39 @@
 #include <device/hw_res.h>
 #include <sys/types.h>
-
 #include "../ddf/driver.h"
 
 typedef struct {
-         hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
-         bool (*enable_interrupt)(ddf_fun_t *);
-         int (*dma_channel_setup)(ddf_fun_t *,
-             unsigned, uint32_t, uint16_t, uint8_t);
+        hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
+        bool (*enable_interrupt)(ddf_fun_t *);
+        int (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint16_t, uint8_t);
 } hw_res_ops_t;