Changeset 3869c596 in mainline

Timestamp:

2012-08-30T18:15:10Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57b28f9

Parents:

f3fb83a

Message:

isa dma: Use size_t to transfer remaining buffer size.

Be more careful with dma size bit magic.

Location:

uspace

Files:

• drv/bus/isa/i8237.c (modified) (3 diffs)
• drv/bus/isa/i8237.h (modified) (1 diff)
• drv/bus/isa/isa.c (modified) (1 diff)
• lib/drv/generic/remote_hw_res.c (modified) (1 diff)
• lib/drv/include/ops/hw_res.h (modified) (1 diff)

uspace/drv/bus/isa/i8237.c

@@ -38 +38 @@
 #include <bool.h>
 #include <errno.h>
+#include <ddi.h>
+#include <ddf/log.h>
 #include <fibril_synch.h>
-#include <ddi.h>
 #include <libarch/ddi.h>
-#include <ddf/log.h>
 #include "i8237.h"
 
@@ -454 +454 @@
  * @return Error code.
  */
-int dma_channel_remain(unsigned channel, uint16_t *size)
+int dma_channel_remain(unsigned channel, size_t *size)
 {
         assert(size);
@@ -484 +484 @@
         fibril_mutex_unlock(&guard);
 
-        const int remain = (value_high << 8 | value_low) + 1;
-        /* 16 bit DMA size is in words */
-        *size =  is_dma16(channel) ? remain << 1 : remain;
+        uint16_t remain = (value_high << 8 | value_low) ;
+        /* 16 bit DMA size is in words,
+         * the upper bits are bogus for 16bit transfers so we need to get
+         * rid of them. Using limited type works well.*/
+        if (is_dma16(channel))
+                remain <<= 1;
+        *size =  is_dma16(channel) ? remain + 2: remain + 1;
         return EOK;
 }

uspace/drv/bus/isa/i8237.h

@@ -39 +39 @@
 
 extern int dma_channel_setup(unsigned, uint32_t, uint16_t, uint8_t);
-extern int dma_channel_remain(unsigned, uint16_t *);
+extern int dma_channel_remain(unsigned, size_t *);
 
 #endif

uspace/drv/bus/isa/isa.c

@@ -170 +170 @@
 
 static int isa_fun_remain_dma(ddf_fun_t *fnode,
-    unsigned channel, uint16_t *size)
+    unsigned channel, size_t *size)
 {
         assert(size);

uspace/lib/drv/generic/remote_hw_res.c

@@ -130 +130 @@
         }
         const unsigned channel = DEV_IPC_GET_ARG1(*call);
-        uint16_t remain = 0;
+        size_t remain = 0;
         const int ret = hw_res_ops->dma_channel_remain(fun, channel, &remain);
         async_answer_1(callid, ret, remain);

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

@@ -45 +45 @@
         bool (*enable_interrupt)(ddf_fun_t *);
         int (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint16_t, uint8_t);
-        int (*dma_channel_remain)(ddf_fun_t *, unsigned, uint16_t *);
+        int (*dma_channel_remain)(ddf_fun_t *, unsigned, size_t *);
 } hw_res_ops_t;