Changeset 3b60ea0 in mainline


Ignore:
Timestamp:
2018-01-31T16:36:51Z (6 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
98893ede
Parents:
5595841
Message:

usb: moved dma_buffer from usbhost to usb library

Location:
uspace
Files:
11 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/ehci/ehci_batch.h

    r5595841 r3b60ea0  
    3939#include <stdbool.h>
    4040#include <usb/host/usb_transfer_batch.h>
    41 #include <usb/host/dma_buffer.h>
     41#include <usb/dma_buffer.h>
    4242
    4343#include "hw_struct/queue_head.h"

  • uspace/drv/bus/usb/ehci/ehci_bus.h

    r5595841 r3b60ea0  
    4040#include <usb/host/usb2_bus.h>
    4141#include <usb/host/endpoint.h>
    42 #include <usb/host/dma_buffer.h>
     42#include <usb/dma_buffer.h>
    4343
    4444#include "hw_struct/queue_head.h"

  • uspace/drv/bus/usb/xhci/commands.h

    r5595841 r3b60ea0  
    4040#include <stdbool.h>
    4141#include <fibril_synch.h>
    42 #include <usb/host/dma_buffer.h>
     42#include <usb/dma_buffer.h>
    4343#include "hw_struct/trb.h"
    4444#include "trb_ring.h"

  • uspace/drv/bus/usb/xhci/device.h

    r5595841 r3b60ea0  
    3636
    3737#include <usb/host/bus.h>
    38 #include <usb/host/dma_buffer.h>
     38#include <usb/dma_buffer.h>
    3939
    4040typedef struct xhci_slot_ctx xhci_slot_ctx_t;

  • uspace/drv/bus/usb/xhci/endpoint.h

    r5595841 r3b60ea0  
    4040
    4141#include <usb/debug.h>
    42 #include <usb/host/dma_buffer.h>
     42#include <usb/dma_buffer.h>
    4343#include <usb/host/endpoint.h>
    4444#include <usb/host/hcd.h>

  • uspace/drv/bus/usb/xhci/isoch.h

    r5595841 r3b60ea0  
    3737#define XHCI_ISOCH_H
    3838
    39 #include <usb/host/dma_buffer.h>
     39#include <usb/dma_buffer.h>
    4040
    4141#include "trb_ring.h"

  • uspace/drv/bus/usb/xhci/rh.c

    r5595841 r3b60ea0  
    4040#include <usb/host/bus.h>
    4141#include <usb/host/ddf_helpers.h>
    42 #include <usb/host/dma_buffer.h>
     42#include <usb/dma_buffer.h>
    4343#include <usb/host/hcd.h>
    4444#include <usb/port.h>

  • uspace/drv/bus/usb/xhci/scratchpad.h

    r5595841 r3b60ea0  
    4141#define XHCI_SCRATCHPAD_H
    4242
    43 #include <usb/host/dma_buffer.h>
     43#include <usb/dma_buffer.h>
    4444
    4545typedef struct xhci_hc xhci_hc_t;

  • uspace/drv/bus/usb/xhci/trb_ring.h

    r5595841 r3b60ea0  
    4646#include <fibril_synch.h>
    4747#include <libarch/config.h>
    48 #include <usb/host/dma_buffer.h>
     48#include <usb/dma_buffer.h>
    4949
    5050typedef struct trb_segment trb_segment_t;

  • uspace/lib/usb/Makefile

    r5595841 r3b60ea0  
    3535        src/dev.c \
    3636        src/debug.c \
     37        src/dma_buffer.c \
    3738        src/dump.c \
    3839        src/port.c \

  • uspace/lib/usb/include/usb/dma_buffer.h

    r5595841 r3b60ea0  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 /** @addtogroup drvusbehci
     28/** @addtogroup libusb
    2929 * @{
    3030 */
    … …  
    3838 * allocation.
    3939 */
    40 #ifndef LIB_USBHOST_DMA_BUFFER
    41 #define LIB_USBHOST_DMA_BUFFER
     40#ifndef LIB_USB_DMA_BUFFER
     41#define LIB_USB_DMA_BUFFER
    4242
    4343#include <stdint.h>

  • uspace/lib/usb/src/dma_buffer.c

    r5595841 r3b60ea0  
    11/*
    2  * Copyright (c) 2013 Jan Vesely
    32 * Copyright (c) 2017 Ondrej Hlavaty <aearsis@eideo.cz>
    43 * All rights reserved.
    … …  
    2726 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2827 */
    29 /**  @addtogroup libusbhost
     28/**  @addtogroup libusb
    3029 * @{
    3130 */
    … …  
    3837#include <stddef.h>
    3938
    40 #include "dma_buffer.h"
     39#include "usb/dma_buffer.h"
    4140
    4241dma_policy_t dma_policy_default = {

  • uspace/lib/usbhost/Makefile

    r5595841 r3b60ea0  
    4040        src/usb2_bus.c \
    4141        src/bandwidth.c \
    42         src/dma_buffer.c \
    4342        src/utility.c \
    4443        src/usb_transfer_batch.c
Note: See TracChangeset for help on using the changeset viewer.