Changeset 95c675b in mainline for uspace/lib/drv/include

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

Location:

uspace/lib/drv/include

Files:

• ddf/driver.h (modified) (1 diff)
• ddf/interrupt.h (modified) (1 diff)
• ops/hw_res.h (modified) (1 diff)

uspace/lib/drv/include/ddf/driver.h

@@ -117 +117 @@
 extern devman_handle_t ddf_dev_get_handle(ddf_dev_t *);
 extern const char *ddf_dev_get_name(ddf_dev_t *);
-extern async_sess_t *ddf_dev_parent_sess_create(ddf_dev_t *);
 extern async_sess_t *ddf_dev_parent_sess_get(ddf_dev_t *);
 extern ddf_fun_t *ddf_fun_create(ddf_dev_t *, fun_type_t, const char *);

uspace/lib/drv/include/ddf/interrupt.h

@@ -37 +37 @@
 
 #include <libarch/common.h>
-#include <libarch/types.h>
+#include <types/common.h>
 #include <abi/ddi/irq.h>
 #include <adt/list.h>

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

@@ -44 +44 @@
 typedef struct {
         hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
-        bool (*enable_interrupt)(ddf_fun_t *);
+        int (*enable_interrupt)(ddf_fun_t *, int);
+        int (*disable_interrupt)(ddf_fun_t *, int);
+        int (*clear_interrupt)(ddf_fun_t *, int);
         int (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint32_t, uint8_t);
         int (*dma_channel_remain)(ddf_fun_t *, unsigned, size_t *);