Changeset 92574f4 in mainline for uspace/lib/usb/include/usb/addrkeep.h

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/usb/include/usb/addrkeep.h (moved) (moved from uspace/lib/usb/include/usb/hcd.h ) (1 diff)

uspace/lib/usb/include/usb/addrkeep.h

@@ -31 +31 @@
  */
 /** @file
- * @brief HC driver.
+ * USB address keeping for host controller drivers.
  */
-#ifndef LIBUSB_HCD_H_
-#define LIBUSB_HCD_H_
+#ifndef LIBUSB_ADDRKEEP_H_
+#define LIBUSB_ADDRKEEP_H_
 
 #include <usb/usb.h>