Changes in uspace/drv/bus/usb/usbmast/main.c [920d0fc:3e23316] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbmast/main.c
r920d0fc r3e23316 110 110 static int usbmast_device_gone(usb_device_t *dev) 111 111 { 112 usbmast_dev_t *mdev = dev->driver_data;112 usbmast_dev_t *mdev = usb_device_data_get(dev); 113 113 assert(mdev); 114 114 … … 150 150 unsigned i; 151 151 152 usb_endpoint_mapping_t *epm_in = 153 usb_device_get_mapped_ep_desc(dev, &bulk_in_ep); 154 usb_endpoint_mapping_t *epm_out = 155 usb_device_get_mapped_ep_desc(dev, &bulk_out_ep); 156 if (!epm_in || !epm_out || !epm_in->present || !epm_out->present) { 157 usb_log_error("Required EPs were not mapped.\n"); 158 return ENOENT; 159 } 160 152 161 /* Allocate softstate */ 153 162 mdev = usb_device_data_alloc(dev, sizeof(usbmast_dev_t)); … … 157 166 } 158 167 159 mdev->ddf_dev = dev->ddf_dev;160 168 mdev->usb_dev = dev; 161 169 162 usb_log_info("Initializing mass storage `%s'.\n", ddf_dev_get_name(dev->ddf_dev)); 170 usb_log_info("Initializing mass storage `%s'.\n", 171 usb_device_get_name(dev)); 163 172 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); 173 epm_in->pipe.endpoint_no, epm_in->pipe.max_packet_size); 166 174 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); 175 epm_out->pipe.endpoint_no, epm_out->pipe.max_packet_size); 169 176 170 177 usb_log_debug("Get LUN count...\n"); … … 182 189 goto error; 183 190 } 191 mdev->bulk_in_pipe = &epm_in->pipe; 192 mdev->bulk_out_pipe = &epm_out->pipe; 184 193 185 194 return EOK; … … 221 230 } 222 231 223 fun = ddf_fun_create(mdev->ddf_dev, fun_exposed, fun_name);232 fun = usb_device_ddf_fun_create(mdev->usb_dev, fun_exposed, fun_name); 224 233 if (fun == NULL) { 225 234 usb_log_error("Failed to create DDF function %s.\n", fun_name); … … 252 261 if (rc != EOK) { 253 262 usb_log_warning("Failed to inquire device `%s': %s.\n", 254 ddf_dev_get_name(mdev->ddf_dev), str_error(rc));263 usb_device_get_name(mdev->usb_dev), str_error(rc)); 255 264 rc = EIO; 256 265 goto error; … … 259 268 usb_log_info("Mass storage `%s' LUN %u: " \ 260 269 "%s by %s rev. %s is %s (%s).\n", 261 ddf_dev_get_name(mdev->ddf_dev),270 usb_device_get_name(mdev->usb_dev), 262 271 lun, 263 272 inquiry.product, … … 272 281 if (rc != EOK) { 273 282 usb_log_warning("Failed to read capacity, device `%s': %s.\n", 274 ddf_dev_get_name(mdev->ddf_dev), str_error(rc));283 usb_device_get_name(mdev->usb_dev), str_error(rc)); 275 284 rc = EIO; 276 285 goto error;
Note:
See TracChangeset
for help on using the changeset viewer.