Changes in uspace/drv/bus/usb/usbmast/main.c [faba839:721d4b6e] in mainline

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (7 diffs)

uspace/drv/bus/usb/usbmast/main.c

@@ -55 +55 @@
 #define GET_BULK_OUT(dev) ((dev)->pipes[BULK_OUT_EP].pipe)
 
-static const usb_endpoint_description_t bulk_in_ep = {
+static usb_endpoint_description_t bulk_in_ep = {
         .transfer_type = USB_TRANSFER_BULK,
         .direction = USB_DIRECTION_IN,
@@ -63 +63 @@
         .flags = 0
 };
-static const usb_endpoint_description_t bulk_out_ep = {
+static usb_endpoint_description_t bulk_out_ep = {
         .transfer_type = USB_TRANSFER_BULK,
         .direction = USB_DIRECTION_OUT,
@@ -72 +72 @@
 };
 
-static const usb_endpoint_description_t *mast_endpoints[] = {
+usb_endpoint_description_t *mast_endpoints[] = {
         &bulk_in_ep,
         &bulk_out_ep,
@@ -106 +106 @@
 }
 
-/** Callback when a device is about to be removed.
- *
- * @param dev Representation of USB device.
- * @return Error code.
- */
-static int usbmast_device_remove(usb_device_t *dev)
-{
-        //TODO: flush buffers, or whatever.
-        //TODO: remove device
-        return ENOTSUP;
-}
-
 /** Callback when new device is attached and recognized as a mass storage.
  *
- * @param dev Representation of USB device.
+ * @param dev Representation of a the USB device.
  * @return Error code.
  */
@@ -140 +128 @@
 
         usb_log_info("Initializing mass storage `%s'.\n", dev->ddf_dev->name);
-        usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_IN_EP].pipe.endpoint_no,
-            dev->pipes[BULK_IN_EP].pipe.max_packet_size);
+        usb_log_debug(" Bulk in endpoint: %d [%zuB].\n",
+            dev->pipes[BULK_IN_EP].pipe->endpoint_no,
+            (size_t) dev->pipes[BULK_IN_EP].descriptor->max_packet_size);
         usb_log_debug("Bulk out endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_OUT_EP].pipe.endpoint_no,
-            dev->pipes[BULK_OUT_EP].pipe.max_packet_size);
+            dev->pipes[BULK_OUT_EP].pipe->endpoint_no,
+            (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size);
 
         usb_log_debug("Get LUN count...\n");
@@ -300 +288 @@
                 return;
         }
-        
-        (void) async_share_out_finalize(callid, &comm_buf);
-        if (comm_buf == AS_MAP_FAILED) {
+
+        comm_buf = as_get_mappable_page(comm_size);
+        if (comm_buf == NULL) {
                 async_answer_0(callid, EHANGUP);
                 return;
         }
-        
+
+        (void) async_share_out_finalize(callid, comm_buf);
+
         mfun = (usbmast_fun_t *) ((ddf_fun_t *)arg)->driver_data;
 
@@ -346 +336 @@
 
 /** USB mass storage driver ops. */
-static const usb_driver_ops_t usbmast_driver_ops = {
+static usb_driver_ops_t usbmast_driver_ops = {
         .device_add = usbmast_device_add,
-        .device_rem = usbmast_device_remove,
         .device_gone = usbmast_device_gone,
 };
 
 /** USB mass storage driver. */
-static const usb_driver_t usbmast_driver = {
+static usb_driver_t usbmast_driver = {
         .name = NAME,
         .ops = &usbmast_driver_ops,