Changeset 8e7c9fe in mainline for uspace/drv/audio/hdaudio/pcm_iface.h


Ignore:
Timestamp:
2014-09-12T03:45:25Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c53b58e
Parents:
3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/drv/audio/hdaudio/pcm_iface.h

    r3eb0c85 r8e7c9fe  
    11/*
    2  * Copyright (c) 2005 Jakub Vana
     2 * Copyright (c) 2014 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup mips64
     29/** @addtogroup hdaudio
    3030 * @{
    3131 */
    32 /** @file
     32/** @file High Definition Audio PCM interface
    3333 */
    3434
    35 #ifndef KERN_mips64_FPU_CONTEXT_H_
    36 #define KERN_mips64_FPU_CONTEXT_H_
     35#ifndef PCM_IFACE_H
     36#define PCM_IFACE_H
    3737
    38 #include <typedefs.h>
     38#include <audio_pcm_iface.h>
    3939
    40 #define FPU_CONTEXT_ALIGN  sizeof(sysarg_t)
     40#include "hdaudio.h"
    4141
    42 typedef struct {
    43         sysarg_t dregs[32];
    44         sysarg_t cregs[32];
    45 } fpu_context_t;
     42extern audio_pcm_iface_t hda_pcm_iface;
     43extern void hda_pcm_event(hda_t *, pcm_event_t);
    4644
    4745#endif
Note: See TracChangeset for help on using the changeset viewer.