Changeset c2245a3 in mainline for uspace/drv/bus/usb/usbmast/main.c


Ignore:
Timestamp:
2011-11-10T20:03:48Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
fa76f81
Parents:
27ca3a3 (diff), 747ef72 (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/usbmast/main.c

    r27ca3a3 rc2245a3  
    114114{
    115115        //TODO: flush buffers, or whatever.
     116        //TODO: remove device
    116117        return ENOTSUP;
    117118}
     
    139140
    140141        usb_log_info("Initializing mass storage `%s'.\n", dev->ddf_dev->name);
    141         usb_log_debug(" Bulk in endpoint: %d [%zuB].\n",
    142             dev->pipes[BULK_IN_EP].pipe->endpoint_no,
    143             (size_t) dev->pipes[BULK_IN_EP].descriptor->max_packet_size);
     142        usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
     143            dev->pipes[BULK_IN_EP].pipe.endpoint_no,
     144            dev->pipes[BULK_IN_EP].pipe.max_packet_size);
    144145        usb_log_debug("Bulk out endpoint: %d [%zuB].\n",
    145             dev->pipes[BULK_OUT_EP].pipe->endpoint_no,
    146             (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size);
     146            dev->pipes[BULK_OUT_EP].pipe.endpoint_no,
     147            dev->pipes[BULK_OUT_EP].pipe.max_packet_size);
    147148
    148149        usb_log_debug("Get LUN count...\n");
Note: See TracChangeset for help on using the changeset viewer.