Changes in uspace/drv/bus/usb/usbmast/main.c [920d0fc:3cc55b47] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbmast/main.c
r920d0fc r3cc55b47 52 52 #define NAME "usbmast" 53 53 54 #define GET_BULK_IN(dev) ((dev)->pipes[BULK_IN_EP].pipe)55 #define GET_BULK_OUT(dev) ((dev)->pipes[BULK_OUT_EP].pipe)56 57 54 static const usb_endpoint_description_t bulk_in_ep = { 58 55 .transfer_type = USB_TRANSFER_BULK, … … 110 107 static int usbmast_device_gone(usb_device_t *dev) 111 108 { 112 usbmast_dev_t *mdev = dev->driver_data;109 usbmast_dev_t *mdev = usb_device_data_get(dev); 113 110 assert(mdev); 114 111 … … 150 147 unsigned i; 151 148 149 usb_endpoint_mapping_t *epm_in = 150 usb_device_get_mapped_ep_desc(dev, &bulk_in_ep); 151 usb_endpoint_mapping_t *epm_out = 152 usb_device_get_mapped_ep_desc(dev, &bulk_out_ep); 153 if (!epm_in || !epm_out || !epm_in->present || !epm_out->present) { 154 usb_log_error("Required EPs were not mapped.\n"); 155 return ENOENT; 156 } 157 152 158 /* Allocate softstate */ 153 159 mdev = usb_device_data_alloc(dev, sizeof(usbmast_dev_t)); … … 157 163 } 158 164 159 mdev->ddf_dev = dev->ddf_dev;160 165 mdev->usb_dev = dev; 161 166 162 usb_log_info("Initializing mass storage `%s'.\n", ddf_dev_get_name(dev->ddf_dev)); 167 usb_log_info("Initializing mass storage `%s'.\n", 168 usb_device_get_name(dev)); 163 169 usb_log_debug("Bulk in endpoint: %d [%zuB].\n", 164 dev->pipes[BULK_IN_EP].pipe.endpoint_no, 165 dev->pipes[BULK_IN_EP].pipe.max_packet_size); 170 epm_in->pipe.endpoint_no, epm_in->pipe.max_packet_size); 166 171 usb_log_debug("Bulk out endpoint: %d [%zuB].\n", 167 dev->pipes[BULK_OUT_EP].pipe.endpoint_no, 168 dev->pipes[BULK_OUT_EP].pipe.max_packet_size); 172 epm_out->pipe.endpoint_no, epm_out->pipe.max_packet_size); 169 173 170 174 usb_log_debug("Get LUN count...\n"); … … 177 181 } 178 182 183 mdev->bulk_in_pipe = &epm_in->pipe; 184 mdev->bulk_out_pipe = &epm_out->pipe; 179 185 for (i = 0; i < mdev->lun_count; i++) { 180 186 rc = usbmast_fun_create(mdev, i); … … 221 227 } 222 228 223 fun = ddf_fun_create(mdev->ddf_dev, fun_exposed, fun_name);229 fun = usb_device_ddf_fun_create(mdev->usb_dev, fun_exposed, fun_name); 224 230 if (fun == NULL) { 225 231 usb_log_error("Failed to create DDF function %s.\n", fun_name); … … 252 258 if (rc != EOK) { 253 259 usb_log_warning("Failed to inquire device `%s': %s.\n", 254 ddf_dev_get_name(mdev->ddf_dev), str_error(rc));260 usb_device_get_name(mdev->usb_dev), str_error(rc)); 255 261 rc = EIO; 256 262 goto error; … … 259 265 usb_log_info("Mass storage `%s' LUN %u: " \ 260 266 "%s by %s rev. %s is %s (%s).\n", 261 ddf_dev_get_name(mdev->ddf_dev),267 usb_device_get_name(mdev->usb_dev), 262 268 lun, 263 269 inquiry.product, … … 272 278 if (rc != EOK) { 273 279 usb_log_warning("Failed to read capacity, device `%s': %s.\n", 274 ddf_dev_get_name(mdev->ddf_dev), str_error(rc));280 usb_device_get_name(mdev->usb_dev), str_error(rc)); 275 281 rc = EIO; 276 282 goto error;
Note:
See TracChangeset
for help on using the changeset viewer.