Changeset 153cc76a in mainline for uspace/lib/drv

Timestamp:

2011-12-23T16:42:22Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7e1b130

Parents:

4291215 (diff), 2f0dd2a (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:

Mainline changes.

Location:

uspace/lib/drv

Files:

• generic/driver.c (modified) (2 diffs)
• include/ops/hw_res.h (modified) (2 diffs)

uspace/lib/drv/generic/driver.c

@@ -198 +198 @@
                 pseudocode = &default_pseudocode;
         
-        int res = register_irq(irq, dev->handle, ctx->id, pseudocode);
+        int res = irq_register(irq, dev->handle, ctx->id, pseudocode);
         if (res != EOK) {
                 remove_interrupt_context(&interrupt_contexts, ctx);
@@ -211 +211 @@
         interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts,
             dev, irq);
-        int res = unregister_irq(irq, dev->handle);
+        int res = irq_unregister(irq, dev->handle);
         
         if (ctx != NULL) {

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Lenka Trochtova 
+ * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -42 +43 @@
 
 typedef struct {
-         hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
-         bool (*enable_interrupt)(ddf_fun_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;