Ignore:
Timestamp:
2016-07-22T08:24:47Z (8 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f76d2c2
Parents:
5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/ehci/hw_struct/mem_access.h

    r5b18137 rb4b534ac  
    11/*
    2  * Copyright (c) 2010 Vojtech Horky
     2 * Copyright (c) 2013 Jan Vesely
    33 * All rights reserved.
    44 *
     
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 
    29 /** @addtogroup drvusbuhcihc
     28/** @addtogroup drvusbehci
    3029 * @{
    3130 */
    3231/** @file
    33  * @brief UHCI driver PCI helper functions
     32 * @brief EHCI driver
    3433 */
    35 #ifndef DRV_UHCI_PCI_H
    36 #define DRV_UHCI_PCI_H
     34#ifndef DRV_EHCI_HW_MEM_ACCESS_H
     35#define DRV_EHCI_HW_MEM_ACCESS_H
    3736
    38 #include <ddf/driver.h>
    39 #include <device/hw_res_parsed.h>
     37#include <byteorder.h>
     38#include <libarch/barrier.h>
    4039
    41 int get_my_registers(ddf_dev_t *, addr_range_t *, int *);
    42 int enable_interrupts(ddf_dev_t *);
    43 int disable_legacy(ddf_dev_t *);
     40#define EHCI_MEM32_WR(reg, val) reg = host2uint32_t_le(val)
     41#define EHCI_MEM32_RD(reg) uint32_t_le2host(reg)
     42#define EHCI_MEM32_SET(reg, val) reg |= host2uint32_t_le(val)
     43#define EHCI_MEM32_CLR(reg, val) reg &= host2uint32_t_le(~val)
    4444
    4545#endif
    46 /**
     46
     47/*
    4748 * @}
    4849 */
Note: See TracChangeset for help on using the changeset viewer.