]> err.no Git - linux-2.6/commitdiff
firewire: fw-sbp2: set command set related device flags
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 23 Jan 2007 20:20:08 +0000 (21:20 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Fri, 9 Mar 2007 21:02:44 +0000 (22:02 +0100)
Copied from sbp2:
  - enable spin-up by START STOP UNIT for all devices
  - enable INQUIRY (36) workaround on demand
  - prefer READ/ WRITE (10) over (6) for all devices
  - prefer MODE SENSE (10) for MMC devices

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
drivers/firewire/fw-sbp2.c

index 4e42b73f1e3eac7376d876a9d98d854a21cbd1fa..54cad3a5dfb8bc620191e300247155f1da8d6a36 100644 (file)
@@ -968,11 +968,27 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
        return 0;
 }
 
+static int sbp2_scsi_slave_alloc(struct scsi_device *sdev)
+{
+       struct fw_unit *unit = (struct fw_unit *)sdev->host->hostdata[0];
+       struct sbp2_device *sd = unit->device.driver_data;
+
+       sdev->allow_restart = 1;
+
+       if (sd->workarounds & SBP2_WORKAROUND_INQUIRY_36)
+               sdev->inquiry_len = 36;
+       return 0;
+}
+
 static int sbp2_scsi_slave_configure(struct scsi_device *sdev)
 {
        struct fw_unit *unit = (struct fw_unit *)sdev->host->hostdata[0];
        struct sbp2_device *sd = unit->device.driver_data;
 
+       sdev->use_10_for_rw = 1;
+
+       if (sdev->type == TYPE_ROM)
+               sdev->use_10_for_ms = 1;
        if (sdev->type == TYPE_DISK &&
            sd->workarounds & SBP2_WORKAROUND_MODE_SENSE_8)
                sdev->skip_ms_page_8 = 1;
@@ -1004,6 +1020,7 @@ static struct scsi_host_template scsi_driver_template = {
        .name                   = "SBP-2 IEEE-1394",
        .proc_name              = (char *)sbp2_driver_name,
        .queuecommand           = sbp2_scsi_queuecommand,
+       .slave_alloc            = sbp2_scsi_slave_alloc,
        .slave_configure        = sbp2_scsi_slave_configure,
        .eh_abort_handler       = sbp2_scsi_abort,
        .this_id                = -1,