Skip to content

Commit

Permalink
USB: usb-storage: merge ATAPI and QIC-157 protocol routines
Browse files Browse the repository at this point in the history 
This patch (as1174) merges usb-storage's QIC-157 and ATAPI protocol
routines.  Since the two functions are identical, there's no reason to
keep them separate.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Jan 7, 2009
1 parent 64648a9 commit 3dae534
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 27 deletions.
24 changes: 2 additions & 22 deletions drivers/usb/storage/protocol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
* Protocol routines
***********************************************************************/

void usb_stor_qic157_command(struct scsi_cmnd *srb, struct us_data *us)
void usb_stor_pad12_command(struct scsi_cmnd *srb, struct us_data *us)
{
/* Pad the ATAPI command with zeros
/* Pad the SCSI command with zeros out to 12 bytes
*
* NOTE: This only works because a scsi_cmnd struct field contains
* a unsigned char cmnd[16], so we know we have storage available
Expand All @@ -73,26 +73,6 @@ void usb_stor_qic157_command(struct scsi_cmnd *srb, struct us_data *us)
usb_stor_invoke_transport(srb, us);
}

void usb_stor_ATAPI_command(struct scsi_cmnd *srb, struct us_data *us)
{
/* Pad the ATAPI command with zeros
*
* NOTE: This only works because a scsi_cmnd struct field contains
* a unsigned char cmnd[16], so we know we have storage available
*/

/* Pad the ATAPI command with zeros */
for (; srb->cmd_len<12; srb->cmd_len++)
srb->cmnd[srb->cmd_len] = 0;

/* set command length to 12 bytes */
srb->cmd_len = 12;

/* send the command to the transport layer */
usb_stor_invoke_transport(srb, us);
}


void usb_stor_ufi_command(struct scsi_cmnd *srb, struct us_data *us)
{
/* fix some commands -- this is a form of mode translation
Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/storage/protocol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
#define _PROTOCOL_H_

/* Protocol handling routines */
extern void usb_stor_ATAPI_command(struct scsi_cmnd*, struct us_data*);
extern void usb_stor_qic157_command(struct scsi_cmnd*, struct us_data*);
extern void usb_stor_pad12_command(struct scsi_cmnd*, struct us_data*);
extern void usb_stor_ufi_command(struct scsi_cmnd*, struct us_data*);
extern void usb_stor_transparent_scsi_command(struct scsi_cmnd*,
struct us_data*);
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/storage/usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,19 +704,19 @@ static int get_protocol(struct us_data *us)

case US_SC_8020:
us->protocol_name = "8020i";
us->proto_handler = usb_stor_ATAPI_command;
us->proto_handler = usb_stor_pad12_command;
us->max_lun = 0;
break;

case US_SC_QIC:
us->protocol_name = "QIC-157";
us->proto_handler = usb_stor_qic157_command;
us->proto_handler = usb_stor_pad12_command;
us->max_lun = 0;
break;

case US_SC_8070:
us->protocol_name = "8070i";
us->proto_handler = usb_stor_ATAPI_command;
us->proto_handler = usb_stor_pad12_command;
us->max_lun = 0;
break;

Expand Down

0 comments on commit 3dae534

Please sign in to comment.