Changeset b9e3aa3 in mainline for uspace/drv/usbhub/utils.c

Timestamp:

2011-05-30T14:13:53Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f3f9733

Parents:

2002595 (diff), 8357fc9 (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:

Development changes (a lot of stuff)

File:

• uspace/drv/usbhub/utils.c (modified) (8 diffs)

uspace/drv/usbhub/utils.c

@@ -62 +62 @@
  * @return newly created serializd descriptor pointer
  */
-void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t * descriptor) {
+void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t *descriptor) {
         //base size
         size_t size = 7;
         //variable size according to port count
-        size_t var_size = (descriptor->ports_count+7)/8;
+        size_t var_size = (descriptor->ports_count + 7) / 8;
         size += 2 * var_size;
         uint8_t * result = malloc(size);
         //size
-        if(result)
-                usb_serialize_hub_descriptor(descriptor,result);
+        if (result)
+                usb_serialize_hub_descriptor(descriptor, result);
         return result;
 }
@@ -82 +82 @@
  * @param serialized_descriptor
  */
-void usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor,
+void usb_serialize_hub_descriptor(usb_hub_descriptor_t *descriptor,
     void * serialized_descriptor) {
         //base size
@@ -88 +88 @@
         size_t size = 7;
         //variable size according to port count
-        size_t var_size = (descriptor->ports_count+7)/8;
+        size_t var_size = (descriptor->ports_count + 7) / 8;
         size += 2 * var_size;
         //size
@@ -110 +110 @@
 }
 
-
 /**
  * create deserialized desriptor structure out of serialized descriptor
@@ -121 +120 @@
  */
 usb_hub_descriptor_t * usb_create_deserialized_hub_desriptor(
-void * serialized_descriptor) {
+    void *serialized_descriptor) {
         uint8_t * sdescriptor = serialized_descriptor;
 
@@ -130 +129 @@
         }
 
-        usb_hub_descriptor_t * result = malloc(sizeof(usb_hub_descriptor_t));
-        if(result)
-                usb_deserialize_hub_desriptor(serialized_descriptor,result);
+        usb_hub_descriptor_t * result = malloc(sizeof (usb_hub_descriptor_t));
+        if (result)
+                usb_deserialize_hub_desriptor(serialized_descriptor, result);
         return result;
 }
@@ -144 +143 @@
  */
 void usb_deserialize_hub_desriptor(
-void * serialized_descriptor, usb_hub_descriptor_t * descriptor) {
+    void * serialized_descriptor, usb_hub_descriptor_t *descriptor) {
         uint8_t * sdescriptor = serialized_descriptor;
         descriptor->ports_count = sdescriptor[2];
@@ -151 +150 @@
         descriptor->pwr_on_2_good_time = sdescriptor[5];
         descriptor->current_requirement = sdescriptor[6];
-        size_t var_size = (descriptor->ports_count+7) / 8;
+        size_t var_size = (descriptor->ports_count + 7) / 8;
         //descriptor->devices_removable = (uint8_t*) malloc(var_size);