Changeset 722912e in mainline

Timestamp:

2012-06-29T13:04:54Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ea150dc6

Parents:

6843a9c

Message:

Fix mainline merge breakage.

Location:

uspace

Files:

• drv/audio/sb16/dma.h (modified) (1 diff)
• drv/audio/sb16/main.c (modified) (1 diff)
• drv/audio/sb16/mixer.c (modified) (1 diff)
• lib/c/generic/device/hw_res_parsed.c (modified) (1 diff)
• lib/c/include/device/hw_res_parsed.h (modified) (1 diff)
• lib/drv/generic/remote_audio_pcm_buffer.c (modified) (1 diff)

uspace/drv/audio/sb16/dma.h

@@ -67 +67 @@
 static inline void *dma_create_buffer24(size_t size)
 {
-        void *free_address = as_get_mappable_page(size);
-        if (free_address == 0)
-                return NULL;
         void *address =
-            as_area_create(free_address, size, AS_AREA_READ | AS_AREA_WRITE);
-        if (address != free_address)
-                return NULL;
+            as_area_create(AS_AREA_ANY, size, AS_AREA_READ | AS_AREA_WRITE);
         bzero(address, size);
         return address;

uspace/drv/audio/sb16/main.c

@@ -55 +55 @@
 /*----------------------------------------------------------------------------*/
 static driver_ops_t sb_driver_ops = {
-        .add_device = sb_add_device,
+        .dev_add = sb_add_device,
 };
 /*----------------------------------------------------------------------------*/

uspace/drv/audio/sb16/mixer.c

@@ -27 +27 @@
  */
 
+#include <assert.h>
 #include <bool.h>
 #include <errno.h>
 #include <libarch/ddi.h>
+#include <unistd.h>
 
 #include "ddf_log.h"

uspace/lib/c/generic/device/hw_res_parsed.c

@@ -44 +44 @@
         assert((res->type == DMA_CHANNEL_8) || (res->type == DMA_CHANNEL_16));
         
-        const int channel = (res->type == DMA_CHANNEL_8) ?
+        const unsigned channel = (res->type == DMA_CHANNEL_8) ?
             res->res.dma_channel.dma8 : res->res.dma_channel.dma16;
         const size_t count = out->dma_channels.count;

uspace/lib/c/include/device/hw_res_parsed.h

@@ -100 +100 @@
         /** List of IRQs */
         irq_list_t irqs;
-
-        /** List of DMA channels */
-        dma_list_t dma_channels;
         
         /** List of DMA channels */

uspace/lib/drv/generic/remote_audio_pcm_buffer.c

@@ -92 +92 @@
             &buffer_size, &buffer_id);
         if (ret == EOK) {
-                void *dst = as_get_mappable_page(buffer_size);
-                // FIXME Should we create as_area?
-                // FIXME Do we need to know the flags?
+                void *dst = NULL;
                 const int ret =
-                    async_share_in_start_0_0(exch, dst, buffer_size);
+                    async_share_in_start_0_0(exch, buffer_size, &dst);
                 if (ret != EOK) {
                         return ret;