Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 722912e in mainline


Ignore:
Timestamp:
2012-06-29T13:04:54Z (8 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
master
Children:
ea150dc6
Parents:
6843a9c
Message:

Fix mainline merge breakage.

Location:
uspace
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/audio/sb16/dma.h

    r6843a9c r722912e  
    6767static inline void *dma_create_buffer24(size_t size)
    6868{
    69         void *free_address = as_get_mappable_page(size);
    70         if (free_address == 0)
    71                 return NULL;
    7269        void *address =
    73             as_area_create(free_address, size, AS_AREA_READ | AS_AREA_WRITE);
    74         if (address != free_address)
    75                 return NULL;
     70            as_area_create(AS_AREA_ANY, size, AS_AREA_READ | AS_AREA_WRITE);
    7671        bzero(address, size);
    7772        return address;
  • uspace/drv/audio/sb16/main.c

    r6843a9c r722912e  
    5555/*----------------------------------------------------------------------------*/
    5656static driver_ops_t sb_driver_ops = {
    57         .add_device = sb_add_device,
     57        .dev_add = sb_add_device,
    5858};
    5959/*----------------------------------------------------------------------------*/
  • uspace/drv/audio/sb16/mixer.c

    r6843a9c r722912e  
    2727 */
    2828
     29#include <assert.h>
    2930#include <bool.h>
    3031#include <errno.h>
    3132#include <libarch/ddi.h>
     33#include <unistd.h>
    3234
    3335#include "ddf_log.h"
  • uspace/lib/c/generic/device/hw_res_parsed.c

    r6843a9c r722912e  
    4444        assert((res->type == DMA_CHANNEL_8) || (res->type == DMA_CHANNEL_16));
    4545       
    46         const int channel = (res->type == DMA_CHANNEL_8) ?
     46        const unsigned channel = (res->type == DMA_CHANNEL_8) ?
    4747            res->res.dma_channel.dma8 : res->res.dma_channel.dma16;
    4848        const size_t count = out->dma_channels.count;
  • uspace/lib/c/include/device/hw_res_parsed.h

    r6843a9c r722912e  
    100100        /** List of IRQs */
    101101        irq_list_t irqs;
    102 
    103         /** List of DMA channels */
    104         dma_list_t dma_channels;
    105102       
    106103        /** List of DMA channels */
  • uspace/lib/drv/generic/remote_audio_pcm_buffer.c

    r6843a9c r722912e  
    9292            &buffer_size, &buffer_id);
    9393        if (ret == EOK) {
    94                 void *dst = as_get_mappable_page(buffer_size);
    95                 // FIXME Should we create as_area?
    96                 // FIXME Do we need to know the flags?
     94                void *dst = NULL;
    9795                const int ret =
    98                     async_share_in_start_0_0(exch, dst, buffer_size);
     96                    async_share_in_start_0_0(exch, buffer_size, &dst);
    9997                if (ret != EOK) {
    10098                        return ret;
Note: See TracChangeset for help on using the changeset viewer.