Changeset 8a5962f in mainline

Timestamp:

2011-11-14T09:32:23Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ec388d7

Parents:

9991c47

Message:

libdrv, hw_res: Add forgotten ddf_fun_t* argument.

Set pointer to uint32_t, ISA DMA is limited to 24 bit addresses.

Location:

uspace/lib/drv

Files:

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

uspace/lib/drv/generic/remote_hw_res.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -112 +113 @@
 
         const int ret = hw_res_ops->dma_channel_setup(
-            channel, address, size, mode);
+            fun, channel, address, size, mode);
         async_answer_0(callid, ret);
 }

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.
  *
@@ -44 +45 @@
          hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
          bool (*enable_interrupt)(ddf_fun_t *);
-         int (*dma_channel_setup)(unsigned, uintptr_t, uint16_t, uint8_t);
+         int (*dma_channel_setup)(ddf_fun_t *,
+             unsigned, uint32_t, uint16_t, uint8_t);
 } hw_res_ops_t;