Changes in uspace/drv/bus/usb/usbmast/scsi_ms.c [83062ff:dd8b6a8] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbmast/scsi_ms.c
r83062ff rdd8b6a8 88 88 if (rc != EOK) { 89 89 usb_log_error("Inquiry transport failed, device %s: %s.\n", 90 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));90 ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc)); 91 91 return rc; 92 92 } … … 96 96 97 97 usb_log_error("SCSI command failed, device %s.\n", 98 usb_device_get_name(mfun->mdev->usb_dev));98 ddf_dev_get_name(mfun->mdev->ddf_dev)); 99 99 100 100 rc = usbmast_request_sense(mfun, &sense_buf, sizeof(sense_buf)); … … 147 147 if (rc != EOK) { 148 148 usb_log_error("Inquiry transport failed, device %s: %s.\n", 149 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));149 ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc)); 150 150 return rc; 151 151 } … … 153 153 if (cmd.status != CMDS_GOOD) { 154 154 usb_log_error("Inquiry command failed, device %s.\n", 155 usb_device_get_name(mfun->mdev->usb_dev));155 ddf_dev_get_name(mfun->mdev->ddf_dev)); 156 156 return EIO; 157 157 } … … 215 215 if (rc != EOK || cmd.status != CMDS_GOOD) { 216 216 usb_log_error("Request Sense failed, device %s: %s.\n", 217 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));217 ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc)); 218 218 return rc; 219 219 } … … 257 257 if (rc != EOK) { 258 258 usb_log_error("Read Capacity (10) transport failed, device %s: %s.\n", 259 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));259 ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc)); 260 260 return rc; 261 261 } … … 263 263 if (cmd.status != CMDS_GOOD) { 264 264 usb_log_error("Read Capacity (10) command failed, device %s.\n", 265 usb_device_get_name(mfun->mdev->usb_dev));265 ddf_dev_get_name(mfun->mdev->ddf_dev)); 266 266 return EIO; 267 267 } … … 314 314 if (rc != EOK) { 315 315 usb_log_error("Read (10) transport failed, device %s: %s.\n", 316 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));316 ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc)); 317 317 return rc; 318 318 } … … 320 320 if (cmd.status != CMDS_GOOD) { 321 321 usb_log_error("Read (10) command failed, device %s.\n", 322 usb_device_get_name(mfun->mdev->usb_dev));322 ddf_dev_get_name(mfun->mdev->ddf_dev)); 323 323 return EIO; 324 324 } … … 370 370 if (rc != EOK) { 371 371 usb_log_error("Write (10) transport failed, device %s: %s.\n", 372 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));372 ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc)); 373 373 return rc; 374 374 } … … 376 376 if (cmd.status != CMDS_GOOD) { 377 377 usb_log_error("Write (10) command failed, device %s.\n", 378 usb_device_get_name(mfun->mdev->usb_dev));378 ddf_dev_get_name(mfun->mdev->ddf_dev)); 379 379 return EIO; 380 380 } … … 394 394 int usbmast_sync_cache(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks) 395 395 { 396 scsi_cmd_t cmd; 397 scsi_cdb_sync_cache_10_t cdb; 398 int rc; 399 396 400 if (ba > UINT32_MAX) 397 401 return ELIMIT; … … 400 404 return ELIMIT; 401 405 402 const scsi_cdb_sync_cache_10_t cdb = { 403 .op_code = SCSI_CMD_SYNC_CACHE_10, 404 .lba = host2uint32_t_be(ba), 405 .numlb = host2uint16_t_be(nblocks), 406 }; 407 408 scsi_cmd_t cmd = { 409 .cdb = &cdb, 410 .cdb_size = sizeof(cdb), 411 }; 412 413 const int rc = usbmast_run_cmd(mfun, &cmd); 406 memset(&cdb, 0, sizeof(cdb)); 407 cdb.op_code = SCSI_CMD_SYNC_CACHE_10; 408 cdb.lba = host2uint32_t_be(ba); 409 cdb.numlb = host2uint16_t_be(nblocks); 410 411 memset(&cmd, 0, sizeof(cmd)); 412 cmd.cdb = &cdb; 413 cmd.cdb_size = sizeof(cdb); 414 415 rc = usbmast_run_cmd(mfun, &cmd); 414 416 415 417 if (rc != EOK) { 416 418 usb_log_error("Synchronize Cache (10) transport failed, device %s: %s.\n", 417 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));419 ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc)); 418 420 return rc; 419 421 } … … 421 423 if (cmd.status != CMDS_GOOD) { 422 424 usb_log_error("Synchronize Cache (10) command failed, device %s.\n", 423 usb_device_get_name(mfun->mdev->usb_dev));425 ddf_dev_get_name(mfun->mdev->ddf_dev)); 424 426 return EIO; 425 427 }
Note:
See TracChangeset
for help on using the changeset viewer.