Changeset 301032a in mainline for uspace/lib/drv

Timestamp:

2013-08-16T14:08:03Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

537620a8

Parents:

c762ad5

Message:

isa, dma: Fix 64KB dma buffers

Location:

uspace/lib/drv

Files:

• generic/remote_hw_res.c (modified) (1 diff)
• include/ops/hw_res.h (modified) (1 diff)

uspace/lib/drv/generic/remote_hw_res.c

@@ -110 +110 @@
                 return;
         }
-        const unsigned channel = DEV_IPC_GET_ARG1(*call);
+        const unsigned channel = DEV_IPC_GET_ARG1(*call) & 0xffff;
+        const uint8_t  mode = DEV_IPC_GET_ARG1(*call) >> 16;
         const uint32_t address = DEV_IPC_GET_ARG2(*call);
-        const uint16_t size = DEV_IPC_GET_ARG3(*call) & 0xffff;
-        const uint8_t mode = DEV_IPC_GET_ARG3(*call) >> 16;
+        const uint32_t size = DEV_IPC_GET_ARG3(*call);
 
         const int ret = hw_res_ops->dma_channel_setup(

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

@@ -44 +44 @@
         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);
+        int (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint32_t, uint8_t);
         int (*dma_channel_remain)(ddf_fun_t *, unsigned, size_t *);
 } hw_res_ops_t;