Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/usbhub/utils.c

    r6ab7f3e9 rc1693dae  
    6262 * @return newly created serializd descriptor pointer
    6363 */
    64 void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t *descriptor) {
     64void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t * descriptor) {
    6565        //base size
    6666        size_t size = 7;
    6767        //variable size according to port count
    68         size_t var_size = (descriptor->ports_count + 7) / 8;
     68        size_t var_size = (descriptor->ports_count+7)/8;
    6969        size += 2 * var_size;
    7070        uint8_t * result = malloc(size);
    7171        //size
    72         if (result)
    73                 usb_serialize_hub_descriptor(descriptor, result);
     72        if(result)
     73                usb_serialize_hub_descriptor(descriptor,result);
    7474        return result;
    7575}
     
    8282 * @param serialized_descriptor
    8383 */
    84 void usb_serialize_hub_descriptor(usb_hub_descriptor_t *descriptor,
     84void usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor,
    8585    void * serialized_descriptor) {
    8686        //base size
     
    8888        size_t size = 7;
    8989        //variable size according to port count
    90         size_t var_size = (descriptor->ports_count + 7) / 8;
     90        size_t var_size = (descriptor->ports_count+7)/8;
    9191        size += 2 * var_size;
    9292        //size
     
    110110}
    111111
     112
    112113/**
    113114 * create deserialized desriptor structure out of serialized descriptor
     
    120121 */
    121122usb_hub_descriptor_t * usb_create_deserialized_hub_desriptor(
    122     void *serialized_descriptor) {
     123void * serialized_descriptor) {
    123124        uint8_t * sdescriptor = serialized_descriptor;
    124125
     
    129130        }
    130131
    131         usb_hub_descriptor_t * result = malloc(sizeof (usb_hub_descriptor_t));
    132         if (result)
    133                 usb_deserialize_hub_desriptor(serialized_descriptor, result);
     132        usb_hub_descriptor_t * result = malloc(sizeof(usb_hub_descriptor_t));
     133        if(result)
     134                usb_deserialize_hub_desriptor(serialized_descriptor,result);
    134135        return result;
    135136}
     
    143144 */
    144145void usb_deserialize_hub_desriptor(
    145     void * serialized_descriptor, usb_hub_descriptor_t *descriptor) {
     146void * serialized_descriptor, usb_hub_descriptor_t * descriptor) {
    146147        uint8_t * sdescriptor = serialized_descriptor;
    147148        descriptor->ports_count = sdescriptor[2];
     
    150151        descriptor->pwr_on_2_good_time = sdescriptor[5];
    151152        descriptor->current_requirement = sdescriptor[6];
    152         size_t var_size = (descriptor->ports_count + 7) / 8;
     153        size_t var_size = (descriptor->ports_count+7) / 8;
    153154        //descriptor->devices_removable = (uint8_t*) malloc(var_size);
    154155
Note: See TracChangeset for help on using the changeset viewer.