Changeset 15d0046 in mainline for uspace/drv/audio/hdaudio/regif.h


Ignore:
Timestamp:
2014-09-12T13:22:33Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (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

File:
1 moved

Legend:

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

    r8db09e4 r15d0046  
    11/*
    2  * Copyright (c) 2006 Martin Decky
     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 register interface
    3333 */
    3434
    35 #ifndef KERN_mips64_CYCLE_H_
    36 #define KERN_mips64_CYCLE_H_
     35#ifndef REGIF_H
     36#define REGIF_H
    3737
    38 #include <arch/cp0.h>
    39 #include <arch/interrupt.h>
    40 #include <trace.h>
     38#include <stdint.h>
    4139
    42 NO_TRACE static inline uint64_t get_cycle(void)
    43 {
    44         return ((uint64_t) count_hi << 32) + ((uint64_t) cp0_count_read());
    45 }
     40extern uint8_t hda_reg8_read(uint8_t *);
     41extern uint16_t hda_reg16_read(uint16_t *);
     42extern uint32_t hda_reg32_read(uint32_t *);
     43extern void hda_reg8_write(uint8_t *, uint8_t);
     44extern void hda_reg16_write(uint16_t *, uint16_t);
     45extern void hda_reg32_write(uint32_t *, uint32_t);
    4646
    4747#endif
Note: See TracChangeset for help on using the changeset viewer.