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

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 (modified) (2 diffs)

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;