Changeset a2be824 in mainline for uspace/lib/usb

Timestamp:

2011-02-04T14:19:59Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ef7f043

Parents:

3d31af5 (diff), bfc12ef (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

Files:

• include/usb/usbmem.h (modified) (3 diffs)
• src/usbmem.c (modified) (2 diffs)

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);

uspace/lib/usb/src/usbmem.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Matus Dekanek
+ * Copyright (c) 2011 Matus Dekanek
  * All rights reserved.
  *
@@ -69 +69 @@
 }
 
-static void addr_remove_callback(link_t *item)
+static void addr_remove_callback(link_t * item)
 {
         //delete item