Changeset 8442d10 in mainline for uspace/drv/audio/sb16/dsp.c

Timestamp:

2013-09-09T21:48:12Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c67dbd6

Parents:

2e2c18a1

Message:

improve the API of physmem_map(), dmamem_map() and dmamem_map_anonymous()
the "constraint" argument of dmamem_map_anonymous() should be used to specify bits disallowed in the physical frame address

File:

• uspace/drv/audio/sb16/dsp.c (modified) (2 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -173 +173 @@
 {
         assert(dsp);
-        if (size > MAX_BUFFER_SIZE || size == 0 || (size % 2) == 1)
+        
+        if ((size > MAX_BUFFER_SIZE) || (size == 0) || ((size % 2) == 1))
                 size = MAX_BUFFER_SIZE;
-        void *buffer = NULL, *pa = NULL;
-        int ret = dmamem_map_anonymous(size, AS_AREA_WRITE | AS_AREA_READ,
-            0, &pa, &buffer);
+        
+        uintptr_t pa = 0;
+        void *buffer = NULL;
+        
+        int ret = dmamem_map_anonymous(size, DMAMEM_16MiB,
+            AS_AREA_WRITE | AS_AREA_READ, 0, &pa, &buffer);
         if (ret != EOK) {
                 ddf_log_error("Failed to allocate DMA buffer.");
                 return ENOMEM;
         }
-
-        ddf_log_verbose("Setup dma buffer at %p(%p) %zu.", buffer, pa, size);
-        assert((uintptr_t)pa < (1 << 25));
-
+        
+        ddf_log_verbose("Setup DMA buffer at %p (%zu) %zu.", buffer, pa, size);
+        assert(pa < (1 << 24));
+        
         /* Setup 16 bit channel */
-        ret = setup_dma(dsp, (uintptr_t)pa, size);
+        ret = setup_dma(dsp, pa, size);
         if (ret == EOK) {
                 dsp->buffer.data = buffer;
@@ -196 +200 @@
                 dmamem_unmap_anonymous(buffer);
         }
+        
         return ret;
 }