Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The scsi_periph module is now nice to Ingo: B_GET_MEDIA_STATUS now returns

Browse Source 
B_OK in case the device is not removable; IOW we always have the medium, dude.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9622 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-10-28 19:08:40 +00:00
parent 232b61f7be
commit 4a5d9e3246
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/add-ons/kernel/generic/scsi_periph/io.c
View File

@ -1,6 +1,6 @@
/* /*
** Copyright 2002/03, Thomas Kurschel. All rights reserved. ** Copyright 2002/03, Thomas Kurschel. All rights reserved.
** Distributed under the terms of the OpenBeOS License. ** Distributed under the terms of the Haiku License.
*/ */
/* /*
@ -258,7 +258,7 @@ raw_command(scsi_periph_device_info *device, raw_device_command *cmd)
if ((request->subsys_status & SCSI_AUTOSNS_VALID) != 0 && cmd->sense_data) { if ((request->subsys_status & SCSI_AUTOSNS_VALID) != 0 && cmd->sense_data) {
memcpy(cmd->sense_data, request->sense, memcpy(cmd->sense_data, request->sense,
min(cmd->sense_data_length, SCSI_MAX_SENSE_SIZE - request->sense_resid)); min(cmd->sense_data_length, (size_t)SCSI_MAX_SENSE_SIZE - request->sense_resid));
} }
if ((cmd->flags & B_RAW_DEVICE_REPORT_RESIDUAL) != 0) { if ((cmd->flags & B_RAW_DEVICE_REPORT_RESIDUAL) != 0) {
@ -276,31 +276,29 @@ raw_command(scsi_periph_device_info *device, raw_device_command *cmd)
status_t status_t
periph_ioctl(scsi_periph_handle_info *handle, int op, void *buf, size_t len) periph_ioctl(scsi_periph_handle_info *handle, int op, void *buffer, size_t length)
{ {
switch (op) { switch (op) {
case B_GET_MEDIA_STATUS: { case B_GET_MEDIA_STATUS: {
status_t res; status_t res = B_OK;
if (!handle->device->removable)
return B_BAD_VALUE;
if (handle->device->removable)
res = periph_get_media_status(handle); res = periph_get_media_status(handle);
SHOW_FLOW(2, "%s", strerror(res)); SHOW_FLOW(2, "%s", strerror(res));
*(status_t *)buf = res; *(status_t *)buffer = res;
return B_OK; return B_OK;
} }
case B_SCSI_INQUIRY: case B_SCSI_INQUIRY:
return inquiry(handle->device, (scsi_inquiry *)buf); return inquiry(handle->device, (scsi_inquiry *)buffer);
case B_SCSI_PREVENT_ALLOW: case B_SCSI_PREVENT_ALLOW:
return prevent_allow(handle->device, *(bool *)buf); return prevent_allow(handle->device, *(bool *)buffer);
case B_RAW_DEVICE_COMMAND: case B_RAW_DEVICE_COMMAND:
return raw_command(handle->device, buf); return raw_command(handle->device, buffer);
default: default:
SHOW_ERROR(4, "Unknown ioctl: %x", op); SHOW_ERROR(4, "Unknown ioctl: %x", op);