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

Timestamp:

2011-04-10T12:18:09Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

60c0573

Parents:

a49e171 (diff), 82e8861 (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

File:

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

uspace/drv/usbhub/utils.c

@@ -60 +60 @@
         size_t size = 7;
         //variable size according to port count
-        size_t var_size = descriptor->ports_count / 8 + ((descriptor->ports_count % 8 > 0) ? 1 : 0);
+        size_t var_size = (descriptor->ports_count+7)/8;
         size += 2 * var_size;
-        uint8_t * result = (uint8_t*) malloc(size);
+        uint8_t * result = malloc(size);
         //size
         result[0] = size;
@@ -84 +84 @@
 }
 
-usb_hub_descriptor_t * usb_deserialize_hub_desriptor(void * serialized_descriptor) {
-        uint8_t * sdescriptor = (uint8_t*) serialized_descriptor;
+usb_hub_descriptor_t * usb_deserialize_hub_desriptor(
+void * serialized_descriptor) {
+        uint8_t * sdescriptor = serialized_descriptor;
 
         if (sdescriptor[1] != USB_DESCTYPE_HUB) {
-                usb_log_warning("trying to deserialize wrong descriptor %x\n",sdescriptor[1]);
+                usb_log_warning("trying to deserialize wrong descriptor %x\n",
+                    sdescriptor[1]);
                 return NULL;
         }
 
-        usb_hub_descriptor_t * result = usb_new(usb_hub_descriptor_t);
+        usb_hub_descriptor_t * result = malloc(sizeof(usb_hub_descriptor_t));
         
 
@@ -100 +102 @@
         result->pwr_on_2_good_time = sdescriptor[5];
         result->current_requirement = sdescriptor[6];
-        size_t var_size = result->ports_count / 8 + ((result->ports_count % 8 > 0)
-                        ? 1 : 0);
+        size_t var_size = (result->ports_count+7) / 8;
         result->devices_removable = (uint8_t*) malloc(var_size);