Changeset cd50486 in mainline for uspace/lib/usb/include

Timestamp:

2011-02-06T22:03:55Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (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 development/ changes

Location:

uspace/lib/usb/include/usb

Files:

• addrkeep.h (added)
• descriptor.h (modified) (1 diff)
• devreq.h (modified) (3 diffs)
• usb.h (modified) (1 diff)
• usbmem.h (modified) (3 diffs)

uspace/lib/usb/include/usb/descriptor.h

@@ -36 +36 @@
 #define LIBUSB_DESCRIPTOR_H_
 
-#include <ipc/ipc.h>
 #include <async.h>
 

uspace/lib/usb/include/usb/devreq.h

@@ -36 +36 @@
 #define LIBUSB_DEVREQ_H_
 
-#include <ipc/ipc.h>
 #include <async.h>
 #include <usb/usb.h>
@@ -70 +69 @@
         /** Main parameter to the request. */
         union {
+                uint16_t value;
                 /* FIXME: add #ifdefs according to host endianess */
                 struct {
@@ -75 +75 @@
                         uint8_t value_high;
                 };
-                uint16_t value;
         };
         /** Auxiliary parameter to the request.

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

@@ -38 +38 @@
 #include <sys/types.h>
 #include <byteorder.h>
-#include <ipc/ipc.h>
 
 /** Convert 16bit value from native (host) endianness to USB endianness. */

uspace/lib/usb/include/usb/usbmem.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Matus Dekanek
+ * Copyright (c) 2011 Matus Dekanek
  * All rights reserved.
  *
@@ -35 +35 @@
  * @{
  */
-/** @file definitions of special memory management, used mostly in usb stack
+/** @file definitions of memory management with address translation, used mostly in usb stack
  *
  * USB HCD needs traslation between physical and virtual addresses. These
@@ -59 +59 @@
 
 extern void * mman_malloc(
-                size_t size,
-                size_t alignment,
-                unsigned long max_physical_address);
+    size_t size,
+    size_t alignment,
+    unsigned long max_physical_address);
 
 extern void * mman_getVA(void * addr);