ChangeSet 1.1348.19.4, 2003/06/24 14:50:57-07:00, kpc-usbdev@gelato.uiuc.edu [PATCH] USB: Desknote/ECS UCR-61S2B card reader (2.5.72 patched) This is for 2.5.72 with the US_PR_DEVICE / US_SC_DEVICE patch in place. Tested and working. drivers/usb/storage/initializers.c | 47 +++++++++++++++++++++++++++++++++++++ drivers/usb/storage/initializers.h | 6 ++++ drivers/usb/storage/unusual_devs.h | 10 +++++++ 3 files changed, 63 insertions(+) diff -Nru a/drivers/usb/storage/initializers.c b/drivers/usb/storage/initializers.c --- a/drivers/usb/storage/initializers.c Tue Jun 24 15:29:17 2003 +++ b/drivers/usb/storage/initializers.c Tue Jun 24 15:29:17 2003 @@ -41,6 +41,7 @@ #include #include "initializers.h" #include "debug.h" +#include "transport.h" /* This places the Shuttle/SCM USB<->SCSI bridge devices in multi-target * mode */ @@ -59,4 +60,50 @@ return 0; } +/* This function is required to activate all four slots on the UCR-61S2B + * flash reader */ +int usb_stor_ucr61s2b_init(struct us_data *us) +{ + struct bulk_cb_wrap *bcb; + struct bulk_cs_wrap *bcs; + int res, partial; + + bcb = kmalloc(sizeof *bcb, in_interrupt() ? GFP_ATOMIC : GFP_NOIO); + if (!bcb) { + return(-1); + } + bcs = kmalloc(sizeof *bcs, in_interrupt() ? GFP_ATOMIC : GFP_NOIO); + if (!bcs) { + kfree(bcb); + return(-1); + } + + US_DEBUGP("Sending UCR-61S2B initialization packet...\n"); + + bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN); + bcb->Tag = 0; + bcb->DataTransferLength = cpu_to_le32(0); + bcb->Flags = bcb->Lun = 0; + bcb->Length = sizeof(UCR61S2B_INIT); + memset(bcb->CDB, 0, sizeof(bcb->CDB)); + memcpy(bcb->CDB, UCR61S2B_INIT, sizeof(UCR61S2B_INIT)); + + res = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, bcb, + US_BULK_CB_WRAP_LEN, &partial); + US_DEBUGP("-- result is %d\n", res); + kfree(bcb); + + if(res) { + kfree(bcs); + return(res); + } + + res = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs, + US_BULK_CS_WRAP_LEN, &partial); + US_DEBUGP("-- result of status read is %d\n", res); + + kfree(bcs); + + return(res ? -1 : 0); +} diff -Nru a/drivers/usb/storage/initializers.h b/drivers/usb/storage/initializers.h --- a/drivers/usb/storage/initializers.h Tue Jun 24 15:29:17 2003 +++ b/drivers/usb/storage/initializers.h Tue Jun 24 15:29:17 2003 @@ -48,3 +48,9 @@ #ifdef CONFIG_USB_STORAGE_SDDR09 int sddr09_init(struct us_data *us); #endif + +#define UCR61S2B_INIT "\xec\x0a\x06\x00$PCCHIPS" + +/* This function is required to activate all four slots on the UCR-61S2B + * flash reader */ +int usb_stor_ucr61s2b_init(struct us_data *us); diff -Nru a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h --- a/drivers/usb/storage/unusual_devs.h Tue Jun 24 15:29:17 2003 +++ b/drivers/usb/storage/unusual_devs.h Tue Jun 24 15:29:17 2003 @@ -620,6 +620,16 @@ US_SC_SCSI, US_PR_BULK, NULL, US_FL_MODE_XLATE | US_FL_FIX_INQUIRY ), +/* Reported by Kevin Cernekee + * Tested on hardware version 1.10. + * Entry is needed only for the initializer function override. + */ +UNUSUAL_DEV( 0x1019, 0x0c55, 0x0000, 0x9999, + "Desknote", + "UCR-61S2B", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_ucr61s2b_init, + 0 ), + /* Reported by Dan Pilone * The device needs the flags only. * Also reported by Brian Hall , again for flags.