Changeset b7068da in mainline for uspace/drv/bus/isa/i8237.h


Ignore:
Timestamp:
2012-02-09T20:35:12Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
591762c6
Parents:
7cede12c (diff), 3d4750f (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/bus/isa/i8237.h

    r7cede12c rb7068da  
    11/*
    2  * Copyright (c) 2011 Vojtech Horky
     2 * Copyright (c) 2011 Jan Vesely
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libusbdev
     29/** @addtogroup isa
    3030 * @{
    3131 */
     32
    3233/** @file
    33  * Library internal functions on USB pipes.
     34 * @brief DMA memory management
    3435 */
    35 #ifndef LIBUSBDEV_PIPEPRIV_H_
    36 #define LIBUSBDEV_PIPEPRIV_H_
    3736
    38 #include <usb/dev/pipes.h>
    39 #include <bool.h>
     37#ifndef DRV_BUS_ISA_I8237_H
     38#define DRV_BUS_ISA_I8237_H
    4039
    41 void pipe_acquire(usb_pipe_t *);
    42 void pipe_release(usb_pipe_t *);
    43 
    44 void pipe_start_transaction(usb_pipe_t *);
    45 void pipe_end_transaction(usb_pipe_t *);
    46 
    47 int pipe_add_ref(usb_pipe_t *, bool);
    48 void pipe_drop_ref(usb_pipe_t *);
    49 
     40extern int dma_setup_channel(unsigned int, uint32_t, uint16_t, uint8_t);
    5041
    5142#endif
     43
    5244/**
    5345 * @}
Note: See TracChangeset for help on using the changeset viewer.