Changeset 7d521e24 in mainline for uspace/lib/usbdev/include/usb

Timestamp:

2011-05-17T08:54:43Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9f2de92

Parents:

04c418d

Message:

libusbdev uses include usb/dev

Location:

uspace/lib/usbdev/include/usb/dev

Files:

• dp.h (moved) (moved from uspace/lib/usbdev/include/usb/dp.h ) (1 diff)
• driver.h (moved) (moved from uspace/lib/usbdev/include/usb/devdrv.h ) (1 diff)
• hc.h (moved) (moved from uspace/lib/usbdev/include/usb/usbdevice.h ) (1 diff)
• hub.h (moved) (moved from uspace/lib/usbdev/include/usb/hub.h ) (1 diff)
• pipes.h (moved) (moved from uspace/lib/usbdev/include/usb/pipes.h ) (1 diff)
• poll.h (moved) (moved from uspace/lib/usbdev/include/usb/devpoll.h ) (1 diff)
• recognise.h (moved) (moved from uspace/lib/usbdev/include/usb/recognise.h ) (1 diff)
• request.h (moved) (moved from uspace/lib/usbdev/include/usb/request.h ) (1 diff)

uspace/lib/usbdev/include/usb/dev/dp.h

@@ -33 +33 @@
  * USB descriptor parser.
  */
-#ifndef LIBUSB_DP_H_
-#define LIBUSB_DP_H_
+#ifndef LIBUSBDEV_DP_H_
+#define LIBUSBDEV_DP_H_
 
 #include <sys/types.h>

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -33 +33 @@
  * USB device driver framework.
  */
-#ifndef LIBUSB_DEVDRV_H_
-#define LIBUSB_DEVDRV_H_
+#ifndef LIBUSBDEV_DRIVER_H_
+#define LIBUSBDEV_DRIVER_H_
 
-#include <usb/pipes.h>
+#include <usb/dev/pipes.h>
 
 /** Descriptors for USB device. */

uspace/lib/usbdev/include/usb/dev/hc.h

@@ -33 +33 @@
  * General communication between device drivers and host controller driver.
  */
-#ifndef LIBUSB_USBDEVICE_H_
-#define LIBUSB_USBDEVICE_H_
+#ifndef LIBUSBDEV_HC_H_
+#define LIBUSBDEV_HC_H_
 
 #include <sys/types.h>

uspace/lib/usbdev/include/usb/dev/hub.h

@@ -35 +35 @@
  * For class specific requests, see usb/classes/hub.h.
  */
-#ifndef LIBUSB_HUB_H_
-#define LIBUSB_HUB_H_
+#ifndef LIBUSBDEV_HUB_H_
+#define LIBUSBDEV_HUB_H_
 
 #include <sys/types.h>
-#include <usb/usbdevice.h>
+#include <usb/dev/hc.h>
 
 int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -33 +33 @@
  * USB pipes representation.
  */
-#ifndef LIBUSB_PIPES_H_
-#define LIBUSB_PIPES_H_
+#ifndef LIBUSBDEV_PIPES_H_
+#define LIBUSBDEV_PIPES_H_
 
 #include <sys/types.h>
 #include <usb/usb.h>
-#include <usb/usbdevice.h>
+#include <usb/dev/hc.h>
 #include <usb/descriptor.h>
 #include <ipc/devman.h>

uspace/lib/usbdev/include/usb/dev/poll.h

@@ -33 +33 @@
  * USB device polling functions.
  */
-#ifndef LIBUSB_DEVPOLL_H_
-#define LIBUSB_DEVPOLL_H_
+#ifndef LIBUSBDEV_POLL_H_
+#define LIBUSBDEV_POLL_H_
 
-#include <usb/devdrv.h>
+#include <usb/dev/driver.h>
 #include <time.h>
 

uspace/lib/usbdev/include/usb/dev/recognise.h

@@ -33 +33 @@
  * USB device recognition.
  */
-#ifndef LIBUSB_RECOGNISE_H_
-#define LIBUSB_RECOGNISE_H_
+#ifndef LIBUSBDEV_RECOGNISE_H_
+#define LIBUSBDEV_RECOGNISE_H_
 
 #include <sys/types.h>
 #include <usb/usb.h>
-#include <usb/pipes.h>
+#include <usb/dev/pipes.h>
 #include <ipc/devman.h>
 

uspace/lib/usbdev/include/usb/dev/request.h

@@ -33 +33 @@
  * Standard USB requests.
  */
-#ifndef LIBUSB_REQUEST_H_
-#define LIBUSB_REQUEST_H_
+#ifndef LIBUSBDEV_REQUEST_H_
+#define LIBUSBDEV_REQUEST_H_
 
 #include <sys/types.h>
 #include <l18n/langs.h>
 #include <usb/usb.h>
-#include <usb/pipes.h>
+#include <usb/dev/pipes.h>
 #include <usb/descriptor.h>