keucr: moved function to other file
Function usb_stor_print_cmd was declared in init.c but only used in transport.c. So it was reasonable to move it there and declare it static Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6fbb90bf28
commit
eecb3c07e7
|
@ -322,54 +322,3 @@ int ENE_Write_Data(struct us_data *us, void *buf, unsigned int length)
|
||||||
return USB_STOR_TRANSPORT_GOOD;
|
return USB_STOR_TRANSPORT_GOOD;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* usb_stor_print_cmd():
|
|
||||||
*/
|
|
||||||
void usb_stor_print_cmd(struct us_data *us,struct scsi_cmnd *srb)
|
|
||||||
{
|
|
||||||
PBYTE Cdb = srb->cmnd;
|
|
||||||
DWORD cmd = Cdb[0];
|
|
||||||
DWORD bn = ((Cdb[2] << 24) & 0xff000000) |
|
|
||||||
((Cdb[3] << 16) & 0x00ff0000) |
|
|
||||||
((Cdb[4] << 8) & 0x0000ff00) |
|
|
||||||
((Cdb[5] << 0) & 0x000000ff);
|
|
||||||
WORD blen = ((Cdb[7] << 8) & 0xff00) | ((Cdb[8] << 0) & 0x00ff);
|
|
||||||
|
|
||||||
switch (cmd) {
|
|
||||||
case TEST_UNIT_READY:
|
|
||||||
/* dev_dbg(
|
|
||||||
&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_TEST_UNIT_READY\n", cmd); */
|
|
||||||
break;
|
|
||||||
case INQUIRY:
|
|
||||||
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
|
|
||||||
break;
|
|
||||||
case MODE_SENSE:
|
|
||||||
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
|
|
||||||
break;
|
|
||||||
case START_STOP:
|
|
||||||
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
|
|
||||||
break;
|
|
||||||
case READ_CAPACITY:
|
|
||||||
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
|
|
||||||
break;
|
|
||||||
case READ_10:
|
|
||||||
/* dev_dbg(
|
|
||||||
&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
|
|
||||||
,cmd, bn, blen); */
|
|
||||||
break;
|
|
||||||
case WRITE_10:
|
|
||||||
/* dev_dbg(
|
|
||||||
&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_WRITE,
|
|
||||||
bn = %X, blen = %X\n" , cmd, bn, blen); */
|
|
||||||
break;
|
|
||||||
case ALLOW_MEDIUM_REMOVAL:
|
|
||||||
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- Other cmd\n", cmd);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
bn = 0;
|
|
||||||
blen = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -78,6 +78,56 @@ static int usb_stor_msg_common(struct us_data *us, int timeout)
|
||||||
return us->current_urb->status;
|
return us->current_urb->status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* usb_stor_print_cmd():
|
||||||
|
*/
|
||||||
|
static void usb_stor_print_cmd(struct us_data *us, struct scsi_cmnd *srb)
|
||||||
|
{
|
||||||
|
PBYTE Cdb = srb->cmnd;
|
||||||
|
DWORD cmd = Cdb[0];
|
||||||
|
DWORD bn = ((Cdb[2] << 24) & 0xff000000) |
|
||||||
|
((Cdb[3] << 16) & 0x00ff0000) |
|
||||||
|
((Cdb[4] << 8) & 0x0000ff00) |
|
||||||
|
((Cdb[5] << 0) & 0x000000ff);
|
||||||
|
WORD blen = ((Cdb[7] << 8) & 0xff00) | ((Cdb[8] << 0) & 0x00ff);
|
||||||
|
|
||||||
|
switch (cmd) {
|
||||||
|
case TEST_UNIT_READY:
|
||||||
|
/* dev_dbg(
|
||||||
|
&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_TEST_UNIT_READY\n", cmd); */
|
||||||
|
break;
|
||||||
|
case INQUIRY:
|
||||||
|
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
|
||||||
|
break;
|
||||||
|
case MODE_SENSE:
|
||||||
|
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
|
||||||
|
break;
|
||||||
|
case START_STOP:
|
||||||
|
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
|
||||||
|
break;
|
||||||
|
case READ_CAPACITY:
|
||||||
|
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
|
||||||
|
break;
|
||||||
|
case READ_10:
|
||||||
|
/* dev_dbg(
|
||||||
|
&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
|
||||||
|
cmd, bn, blen); */
|
||||||
|
break;
|
||||||
|
case WRITE_10:
|
||||||
|
/* dev_dbg(
|
||||||
|
&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_WRITE,
|
||||||
|
bn = %X, blen = %X\n" , cmd, bn, blen); */
|
||||||
|
break;
|
||||||
|
case ALLOW_MEDIUM_REMOVAL:
|
||||||
|
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- Other cmd\n", cmd);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
bn = 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* usb_stor_control_msg()
|
* usb_stor_control_msg()
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
extern int usb_stor_Bulk_transport(struct scsi_cmnd *, struct us_data*);
|
extern int usb_stor_Bulk_transport(struct scsi_cmnd *, struct us_data*);
|
||||||
extern int usb_stor_Bulk_max_lun(struct us_data *);
|
extern int usb_stor_Bulk_max_lun(struct us_data *);
|
||||||
extern int usb_stor_Bulk_reset(struct us_data *);
|
extern int usb_stor_Bulk_reset(struct us_data *);
|
||||||
extern void usb_stor_print_cmd(struct us_data *, struct scsi_cmnd *);
|
|
||||||
extern void usb_stor_invoke_transport(struct scsi_cmnd *, struct us_data*);
|
extern void usb_stor_invoke_transport(struct scsi_cmnd *, struct us_data*);
|
||||||
extern void usb_stor_stop_transport(struct us_data *);
|
extern void usb_stor_stop_transport(struct us_data *);
|
||||||
extern int usb_stor_control_msg(struct us_data *us, unsigned int pipe,
|
extern int usb_stor_control_msg(struct us_data *us, unsigned int pipe,
|
||||||
|
|
Loading…
Reference in New Issue