diff options
-rw-r--r-- | drivers/staging/keucr/msscsi.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/drivers/staging/keucr/msscsi.c b/drivers/staging/keucr/msscsi.c index cb92d25acee..d1a919b8823 100644 --- a/drivers/staging/keucr/msscsi.c +++ b/drivers/staging/keucr/msscsi.c | |||
@@ -1,3 +1,5 @@ | |||
1 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
2 | |||
1 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
2 | #include <linux/errno.h> | 4 | #include <linux/errno.h> |
3 | #include <linux/slab.h> | 5 | #include <linux/slab.h> |
@@ -44,7 +46,7 @@ int MS_SCSIIrp(struct us_data *us, struct scsi_cmnd *srb) | |||
44 | //----- MS_SCSI_Test_Unit_Ready() -------------------------------------------------- | 46 | //----- MS_SCSI_Test_Unit_Ready() -------------------------------------------------- |
45 | int MS_SCSI_Test_Unit_Ready(struct us_data *us, struct scsi_cmnd *srb) | 47 | int MS_SCSI_Test_Unit_Ready(struct us_data *us, struct scsi_cmnd *srb) |
46 | { | 48 | { |
47 | //printk("MS_SCSI_Test_Unit_Ready\n"); | 49 | /* pr_info("MS_SCSI_Test_Unit_Ready\n"); */ |
48 | if (us->MS_Status.Insert && us->MS_Status.Ready) | 50 | if (us->MS_Status.Insert && us->MS_Status.Ready) |
49 | return USB_STOR_TRANSPORT_GOOD; | 51 | return USB_STOR_TRANSPORT_GOOD; |
50 | else | 52 | else |
@@ -59,7 +61,7 @@ int MS_SCSI_Test_Unit_Ready(struct us_data *us, struct scsi_cmnd *srb) | |||
59 | //----- MS_SCSI_Inquiry() -------------------------------------------------- | 61 | //----- MS_SCSI_Inquiry() -------------------------------------------------- |
60 | int MS_SCSI_Inquiry(struct us_data *us, struct scsi_cmnd *srb) | 62 | int MS_SCSI_Inquiry(struct us_data *us, struct scsi_cmnd *srb) |
61 | { | 63 | { |
62 | //printk("MS_SCSI_Inquiry\n"); | 64 | /* pr_info("MS_SCSI_Inquiry\n"); */ |
63 | BYTE data_ptr[36] = {0x00, 0x80, 0x02, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x55, 0x53, 0x42, 0x32, 0x2E, 0x30, 0x20, 0x20, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x30, 0x30}; | 65 | BYTE data_ptr[36] = {0x00, 0x80, 0x02, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x55, 0x53, 0x42, 0x32, 0x2E, 0x30, 0x20, 0x20, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x30, 0x30}; |
64 | 66 | ||
65 | usb_stor_set_xfer_buf(us, data_ptr, 36, srb, TO_XFER_BUF); | 67 | usb_stor_set_xfer_buf(us, data_ptr, 36, srb, TO_XFER_BUF); |
@@ -91,7 +93,7 @@ int MS_SCSI_Read_Capacity(struct us_data *us, struct scsi_cmnd *srb) | |||
91 | WORD bl_len; | 93 | WORD bl_len; |
92 | BYTE buf[8]; | 94 | BYTE buf[8]; |
93 | 95 | ||
94 | printk("MS_SCSI_Read_Capacity\n"); | 96 | pr_info("MS_SCSI_Read_Capacity\n"); |
95 | 97 | ||
96 | bl_len = 0x200; | 98 | bl_len = 0x200; |
97 | if ( us->MS_Status.IsMSPro ) | 99 | if ( us->MS_Status.IsMSPro ) |
@@ -100,8 +102,8 @@ int MS_SCSI_Read_Capacity(struct us_data *us, struct scsi_cmnd *srb) | |||
100 | bl_num = us->MS_Lib.NumberOfLogBlock * us->MS_Lib.blockSize * 2 - 1; | 102 | bl_num = us->MS_Lib.NumberOfLogBlock * us->MS_Lib.blockSize * 2 - 1; |
101 | 103 | ||
102 | us->bl_num = bl_num; | 104 | us->bl_num = bl_num; |
103 | printk("bl_len = %x\n", bl_len); | 105 | pr_info("bl_len = %x\n", bl_len); |
104 | printk("bl_num = %x\n", bl_num); | 106 | pr_info("bl_num = %x\n", bl_num); |
105 | 107 | ||
106 | //srb->request_bufflen = 8; | 108 | //srb->request_bufflen = 8; |
107 | buf[0] = (bl_num>>24) & 0xff; | 109 | buf[0] = (bl_num>>24) & 0xff; |
@@ -130,7 +132,8 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) | |||
130 | WORD blen = ((Cdb[7]<< 8) & 0xff00) | ((Cdb[8]<< 0) & 0x00ff); | 132 | WORD blen = ((Cdb[7]<< 8) & 0xff00) | ((Cdb[8]<< 0) & 0x00ff); |
131 | DWORD blenByte = blen * 0x200; | 133 | DWORD blenByte = blen * 0x200; |
132 | 134 | ||
133 | //printk("SCSIOP_READ --- bn = %X, blen = %X, srb->use_sg = %X\n", bn, blen, srb->use_sg); | 135 | /* pr_info("SCSIOP_READ --- bn = %X, blen = %X, srb->use_sg = %X\n", |
136 | bn, blen, srb->use_sg); */ | ||
134 | 137 | ||
135 | if (bn > us->bl_num) | 138 | if (bn > us->bl_num) |
136 | return USB_STOR_TRANSPORT_ERROR; | 139 | return USB_STOR_TRANSPORT_ERROR; |
@@ -140,7 +143,7 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) | |||
140 | result = ENE_LoadBinCode(us, MSP_RW_PATTERN); | 143 | result = ENE_LoadBinCode(us, MSP_RW_PATTERN); |
141 | if (result != USB_STOR_XFER_GOOD) | 144 | if (result != USB_STOR_XFER_GOOD) |
142 | { | 145 | { |
143 | printk("Load MSP RW pattern Fail !!\n"); | 146 | pr_info("Load MSP RW pattern Fail !!\n"); |
144 | return USB_STOR_TRANSPORT_ERROR; | 147 | return USB_STOR_TRANSPORT_ERROR; |
145 | } | 148 | } |
146 | 149 | ||
@@ -174,7 +177,7 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) | |||
174 | result = ENE_LoadBinCode(us, MS_RW_PATTERN); | 177 | result = ENE_LoadBinCode(us, MS_RW_PATTERN); |
175 | if (result != USB_STOR_XFER_GOOD) | 178 | if (result != USB_STOR_XFER_GOOD) |
176 | { | 179 | { |
177 | printk("Load MS RW pattern Fail !!\n"); | 180 | pr_info("Load MS RW pattern Fail !!\n"); |
178 | result = USB_STOR_TRANSPORT_ERROR; | 181 | result = USB_STOR_TRANSPORT_ERROR; |
179 | goto exit; | 182 | goto exit; |
180 | } | 183 | } |
@@ -207,7 +210,8 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) | |||
207 | result = ENE_SendScsiCmd(us, FDIR_READ, buf+offset, 0); | 210 | result = ENE_SendScsiCmd(us, FDIR_READ, buf+offset, 0); |
208 | if (result != USB_STOR_XFER_GOOD) | 211 | if (result != USB_STOR_XFER_GOOD) |
209 | { | 212 | { |
210 | printk("MS_SCSI_Read --- result = %x\n", result); | 213 | pr_info("MS_SCSI_Read --- result = %x\n", |
214 | result); | ||
211 | result = USB_STOR_TRANSPORT_ERROR; | 215 | result = USB_STOR_TRANSPORT_ERROR; |
212 | goto exit; | 216 | goto exit; |
213 | } | 217 | } |
@@ -245,7 +249,7 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) | |||
245 | result = ENE_LoadBinCode(us, MSP_RW_PATTERN); | 249 | result = ENE_LoadBinCode(us, MSP_RW_PATTERN); |
246 | if (result != USB_STOR_XFER_GOOD) | 250 | if (result != USB_STOR_XFER_GOOD) |
247 | { | 251 | { |
248 | printk("Load MSP RW pattern Fail !!\n"); | 252 | pr_info("Load MSP RW pattern Fail !!\n"); |
249 | return USB_STOR_TRANSPORT_ERROR; | 253 | return USB_STOR_TRANSPORT_ERROR; |
250 | } | 254 | } |
251 | 255 | ||
@@ -280,7 +284,7 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) | |||
280 | result = ENE_LoadBinCode(us, MS_RW_PATTERN); | 284 | result = ENE_LoadBinCode(us, MS_RW_PATTERN); |
281 | if (result != USB_STOR_XFER_GOOD) | 285 | if (result != USB_STOR_XFER_GOOD) |
282 | { | 286 | { |
283 | printk("Load MS RW pattern Fail !!\n"); | 287 | pr_info("Load MS RW pattern Fail !!\n"); |
284 | result = USB_STOR_TRANSPORT_ERROR; | 288 | result = USB_STOR_TRANSPORT_ERROR; |
285 | goto exit; | 289 | goto exit; |
286 | } | 290 | } |
@@ -301,7 +305,8 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) | |||
301 | result = MS_ReaderCopyBlock(us, oldphy, newphy, PhyBlockAddr, PageNum, buf+offset, len); | 305 | result = MS_ReaderCopyBlock(us, oldphy, newphy, PhyBlockAddr, PageNum, buf+offset, len); |
302 | if (result != USB_STOR_XFER_GOOD) | 306 | if (result != USB_STOR_XFER_GOOD) |
303 | { | 307 | { |
304 | printk("MS_SCSI_Write --- result = %x\n", result); | 308 | pr_info("MS_SCSI_Write --- result = %x\n", |
309 | result); | ||
305 | result = USB_STOR_TRANSPORT_ERROR; | 310 | result = USB_STOR_TRANSPORT_ERROR; |
306 | goto exit; | 311 | goto exit; |
307 | } | 312 | } |