Changes in uspace/drv/block/usbmast/scsi_ms.c [b7fd2a0:f5718c79] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/block/usbmast/scsi_ms.c
rb7fd2a0 rf5718c79 116 116 rc = usb_massstor_unit_ready(mfun); 117 117 if (rc != EOK) { 118 usb_log_error("Inquiry transport failed, device %s: %s. \n",118 usb_log_error("Inquiry transport failed, device %s: %s.", 119 119 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc)); 120 120 return rc; … … 123 123 rc = usb_massstor_cmd(mfun, 0xDEADBEEF, cmd); 124 124 if (rc != EOK) { 125 usb_log_error("Inquiry transport failed, device %s: %s. \n",125 usb_log_error("Inquiry transport failed, device %s: %s.", 126 126 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc)); 127 127 return rc; … … 131 131 return EOK; 132 132 133 usb_log_error("SCSI command failed, device %s. \n",133 usb_log_error("SCSI command failed, device %s.", 134 134 usb_device_get_name(mfun->mdev->usb_dev)); 135 135 136 136 rc = usbmast_request_sense(mfun, &sense_buf, sizeof(sense_buf)); 137 137 if (rc != EOK) { 138 usb_log_error("Failed to read sense data. \n");138 usb_log_error("Failed to read sense data."); 139 139 return EIO; 140 140 } … … 182 182 183 183 if (rc != EOK) { 184 usb_log_error("Inquiry transport failed, device %s: %s. \n",184 usb_log_error("Inquiry transport failed, device %s: %s.", 185 185 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc)); 186 186 return rc; … … 188 188 189 189 if (cmd.status != CMDS_GOOD) { 190 usb_log_error("Inquiry command failed, device %s. \n",190 usb_log_error("Inquiry command failed, device %s.", 191 191 usb_device_get_name(mfun->mdev->usb_dev)); 192 192 return EIO; … … 194 194 195 195 if (cmd.rcvd_size < SCSI_STD_INQUIRY_DATA_MIN_SIZE) { 196 usb_log_error("SCSI Inquiry response too short (%zu). \n",196 usb_log_error("SCSI Inquiry response too short (%zu).", 197 197 cmd.rcvd_size); 198 198 return EIO; … … 250 250 251 251 if (rc != EOK || cmd.status != CMDS_GOOD) { 252 usb_log_error("Request Sense failed, device %s: %s. \n",252 usb_log_error("Request Sense failed, device %s: %s.", 253 253 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc)); 254 254 return rc; … … 291 291 rc = usbmast_run_cmd(mfun, &cmd); 292 292 293 294 usb_log_error("Read Capacity (10) transport failed, device %s: %s. \n",293 if (rc != EOK) { 294 usb_log_error("Read Capacity (10) transport failed, device %s: %s.", 295 295 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc)); 296 296 return rc; … … 298 298 299 299 if (cmd.status != CMDS_GOOD) { 300 usb_log_error("Read Capacity (10) command failed, device %s. \n",300 usb_log_error("Read Capacity (10) command failed, device %s.", 301 301 usb_device_get_name(mfun->mdev->usb_dev)); 302 302 return EIO; … … 304 304 305 305 if (cmd.rcvd_size < sizeof(data)) { 306 usb_log_error("SCSI Read Capacity response too short (%zu). \n",306 usb_log_error("SCSI Read Capacity response too short (%zu).", 307 307 cmd.rcvd_size); 308 308 return EIO; … … 349 349 350 350 if (rc != EOK) { 351 usb_log_error("Read (10) transport failed, device %s: %s. \n",351 usb_log_error("Read (10) transport failed, device %s: %s.", 352 352 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc)); 353 353 return rc; … … 355 355 356 356 if (cmd.status != CMDS_GOOD) { 357 usb_log_error("Read (10) command failed, device %s. \n",357 usb_log_error("Read (10) command failed, device %s.", 358 358 usb_device_get_name(mfun->mdev->usb_dev)); 359 359 return EIO; … … 361 361 362 362 if (cmd.rcvd_size < nblocks * mfun->block_size) { 363 usb_log_error("SCSI Read response too short (%zu). \n",363 usb_log_error("SCSI Read response too short (%zu).", 364 364 cmd.rcvd_size); 365 365 return EIO; … … 405 405 406 406 if (rc != EOK) { 407 usb_log_error("Write (10) transport failed, device %s: %s. \n",407 usb_log_error("Write (10) transport failed, device %s: %s.", 408 408 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc)); 409 409 return rc; … … 411 411 412 412 if (cmd.status != CMDS_GOOD) { 413 usb_log_error("Write (10) command failed, device %s. \n",413 usb_log_error("Write (10) command failed, device %s.", 414 414 usb_device_get_name(mfun->mdev->usb_dev)); 415 415 return EIO; … … 449 449 const errno_t rc = usbmast_run_cmd(mfun, &cmd); 450 450 451 452 usb_log_error("Synchronize Cache (10) transport failed, device %s: %s. \n",451 if (rc != EOK) { 452 usb_log_error("Synchronize Cache (10) transport failed, device %s: %s.", 453 453 usb_device_get_name(mfun->mdev->usb_dev), str_error(rc)); 454 454 return rc; … … 456 456 457 457 if (cmd.status != CMDS_GOOD) { 458 usb_log_error("Synchronize Cache (10) command failed, device %s. \n",458 usb_log_error("Synchronize Cache (10) command failed, device %s.", 459 459 usb_device_get_name(mfun->mdev->usb_dev)); 460 460 return EIO;
Note:
See TracChangeset
for help on using the changeset viewer.