Changeset 722912e in mainline for uspace/drv/audio


Ignore:
Timestamp:
2012-06-29T13:04:54Z (13 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/drv/audio/sb16
Files:
3 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"
Note: See TracChangeset for help on using the changeset viewer.