Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 1a38701 in mainline


Ignore:
Timestamp:
2011-12-12T12:09:12Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
dbb7e3b
Parents:
c24c157d
Message:

libusb, libusbdev: Move usb_device_connection to separate header in libusbdev.

Location:
uspace
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/mkbd/main.c

    rc24c157d r1a38701  
    4848#include <usb/dev/pipes.h>
    4949#include <async.h>
     50#include <usb/dev.h>
    5051#include <usb/hid/usages/core.h>
    5152#include <usb/hid/hidparser.h>
  • uspace/app/usbinfo/main.c

    rc24c157d r1a38701  
    4444#include <loc.h>
    4545#include <usb/hc.h>
     46#include <usb/dev.h>
    4647#include <usb/dev/pipes.h>
    4748#include "usbinfo.h"
  • uspace/lib/usb/include/usb/dev.h

    rc24c157d r1a38701  
    3737#include <devman.h>
    3838#include <usb/usb.h>
    39 #include <usb/hc.h>
    40 
    41 
    42 /** Abstraction of a physical connection to the device.
    43  * This type is an abstraction of the USB wire that connects the host and
    44  * the function (device).
    45  */
    46 typedef struct {
    47         /** Connection to the host controller device is connected to. */
    48         usb_hc_connection_t *hc_connection;
    49         /** Address of the device. */
    50         usb_address_t address;
    51 } usb_device_connection_t;
    52 
    53 int usb_device_connection_initialize(usb_device_connection_t *,
    54     usb_hc_connection_t *, usb_address_t);
    55 
    56 /** Initialize connection to USB device on default address.
    57  *
    58  * @param dev_connection Device connection structure to be initialized.
    59  * @param hc_connection Initialized connection to host controller.
    60  * @return Error code.
    61  */
    62 static inline int usb_device_connection_initialize_on_default_address(
    63     usb_device_connection_t *connection, usb_hc_connection_t *hc_conn)
    64 {
    65         return usb_device_connection_initialize(connection, hc_conn, 0);
    66 }
    6739
    6840int usb_get_info_by_handle(devman_handle_t,
  • uspace/lib/usb/src/dev.c

    rc24c157d r1a38701  
    106106        return EOK;
    107107}
    108 /*----------------------------------------------------------------------------*/
    109 int usb_device_connection_initialize(usb_device_connection_t *connection,
    110     usb_hc_connection_t *hc_connection, usb_address_t address)
    111 {
    112         assert(connection);
    113 
    114         if (hc_connection == NULL) {
    115                 return EBADMEM;
    116         }
    117 
    118         if ((address < 0) || (address >= USB11_ADDRESS_MAX)) {
    119                 return EINVAL;
    120         }
    121 
    122         connection->hc_connection = hc_connection;
    123         connection->address = address;
    124         return EOK;
    125 }
  • uspace/lib/usbdev/include/usb/dev/pipes.h

    rc24c157d r1a38701  
    3636
    3737#include <sys/types.h>
    38 #include <usb/usb.h>
    39 #include <usb/dev.h>
    40 #include <usb/descriptor.h>
    4138#include <ipc/devman.h>
    4239#include <ddf/driver.h>
    4340#include <fibril_synch.h>
    4441#include <async.h>
     42#include <usb/usb.h>
     43#include <usb/descriptor.h>
     44#include <usb/dev/usb_device_connection.h>
    4545
    4646/** Abstraction of a logical connection to USB device endpoint.
  • uspace/lib/usbdev/src/devdrv.c

    rc24c157d r1a38701  
    3636#include <usb/dev/request.h>
    3737#include <usb/debug.h>
     38#include <usb/dev.h>
    3839#include <usb/dev/dp.h>
    3940#include <errno.h>
Note: See TracChangeset for help on using the changeset viewer.