Usbat2 April 2004

usbat2@lists.lysator.liu.se

7 participants
13 discussions

Remove!
by Adam Knutson 24 Apr '04

24 Apr '04

I have tried 2 different email addresses to get off this list, first: usbat2-request(a)lists.lysator.liu.se second: usbat2-admin(a)lists.lysator.liu.se I want off. I don't know the password at http://lists.lysator.liu.se/mailman/listinfo/usbat2 so its my last resort to email to this list. Remove me asap, thanks.

2 1

Ouput of 'lsusb -v' with 2.6.4 patch on a 2.6.5 kernel
by kamstrup＠daimi.au.dk 23 Apr '04

23 Apr '04

Ouput of 'lsusb -v' with 2.6.4 patch on a 2.6.5 kernel I attached the output of 'lsusb -v' both with and without the card plugged in. I also attached the output of lsmod with the card plugged in just as a bonus :) //kamstrup

1 0

2.6.4 patch, still no module found...
by kamstrup＠daimi.au.dk 23 Apr '04

23 Apr '04

Thanks, for all the compilation tips, it saves me quite some time... :D . Sorry if I have been a bit silent, but I have reality up to my neck. I just removed the 2.6.5 patch and tried the 2.6.4 one. Still no luck. /var/log/debug.log sure looks a lot like /var/log/messages - so much for verbose debugging in usb-storage ;-P . Here's the relevant part... Apr 23 22:48:58 bitsplitter kernel: drivers/usb/core/usb.c: registered new driver usb-storage Apr 23 22:48:58 bitsplitter kernel: USB Mass Storage support registered. Apr 23 22:49:44 bitsplitter kernel: usb 3-2: new full speed USB device using address 2 Apr 23 22:49:44 bitsplitter usb.agent[3693]: ... no modules for USB product 781/5/5 Daniel, you said in a mail that I should compile usb-storage and *usbat02* as modules, and load them before plugin in... I do compile usb-storage as a module (and load it) but I am only able to include the Zio/usbat02 driver (does it just mean that usbat02 is included in the usb-storage module?). Just for completeness; here's my lsmod output: Module Size Used by usb_storage 116768 0 ipv6 249536 6 usblp 12864 0 uhci_hcd 31056 0 ohci_hcd 18692 0 ehci_hcd 25732 0 usbcore 104092 7 usb_storage,usblp,uhci_hcd,ohci_hcd,ehci_hcd af_packet 22088 2 sd_mod 20992 0 ide_scsi 16964 0 scsi_mod 120460 3 usb_storage,sd_mod,ide_scsi via_rhine 21256 0 mii 5248 1 via_rhine agpgart 32936 0 xfs 590776 3 nls_iso8859_1 3968 1 nls_cp437 5632 1 vfat 15424 1 fat 48256 1 vfat Until further notice I will go usbat02-hunting on the net :) cheers, kamstrup

2 1

Devices that use USBAT02?
by Daniel Drake 23 Apr '04

23 Apr '04

Hi, After reading the SCM docs, I have a better understanding of why these devices do not directly conform to the normal usb-storage protocols. Basically, the USBAT02 is a gateway device. It converts a USB port into either ATA (e.g. storage devices), EPP (parallel port style, e.g. printers) or ISA (old modems, soundcards etc). The devices we are used to use the ATA gateway part, our driver only uses that part of the chips functionality. A manufacturer, e.g. Sandisk, simply needs to connect some sort of ATA-conforming flash memory reader to the right pins of the USBAT02 chip, and USBAT02 will take care of the rest. This does make the system needlessly complex, but it makes it easy to produce devices like this (as usbat02 does the hard work with the usb bus). Then, all a software driver needs to do is configure the USBAT02 chip to act as a ATA gateway, and then the fireworks go off (as long as the device behind the gateway conforms to the usb-storage protocols implemented in linux). Our driver supports a chain like this: Driver <---> USB bus <---> USBAT02 <---> CF reader chip <---> CF media Looking at the list of devices supported on the sourceforge page, they all appear to be compactflash devices. My thought is "why?" - as its no harder to plug a compactflash reading chip into the USBAT02 than it is for smartmedia or whatever else. Do we know of non-compactflash storage devices that use USBAT02? While I'm here, do we know of non-storage-type devices that use USBAT02? One more thing, some googling brought me to: http://www.amazon.com/exec/obidos/tg/detail/-/B00004XRDP/002-7171845-649522… which states that the I-JAM JS-50U CompactFlash card reader works with zio and efilm reader2 drivers - which basically means its another usbat02 device. Herald, could you add this to the page? Daniel

2 3

2.6.5 and usbat02-0.4.0_vs_2.6.5.patch
by Geoff Patton 23 Apr '04

23 Apr '04

G'day, Just applied the patch for 2.6.5 (usbat02-0.4.0_vs_2.6.5.patch) and it applied to the kernel (2.6.5-gentoo-r1)without any error messages..... but......................... on rebooting with the recompiled kernel the boot process hung at "usb hotplugging" and would only continue when ctl-c was pressed - the kernel continued to load but of course there was no /dev/sda1 etc... I then tried to remove the patch (to try and reapply it in case the above issue was only a hiccup) with: patch -p1 -R < usbat02-0.4.0_vs_2.6.5.patch but this does not remove it... any ideas? Geoff

2 3

Easier kernel compilation?
by Mikkel Kamstrup Erlandsen 23 Apr '04

23 Apr '04

Say I have a clean kernel (2.6.5), is it then enough to apply a patch, and then only compile the kernel image and the relevant modules? How would I do it? It certainly would remove a great deal of compile time :) make bsImage make ??? make modules_install cheers, kamstrup

4 3

USBAT02 0.4.0 for Linux 2.6.5
by Daniel Drake 22 Apr '04

22 Apr '04

Hi, I am interested in getting this project back up to date and into working condition. My aim is to clean up the code and submit it for inclusion in Linux 2.6 and 2.4. Herald has put more information on the webpage: http://usbat2.sourceforge.net There is a link on the page to a patch I made recently, applies against 2.6.4. This is tested and apparently works ok. If you just want the device working under 2.6, then this patch is for you.. But I'd really appreciate it if you could help out with the testing of future patches (read on...) The patch linked to from the webpage is quite messy and needs cleaning and improvement before it can be submitted for the kernel. So, I'm going to carry on with this work, aiming to clean and improve it. This work is against 2.6, I will deal with 2.4 after..! I'll be firing patches at this list from now on. I don't own one of these devices, so I will never really know which code works until you tell me :) So far, Herald has expressed an interest in testing, and I have also sent mails to 2 other people I know who have the device and Linux 2.6. If anyone else on the list could spare some testing time, I'd be grateful. Just reply to patch-mails I write here... If anyone is interested in helping out with development, let me know... perhaps we can get onto CVS or something. Here's the first patch, just minor cleanups really. I would like confirmation that this one still works before I continue. cheers Daniel -- Daniel Drake (dsd) Developer, Gentoo Linux diff -urN linux-2.6.5/drivers/usb/storage/jumpshot.c linux-2.6.5-dsd/drivers/usb/storage/jumpshot.c --- linux-2.6.5/drivers/usb/storage/jumpshot.c 2004-04-20 14:38:27.000000000 +0100 +++ linux-2.6.5-dsd/drivers/usb/storage/jumpshot.c 2004-04-05 23:36:06.000000000 +0100 @@ -58,7 +58,7 @@ #include <linux/slab.h> static inline int jumpshot_bulk_read(struct us_data *us, - unsigned char *data, + unsigned char *data, unsigned int len) { if (len == 0) diff -urN linux-2.6.5/drivers/usb/storage/Kconfig linux-2.6.5-dsd/drivers/usb/storage/Kconfig --- linux-2.6.5/drivers/usb/storage/Kconfig 2004-04-20 14:38:27.000000000 +0100 +++ linux-2.6.5-dsd/drivers/usb/storage/Kconfig 2004-04-19 22:07:59.000000000 +0100 @@ -59,6 +59,8 @@ help Say Y here to support the Microtech/ZiO! CompactFlash reader. There is a web page at <http://www.ziocorp.com/products/>. + Note that another type of ZiO! CompactFlash reader exists, + which is supported by the USBAT-02 driver. config USB_STORAGE_HP8200e bool "HP CD-Writer 82xx support (EXPERIMENTAL)" @@ -89,3 +91,18 @@ Say Y here to include additional code to support the Lexar Jumpshot USB CompactFlash reader. +config USB_STORAGE_USBAT02 + bool "USBAT02-based CompactFlash Reader support (EXPERIMENTAL)" + depends on USB_STORAGE && EXPERIMENTAL + help + Say Y here to include additional code to support storage devices + using the USBAT-02 processor. + + Devices reported to work with this driver are: + - CompactFlash Reader that comes with Kodak DC3800 digital camera + - Microtech Zio! CompactFlash reader + - Kingston Technology PCREAD-USB/CF + - Delkin Efilm reader2 + - RCA LYRA MP3 portable + - Dane-Elec Zmate CompactFlash reader + - SanDisk ImageMate SDDR-05b diff -urN linux-2.6.5/drivers/usb/storage/Makefile linux-2.6.5-dsd/drivers/usb/storage/Makefile --- linux-2.6.5/drivers/usb/storage/Makefile 2004-04-20 14:38:27.000000000 +0100 +++ linux-2.6.5-dsd/drivers/usb/storage/Makefile 2004-04-19 22:22:26.000000000 +0100 @@ -18,6 +18,7 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_ISD200) += isd200.o usb-storage-obj-$(CONFIG_USB_STORAGE_DATAFAB) += datafab.o usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT) += jumpshot.o +usb-storage-obj-$(CONFIG_USB_STORAGE_USBAT02) += shuttle_usbat02.o usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \ initializers.o $(usb-storage-obj-y) diff -urN linux-2.6.5/drivers/usb/storage/shuttle_usbat02.c linux-2.6.5-dsd/drivers/usb/storage/shuttle_usbat02.c --- linux-2.6.5/drivers/usb/storage/shuttle_usbat02.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.5-dsd/drivers/usb/storage/shuttle_usbat02.c 2004-04-20 14:42:25.296420880 +0100 @@ -0,0 +1,935 @@ +/* Driver for SCM Microsystems USB-ATAPI-02 (USBAT-02) based devices + * + * $Id: $ + * Version 0.4.0 + * + * Current development and maintenance by: + * (C) 2004 Daniel Drake <dan(a)reactivated.net> + * + * Based on an earlier driver for Linux 2.4 by: + * (C) 2002 Thomas Kreiling <usbdev(a)sm04.de> + * + * Thanks to Dong Lin, who produced a "clean" FreeBSD driver for this device, + * which was useful when writing this driver. + * + * Thanks to Robert Baruch for the Jumpshot driver, which was partially used + * as a template for this driver. + * + * Many original ATAPI devices were slightly modified to meet the USB + * market by using some kind of translation from ATAPI to USB on the host, + * and the peripheral would translate from USB back to ATAPI. + * + * SCM Microsystems (www.scmmicro.com) makes devices, sold to OEM's only, + * which does the USB-to-ATAPI conversion. This driver supports various devices + * which run on the SCM Micro USBAT-02 chip. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#include "transport.h" +#include "protocol.h" +#include "usb.h" +#include "debug.h" +#include "shuttle_usbat02.h" + +#include <linux/sched.h> +#include <linux/errno.h> +#include <linux/slab.h> + +#define short_pack(lsb,msb) ( ((u16)(lsb)) | ( ((u16)(msb))<<8 ) ) +#define LSB_of(s) ((s)&0xFF) +#define MSB_of(s) ((s)>>8) + +#define USBAT02_ATA 0x40 + +#define ATA_REG_DATA 0x10 +#define ATA_REG_FEATURES 0x11 +#define ATA_REG_ERROR 0x11 +#define ATA_REG_SECCNT 0x12 +#define ATA_REG_LBA_LO 0x13 +#define ATA_REG_LBA_ME 0x14 +#define ATA_REG_LBA_HI 0x15 +#define ATA_REG_DEVICE 0x16 +#define ATA_REG_STATUS 0x17 +#define ATA_REG_CMD 0x17 + +#define ATA_CMD_DEVICE_RESET 0x08 +#define ATA_CMD_READ_SECTORS 0x20 +#define ATA_CMD_IDENTIFY_PACKET_DEVICE 0xa1 +#define ATA_CMD_SET_MULTIPLE_MODE 0xc6 +#define ATA_CMD_GET_MEDIA_STATUS 0xda +#define ATA_CMD_IDENTIFY_DEVICE 0xec + +#define ATA_LBA_MASK 0x0FFFFFFF +#define ATA_STATUS_DRDY 0x50 /* device ready */ +#define ATA_STATUS_DRQ 0x08 /* data ready */ + +static void usbat02_create_regdata_array(unsigned char *data, + unsigned char *reg, + unsigned char *cmd, + unsigned short num_regs) { + int i; + + for (i=0; i<num_regs; i++) { + data[ i<<1 ] = reg[i]; + data[1+(i<<1)] = cmd[i]; + } +} + +static inline int usbat02_bulk_read(struct us_data *us, + unsigned char *data, + unsigned int len) { + if (len == 0) + return USB_STOR_XFER_GOOD; + + US_DEBUGP("usbat02_bulk_read: len=%d\n", len); + return usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, data, len, NULL); +} + +static inline int usbat02_bulk_write(struct us_data *us, + unsigned char *data, + unsigned int len) { + if (len == 0) + return USB_STOR_XFER_GOOD; + + US_DEBUGP("usbat02_bulk_write: len=%d\n", len); + return usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, data, len, NULL); +} + +static int usbat02_read(struct us_data *us, + unsigned char access, + unsigned char reg, + unsigned char *content) { + return usb_stor_ctrl_transfer(us, us->recv_ctrl_pipe, access, 0xC0, + (u16)reg, 0, content, 1); +} + +static int usbat02_write(struct us_data *us, + unsigned char access, + unsigned char reg, + unsigned char content) { + return usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, access | 0x01, + 0x40, short_pack(reg, content), 0, NULL, 0); +} + +static int usbat02_get_status(struct us_data *us) { + unsigned char reply; + int rc; + + if (!us) + return USB_STOR_TRANSPORT_ERROR; + + /* Send the setup */ + rc = usbat02_read(us, USBAT02_ATA, 0x17, &reply); + + if (rc != USB_STOR_XFER_GOOD) + return rc; + + if ( (reply != 0x50) && (reply != 0x51) ){ + US_DEBUGP("usbat02_get_status: 0x%2x\n", + (unsigned short) (reply)); + return USB_STOR_TRANSPORT_ERROR; + } + + return USB_STOR_TRANSPORT_GOOD; +} + +static int usbat02_read_data(struct us_data *us, struct usbat02_info *info, + u32 sector, u32 sectors) { + unsigned char ctrl_command[16] = { + 0x40, USBAT02_ATA|0x07, 0x01, 0x17, 0xf0, 0xee, + LSB_of(7*2), MSB_of(7*2), // LSB_of(num_ata_registers*2), MSB_of(num_ata_registers*2), + 0xc0, // (direction==SCSI_DATA_WRITE ? 0x40 : 0xC0), + USBAT02_ATA|0x04, // access|(direction==SCSI_DATA_WRITE ? 0x05 : 0x04), + 0x10, 0x17, // data_reg, status_reg, + 0xfd, 0x20, // timeout, qualifier, + 0x00, 0x02, //adjusted, see below, LSB_of(len), MSB_of(len) + }; + + unsigned char registers[7] = { 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 }; + unsigned char command[7] = { 0, 0, 0, 0, 0, 0xe0, 0x20 }; + unsigned char data[7*2]; // reg + data, reg0 data0 reg1 data1 ... reg8 data8 + unsigned char *buffer; + unsigned char thistime = (unsigned char) 0x200; + + unsigned int totallen, alloclen; + int len, result; + int sg_idx = 0, sg_offset = 0; + + // we're working in LBA mode. according to the ATA spec, + // we can support up to 28-bit addressing. I don't know if USBAT02 + // supports beyond 24-bit addressing. It's kind of hard to test + // since it requires > 8GB CF card. + + if (sector > 0x0FFFFFFF) + return USB_STOR_TRANSPORT_ERROR; + + totallen = sectors * info->ssize; + + // Since we don't read more than 64 KB at a time, we have to create + // a bounce buffer and move the data a piece at a time between the + // bounce buffer and the actual transfer buffer. + + alloclen = min(totallen, 32768u); + buffer = kmalloc(alloclen, GFP_NOIO); + if (buffer == NULL) + return USB_STOR_TRANSPORT_ERROR; + + do { + // loop, never allocate or transfer more than 64k at once + //(min(128k, 255*info->ssize) is the real limit) + len = min(totallen, alloclen); + + thistime = (len / info->ssize) & 0xff; + // adjust the ctrl_command (no. of bytes to transfer) + ctrl_command[14] = LSB_of(thistime * info->ssize); + ctrl_command[15] = MSB_of(thistime * info->ssize); + + command[0] = 0; + command[1] = thistime; + command[2] = sector & 0xFF; + command[3] = (sector >> 8) & 0xFF; + command[4] = (sector >> 16) & 0xFF; + command[5] |= (sector >> 24) & 0x0F; + + // send the setup + command + result = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, + 0, 0, ctrl_command, 16); + + if (result != USB_STOR_XFER_GOOD) + goto leave; + + // Build the reg/data, reg/data ... array + usbat02_create_regdata_array(data, registers, command, 7); + result = usbat02_bulk_write(us, data, 7*2); + + if (result != USB_STOR_XFER_GOOD) + goto leave; + + // read the result + result = usbat02_bulk_read(us, buffer, len); + if (result != USB_STOR_XFER_GOOD) + goto leave; + + US_DEBUGP("usbat02_read_data: %d bytes\n", len); + + // Store the data in the transfer buffer + usb_stor_access_xfer_buf(buffer, len, us->srb, &sg_idx, &sg_offset, TO_XFER_BUF); + + sector += thistime; + totallen -= len; + } while (totallen > 0); + + kfree(buffer); + return USB_STOR_TRANSPORT_GOOD; + + leave: + kfree(buffer); + return USB_STOR_TRANSPORT_ERROR; +} + +static int usbat02_write_data(struct us_data *us, struct usbat02_info *info, + u32 sector, u32 sectors) { + + unsigned char ctrl_command[16] = { + 0x40, USBAT02_ATA|0x07, 0x01, 0x17, 0xf0, 0xee, + LSB_of(7*2), MSB_of(7*2), // LSB_of(num_ata_registers*2), MSB_of(num_ata_registers*2), + 0x40, // (direction==SCSI_DATA_WRITE ? 0x40 : 0xC0), + USBAT02_ATA|0x05, // access|(direction==SCSI_DATA_WRITE ? 0x05 : 0x04), + 0x10, 0x17, // data_reg, status_reg, + 0xfd, 0x20, // timeout, qualifier, + 0x00, 0x02, //adjusted, see below, LSB_of(len), MSB_of(len) + }; + + unsigned char registers[7] = { 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 }; + unsigned char command[7] = { 0, 0, 0, 0, 0, 0xe0, 0x30 }; // 0x30 = write + unsigned char data[7*2]; // reg + data, reg0 data0 reg1 data1 ... reg8 data8 + unsigned char *buffer; + unsigned char thistime; + unsigned int totallen, alloclen; + int len, result, waitcount; + int sg_idx = 0, sg_offset = 0; + + // we're working in LBA mode. according to the ATA spec, + // we can support up to 28-bit addressing. I don't know if USBAT02 + // supports beyond 24-bit addressing. It's kind of hard to test + // since it requires > 8GB CF card. + + if (sector > 0x0FFFFFFF) + return USB_STOR_TRANSPORT_ERROR; + + totallen = sectors * info->ssize; + // Since we don't read more than 64 KB at a time, we have to create + // a bounce buffer and move the data a piece at a time between the + // bounce buffer and the actual transfer buffer. + + alloclen = min(totallen, 32768u); + buffer = kmalloc(alloclen, GFP_NOIO); + if (buffer == NULL) + return USB_STOR_TRANSPORT_ERROR; + + do { + // loop, never allocate or transfer more than 64k at once + // (min(128k, 255*info->ssize) is the real limit) + len = min(totallen, alloclen); + thistime = (len / info->ssize) & 0xff; + + // Get the data from the transfer buffer (s-g) + usb_stor_access_xfer_buf(buffer, len, us->srb, &sg_idx, &sg_offset, FROM_XFER_BUF); + + ctrl_command[14] = LSB_of(thistime * info->ssize); + ctrl_command[15] = MSB_of(thistime * info->ssize); + + command[0] = 0; + command[1] = thistime; + command[2] = sector & 0xFF; + command[3] = (sector >> 8) & 0xFF; + command[4] = (sector >> 16) & 0xFF; + command[5] |= (sector >> 24) & 0x0F; + + // send the setup + command + result = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, 0, 0, ctrl_command, 16); + US_DEBUGP("usbat02_write_data: bulk out ctrl_command\n"); + + usbat02_create_regdata_array(data, registers, command, 7); + result = usbat02_bulk_write(us, data, 7*2); + + US_DEBUGP("usbat02_write_data: bulk out reg/data done\n"); + + if (result != USB_STOR_XFER_GOOD) + goto leave; + + // send the data + result = usbat02_bulk_write(us, buffer, len); + if (result != USB_STOR_XFER_GOOD) + goto leave; + + // read the result. apparently the bulk write can complete before the + // usbat02 drive is finished writing. so we loop here until we + // get a good return code + waitcount = 0; + do { + result = usbat02_get_status(us); + if (result != USB_STOR_TRANSPORT_GOOD) { + // I have not experimented to find the smallest value. + wait_ms(50); + } + } while ((result != USB_STOR_TRANSPORT_GOOD) && (waitcount < 10)); + + if (result != USB_STOR_TRANSPORT_GOOD) + US_DEBUGP("usbat02_write_data: Gah! Waitcount = 10. Bad write!?\n"); + + sector += thistime; + totallen -= len; + } while (totallen > 0); + + kfree(buffer); + return result; + + leave: + kfree(buffer); + return USB_STOR_TRANSPORT_ERROR; + +} + +static int usbat02_id_device(struct us_data *us, struct usbat02_info *info) { + unsigned char ctrl_command[8] = {0x40, 0x47, 0, 0, 0, 0, 6, 0}; + unsigned char ctrl_4210[8] = {0xc0, 0x42, 0x10, 0x00, 0x00, 0x00, 0x00, 0x02}; + unsigned char command[6] = {0x12, 0x01, 0x16, 0xa0, 0x17, 0xec}; + unsigned char status; + unsigned char *reply; + __u16 *cf; // ptr to CF id-drive block + int rc; + + if (!us || !info) + return USB_STOR_TRANSPORT_ERROR; + + reply = kmalloc(512, GFP_NOIO); + if(!reply) + return USB_STOR_TRANSPORT_ERROR; + + /* Send the setup */ + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, 0, 0, + ctrl_command, 8); + + if (rc != USB_STOR_XFER_GOOD) { + US_DEBUGP("usbat02_id_device: Gah! send_control for read_capacity failed\n"); + kfree(reply); + return USB_STOR_TRANSPORT_ERROR; + } + + wait_ms(5); + + rc = usbat02_bulk_write(us, command, 6); + if (rc != USB_STOR_XFER_GOOD) { + US_DEBUGP("usbat02_id_device: Gah! bulk_write for read_capacity failed\n"); + kfree(reply); + return USB_STOR_TRANSPORT_ERROR; + } else { + US_DEBUGP("usbat02_id_device: bulk_write for read_capacity ok\n"); + } + + wait_ms(5); + + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + if( rc != USB_STOR_XFER_GOOD) { + US_DEBUGP("usbat02_id_device: Gah! recv_control for read_capacity failed\n"); + kfree(reply); + return USB_STOR_TRANSPORT_ERROR; + } + + if (status == 0x58) { + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, 0, 0, + ctrl_4210, 8); + + if (rc != USB_STOR_XFER_GOOD) { + kfree(reply); + return USB_STOR_TRANSPORT_ERROR; + } + + wait_ms(50); + } + + wait_ms(50); + + /* Read the reply */ + rc = usbat02_bulk_read(us, reply, sizeof(reply)); + if (rc != USB_STOR_XFER_GOOD) { + US_DEBUGP("usbat02_id_device: bulk_read failed\n"); + kfree(reply); + return USB_STOR_TRANSPORT_ERROR; + } + + wait_ms(150); + + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + if (rc != USB_STOR_XFER_GOOD) { + kfree(reply); + return USB_STOR_TRANSPORT_ERROR; + } + + US_DEBUGP("usbat02_id_device: ATA IDENTIFY: %02X %02X %02X %02X\n", + reply[0], reply[1], reply[2], reply[3]); + memcpy((char *)&drive, reply, sizeof(struct hd_driveid)); // Keep params to set them later + + US_DEBUGP("usbat02_id_device: cyls = 0x%x\n", drive.cur_cyls); + US_DEBUGP("usbat02_id_device: heads = 0x%x\n", drive.cur_heads); + US_DEBUGP("usbat02_id_device: sectors = 0x%x\n", drive.sectors); + + info->sectors = ((u32)(reply[117]) << 24) | + ((u32)(reply[116]) << 16) | + ((u32)(reply[115]) << 8) | + ((u32)(reply[114])); + + US_DEBUGP("usbat02_id_device: CF cyls 1: 0x%X\n", cf[1]); + US_DEBUGP("usbat02_id_device: CF heads 3: 0x%X\n", cf[3]); + US_DEBUGP("usbat02_id_device: CF sec/trk 6: 0x%X\n", cf[6]); + US_DEBUGP("usbat02_id_device: CF sect/card : 0x%X\n", cf[7]<<16 | cf[8]); + + cf = (__u16 *) reply; + info->ssize = 0x200; + info->sectors = ((cf[7]<<16) | cf[8]); + + kfree(reply); + return USB_STOR_TRANSPORT_GOOD; +} + +static int usbat02_handle_mode_sense(struct us_data *us, Scsi_Cmnd *srb, + int sense_6) { + static unsigned char rw_err_page[12] = { + 0x1, 0xA, 0x21, 1, 0, 0, 0, 0, 1, 0, 0, 0 + }; + + static unsigned char cache_page[12] = { + 0x8, 0xA, 0x1, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + + static unsigned char rbac_page[12] = { + 0x1B, 0xA, 0, 0x81, 0, 0, 0, 0, 0, 0, 0, 0 + }; + + static unsigned char timer_page[8] = { + 0x1C, 0x6, 0, 0, 0, 0 + }; + + unsigned char pc, page_code; + unsigned int i = 0; + struct usbat02_info *info = (struct usbat02_info *) us->extra; + unsigned char *ptr = us->iobuf; + + pc = srb->cmnd[2] >> 6; + page_code = srb->cmnd[2] & 0x3F; + +#ifdef CONFIG_USB_STORAGE_DEBUG + switch (pc) { + case 0x0: + US_DEBUGP("usbat02_handle_mode_sense: Current values\n"); + break; + case 0x1: + US_DEBUGP("usbat02_handle_mode_sense: Changeable values\n"); + break; + case 0x2: + US_DEBUGP("usbat02_handle_mode_sense: Default values\n"); + break; + case 0x3: + US_DEBUGP("usbat02_handle_mode_sense: Saves values\n"); + break; + } +#endif + + memset(ptr, 0, 8); + if (sense_6) { + ptr[2] = 0x00; // WP enable: 0x80 + i = 4; + } else { + ptr[3] = 0x00; // WP enable: 0x80 + i = 8; + } + + switch (page_code) { + case 0x0: + // vendor-specific mode + info->sense_key = 0x05; + info->sense_asc = 0x24; + info->sense_ascq = 0x00; + return USB_STOR_TRANSPORT_FAILED; + + case 0x1: + memcpy(ptr + i, rw_err_page, sizeof(rw_err_page)); + i += sizeof(cache_page); + break; + + case 0x8: + memcpy(ptr + i, cache_page, sizeof(cache_page)); + i += sizeof(cache_page); + break; + + case 0x1B: + memcpy(ptr + i, rbac_page, sizeof(rbac_page)); + i += sizeof(rbac_page); + break; + + case 0x1C: + memcpy(ptr + i, timer_page, sizeof(timer_page)); + i += sizeof(timer_page); + break; + + case 0x3F: + memcpy(ptr + i, timer_page, sizeof(timer_page)); + i += sizeof(timer_page); + memcpy(ptr + i, rbac_page, sizeof(rbac_page)); + i += sizeof(rbac_page); + memcpy(ptr + i, cache_page, sizeof(cache_page)); + i += sizeof(cache_page); + memcpy(ptr + i, rw_err_page, sizeof(rw_err_page)); + i += sizeof(rw_err_page); + break; + } + + if (sense_6) + ptr[0] = i - 1; + else + ((u16 *) ptr)[0] = cpu_to_be16(i - 2); + usb_stor_set_xfer_buf(ptr, i, srb); + + return USB_STOR_TRANSPORT_GOOD; +} + +void usbat02_info_destructor(void *extra) { + // this routine is a placeholder... + // currently, we don't allocate any extra blocks so we're okay +} + +static int usbat02_select_and_test_registers(struct us_data *us) { + int result; + int selector; + unsigned char status; + + // try device = master, then device = slave. + + for (selector = 0xA0; selector <= 0xA0; selector += 0x10) { + if ( (result = usbat02_read(us, USBAT02_ATA, 0x14, &status)) != + USB_STOR_XFER_GOOD) + return result; + + wait_ms(5); + + if ( (result = usbat02_read(us, USBAT02_ATA, 0x15, &status)) != + USB_STOR_XFER_GOOD) + return result; + + wait_ms(5); + + if ( (result = usbat02_write(us, USBAT02_ATA, 0x14, 0x55)) != + USB_STOR_XFER_GOOD) + return result; + + wait_ms(5); + + if ( (result = usbat02_write(us, USBAT02_ATA, 0x15, 0xAA)) != + USB_STOR_XFER_GOOD) + return result; + + wait_ms(5); + + if ( (result = usbat02_read(us, USBAT02_ATA, 0x14, &status)) != + USB_STOR_XFER_GOOD) + return result; + + wait_ms(5); + + if ( (result = usbat02_read(us, USBAT02_ATA, 0x15, &status)) != + USB_STOR_XFER_GOOD) + return result; + + if ( (result = usbat02_write(us, USBAT02_ATA, 0x14, 0x00)) != + USB_STOR_XFER_GOOD) + return result; + + if ( (result = usbat02_write(us, USBAT02_ATA, 0x15, 0x00)) != + USB_STOR_XFER_GOOD) + return result; + + if ( (result = usbat02_read(us, USBAT02_ATA, 0x17, &status)) != + USB_STOR_XFER_GOOD) + return result; + } + + return result; +} + +int init_usbat02(struct us_data *us) { + /* + // set reg multi, 12 01 16 a0 17 ec + // set reg multi, 12 02 16 af 17 91 + // then SetupPacket : 40 41 12 01 00 00 00 00 + // SetupPacket : 40 41 17 c6 00 00 00 00 + // then + // set reg multi, 12 01 16 a0 17 da + */ + + struct usbat02_info *info; + unsigned char ctrl_command_30a0[] = { 0x40, 0x82, 0x30, 0xa0, 0, 0, 0, 0 }; + unsigned char ctrl_command_b0a0[] = { 0x40, 0x82, 0xb0, 0xa0, 0, 0, 0, 0 }; + + unsigned char ctrl_feature[] = { 0x40, 0x81, 0x00, 0x83, 0x08, 0x88, 0x00, 0x02 }; + unsigned char ctrl_command[] = { + 0x40, 0x47, 0,0, 0, 0, 6, 0 + }; + unsigned char command_91[6] = { 0x12, 0x02, 0x16, 0xaf, 0x17, 0x91 }; // 0x91 : set drv param + unsigned char command_da[6] = { 0x12, 0x01, 0x16, 0xa0, 0x17, 0xda }; // 0xda : get media status + + int result, rc, i; + unsigned char status; + + rc = USB_STOR_TRANSPORT_GOOD; + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, 0, 0, + ctrl_command_30a0, 8); + + wait_ms(250); + + if ( (result = usbat02_read(us, 0x82, 0, &status)) != USB_STOR_XFER_GOOD) + return result; + wait_ms(50); + if ( (result = usbat02_read(us, 0x82, 0, &status)) != USB_STOR_XFER_GOOD) + return result; + + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x41, 0x40, + 0xA016, 0, NULL, 0); + wait_ms(50); + + status = 0xff; + i = 0; + while( (i++<30) && (status!=0x50) ) { + wait_ms(250); + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + } + + if ( (rc = usbat02_select_and_test_registers(us)) != USB_STOR_XFER_GOOD) + return result; + + if ( (result = usbat02_read(us, USBAT02_ATA, 0x0e, &status)) != USB_STOR_XFER_GOOD) + return result; + + if ( (rc = usbat02_write(us, USBAT02_ATA, 0x16, 0xa0)) != USB_STOR_XFER_GOOD) + return rc; + + wait_ms(50); + + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + if ( (rc = usbat02_write(us, USBAT02_ATA, 0x17, 0xa1)) != USB_STOR_XFER_GOOD) + return rc; + + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + + if ( (rc = usbat02_write(us, USBAT02_ATA, 0x16, 0xa0)) != USB_STOR_XFER_GOOD) + return rc; + wait_ms(50); + + if ( (rc = usbat02_write(us, USBAT02_ATA, 0x17, 0x08)) != USB_STOR_XFER_GOOD) + return rc; + + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + if ( rc != USB_STOR_XFER_GOOD ) + return rc; + + rc = usbat02_read(us, USBAT02_ATA, 0x11, &status); + if ( rc != USB_STOR_XFER_GOOD ) + return rc; + + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, + 0, 0, ctrl_command_b0a0, 8); + wait_ms(100); + + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, 0, 0, + ctrl_command_30a0, 8); + + status = 0xff; + i = 0; + while( (i++<50) && (status!=0x50) ) { + wait_ms(100); + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + } + + if ( (rc = usbat02_write(us, USBAT02_ATA, 0x17, 0x10)) != USB_STOR_XFER_GOOD) + return rc; + + status = 0xff; + i = 0; + while( (i++<50) && (status!=0x50) ) { + wait_ms(50); + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + } + + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + if ( rc != USB_STOR_XFER_GOOD ) + return rc; + + // debug, get space for device info, which we are reading in init for debug information purp. + info = (struct usbat02_info *) kmalloc(sizeof(struct usbat02_info), GFP_KERNEL); + if (!info) { + US_DEBUGP("usbat02_init 10a: Gah! Can't allocate storage for usbat02 info struct!\n"); + return USB_STOR_TRANSPORT_ERROR; + } + + memset(info, 0, sizeof(struct usbat02_info)); + rc = usbat02_id_device(us, info); + US_DEBUGP("usbat02_init 10b: id_device: %ld sectors, %ld bytes per sector\n", + info->sectors, info->ssize); + kfree(info); + + command_91[1] = (info->sec_per_track & 0xff); + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, 0, 0, + ctrl_command, 8); + US_DEBUGP("usbat02_init 13: ctrl 91, spt:%x, heads:%X\n", command_91[1], command_91[3]&0x0f); + + wait_ms(5); + + if (rc != USB_STOR_XFER_GOOD) { + US_DEBUGP("usbat02_init 13: Gah! send_control for 0x91 failed\n"); + return rc; + } + + rc = usbat02_bulk_write(us, command_91, 6); + status = 0xff; + i = 0; + while( (i++<30) && (status!=0x50) ) { // ... until device not busy + wait_ms(250); + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + } + + if ( (rc = usbat02_write(us, USBAT02_ATA, 0x12, 0x01)) != USB_STOR_XFER_GOOD) + return rc; + + wait_ms(20); + + if ( (rc = usbat02_write(us, USBAT02_ATA, 0x17, 0xc6)) != USB_STOR_XFER_GOOD) + return rc; + + wait_ms(120); + + if ( (rc = usbat02_read(us, USBAT02_ATA, 0x17, &status)) != USB_STOR_XFER_GOOD) + return rc; + US_DEBUGP("usbat02_init 13: cmnd c6 ok, status=%02X\n", status); + + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, + 0, 0, ctrl_feature, 8); + US_DEBUGP("usbat02_init 14: ctrl feature ok\n"); + + wait_ms(100); + + rc = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe, 0x80, 0x40, 0, 0, + ctrl_command, 8); + if (rc != USB_STOR_XFER_GOOD) { + US_DEBUGP("usbat02_init 15: Gah! send_control for 0xda failed\n"); + return rc; + } + rc = usbat02_bulk_write(us, command_da, 6); + + wait_ms(100); + + US_DEBUGP("usbat02_init 15: cmnd 0xda (get media status)ok\n"); + + rc = usbat02_read(us, USBAT02_ATA, 0x17, &status); + if ( rc != USB_STOR_XFER_GOOD ) + return rc; + + usbat02_read(us, USBAT02_ATA, 0x11, &status); + + return rc; +} + +int usbat02_transport(Scsi_Cmnd * srb, struct us_data *us) { + struct usbat02_info *info; + int rc; + unsigned long block, blocks; + unsigned char *ptr = us->iobuf; + unsigned char inquiry_response[36] = { + 0x00, 0x80, 0x00, 0x01, 0x1F, 0x00, 0x00, 0x00 + }; + + + if (!us->extra) { + us->extra = kmalloc(sizeof(struct usbat02_info), GFP_KERNEL); + if (!us->extra) { + US_DEBUGP("usbat02_transport: Gah! Can't allocate storage for usbat02 info struct!\n"); + return USB_STOR_TRANSPORT_ERROR; + } + memset(us->extra, 0, sizeof(struct usbat02_info)); + us->extra_destructor = usbat02_info_destructor; + } + + info = (struct usbat02_info *) (us->extra); + + if (srb->cmnd[0] == INQUIRY) { + US_DEBUGP("usbat02_transport: INQUIRY. Returning bogus response.\n"); + memcpy(ptr, inquiry_response, sizeof(inquiry_response)); + fill_inquiry_response(us, ptr, 36); + return USB_STOR_TRANSPORT_GOOD; + } + + if (srb->cmnd[0] == READ_CAPACITY) { + info->ssize = 0x200; // hard coded 512 byte sectors as per ATA spec + + rc = usbat02_id_device(us, info); + US_DEBUGP("usbat02_transport: READ_CAPACITY done.\n"); + if (rc != USB_STOR_TRANSPORT_GOOD) + return rc; + + US_DEBUGP("usbat02_transport: READ_CAPACITY: %ld sectors, %ld bytes per sector\n", + info->sectors, info->ssize); + + // build the reply + ((u32 *) ptr)[0] = cpu_to_be32(info->sectors); + ((u32 *) ptr)[1] = cpu_to_be32(info->ssize); + usb_stor_set_xfer_buf(ptr, 8, srb); + + return USB_STOR_TRANSPORT_GOOD; + } + + if (srb->cmnd[0] == MODE_SELECT_10) { + US_DEBUGP("usbat02_transport: Gah! MODE_SELECT_10.\n"); + return USB_STOR_TRANSPORT_ERROR; + } + + if (srb->cmnd[0] == READ_10) { + block = ((u32)(srb->cmnd[2]) << 24) | ((u32)(srb->cmnd[3]) << 16) | + ((u32)(srb->cmnd[4]) << 8) | ((u32)(srb->cmnd[5])); + + blocks = ((u32)(srb->cmnd[7]) << 8) | ((u32)(srb->cmnd[8])); + + US_DEBUGP("usbat02_transport: READ_10: read block 0x%04lx count %ld\n", block, blocks); + return usbat02_read_data(us, info, block, blocks); + } + + if (srb->cmnd[0] == READ_12) { + // I don't think we'll ever see a READ_12 but support it anyway... + // + block = ((u32)(srb->cmnd[2]) << 24) | ((u32)(srb->cmnd[3]) << 16) | + ((u32)(srb->cmnd[4]) << 8) | ((u32)(srb->cmnd[5])); + + blocks = ((u32)(srb->cmnd[6]) << 24) | ((u32)(srb->cmnd[7]) << 16) | + ((u32)(srb->cmnd[8]) << 8) | ((u32)(srb->cmnd[9])); + + US_DEBUGP("usbat02_transport: READ_12: read block 0x%04lx count %ld\n", block, blocks); + return usbat02_read_data(us, info, block, blocks); + } + + if (srb->cmnd[0] == WRITE_10) { + block = ((u32)(srb->cmnd[2]) << 24) | ((u32)(srb->cmnd[3]) << 16) | + ((u32)(srb->cmnd[4]) << 8) | ((u32)(srb->cmnd[5])); + + blocks = ((u32)(srb->cmnd[7]) << 8) | ((u32)(srb->cmnd[8])); + + US_DEBUGP("usbat02_transport: WRITE_10: write block 0x%04lx count %ld\n", block, blocks); + return usbat02_write_data(us, info, block, blocks); + } + + if (srb->cmnd[0] == WRITE_12) { + // I don't think we'll ever see a WRITE_12 but support it anyway... + // + block = ((u32)(srb->cmnd[2]) << 24) | ((u32)(srb->cmnd[3]) << 16) | + ((u32)(srb->cmnd[4]) << 8) | ((u32)(srb->cmnd[5])); + + blocks = ((u32)(srb->cmnd[6]) << 24) | ((u32)(srb->cmnd[7]) << 16) | + ((u32)(srb->cmnd[8]) << 8) | ((u32)(srb->cmnd[9])); + + US_DEBUGP("usbat02_transport: WRITE_12: write block 0x%04lx count %ld\n", block, blocks); + return usbat02_write_data(us, info, block, blocks); + } + + + if (srb->cmnd[0] == TEST_UNIT_READY) { + US_DEBUGP("usbat02_transport: TEST_UNIT_READY.\n"); + return usbat02_get_status(us); + } + + if (srb->cmnd[0] == REQUEST_SENSE) { + US_DEBUGP("usbat02_transport: REQUEST_SENSE. Returning NO SENSE for now\n"); + + memset(ptr, 0, 18); + ptr[0] = 0xF0; + ptr[2] = info->sense_key; + ptr[7] = 11; + ptr[12] = info->sense_asc; + ptr[13] = info->sense_ascq; + usb_stor_set_xfer_buf(ptr, 18, srb); + + return USB_STOR_TRANSPORT_GOOD; + } + + if (srb->cmnd[0] == MODE_SENSE) { + US_DEBUGP("usbat02_transport: MODE_SENSE_6 detected\n"); + return usbat02_handle_mode_sense(us, srb, TRUE); + } + + if (srb->cmnd[0] == MODE_SENSE_10) { + US_DEBUGP("usbat02_transport: MODE_SENSE_10 detected\n"); + return usbat02_handle_mode_sense(us, srb, FALSE); + } + + if (srb->cmnd[0] == ALLOW_MEDIUM_REMOVAL) { + // sure. whatever. not like we can stop the user from popping + // the media out of the device (no locking doors, etc) + // + return USB_STOR_TRANSPORT_GOOD; + } + + US_DEBUGP("usbat02_transport: Gah! Unknown command: %d (0x%x)\n", srb->cmnd[0], srb->cmnd[0]); + info->sense_key = 0x05; + info->sense_asc = 0x20; + info->sense_ascq = 0x00; + return USB_STOR_TRANSPORT_FAILED; +} diff -urN linux-2.6.5/drivers/usb/storage/shuttle_usbat02.h linux-2.6.5-dsd/drivers/usb/storage/shuttle_usbat02.h --- linux-2.6.5/drivers/usb/storage/shuttle_usbat02.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.5-dsd/drivers/usb/storage/shuttle_usbat02.h 2004-04-19 22:46:19.000000000 +0100 @@ -0,0 +1,44 @@ +/* Driver for SCM Microsystems USB-ATAPI-02 (USBAT02) based devices + * Header File + * + * Current development and maintenance by: + * (c) 2004 Daniel Drake <dan(a)reactivated.net> + * + * See shuttle_usbat02.c for more explanation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef _USB_SHUTTLE_USBAT02_H +#define _USB_SHUTTLE_USBAT02_H + +#include <linux/hdreg.h> + +extern int usbat02_transport(Scsi_Cmnd *srb, struct us_data *us); +extern int init_usbat02(struct us_data *us); + +static struct hd_driveid drive; + +struct usbat02_info { + unsigned long sectors; // total sector count + unsigned long ssize; // sector size in bytes + __u16 sec_per_track; + + // the following aren't used yet + unsigned char sense_key; + unsigned long sense_asc; // additional sense code + unsigned long sense_ascq; // additional sense code qualifier +}; + +#endif diff -urN linux-2.6.5/drivers/usb/storage/transport.h linux-2.6.5-dsd/drivers/usb/storage/transport.h --- linux-2.6.5/drivers/usb/storage/transport.h 2004-04-20 14:38:27.000000000 +0100 +++ linux-2.6.5-dsd/drivers/usb/storage/transport.h 2004-04-19 19:16:36.000000000 +0100 @@ -74,6 +74,10 @@ #define US_PR_JUMPSHOT 0xf3 /* Lexar Jumpshot */ #endif +#ifdef CONFIG_USB_STORAGE_USBAT02 +#define US_PR_USBAT02 0xf6 /* USBAT02 SCM-ATAPI bridge */ +#endif + #define US_PR_DEVICE 0xff /* Use device's value */ /* diff -urN linux-2.6.5/drivers/usb/storage/unusual_devs.h linux-2.6.5-dsd/drivers/usb/storage/unusual_devs.h --- linux-2.6.5/drivers/usb/storage/unusual_devs.h 2004-04-20 14:38:27.000000000 +0100 +++ linux-2.6.5-dsd/drivers/usb/storage/unusual_devs.h 2004-04-19 19:14:16.000000000 +0100 @@ -237,6 +237,14 @@ "CD-RW Device", US_SC_8020, US_PR_CB, NULL, 0), +#ifdef CONFIG_USB_STORAGE_USBAT02 +UNUSUAL_DEV( 0x04e6, 0x1010, 0x0005, 0x0005, + "SCM", + "SCM USBAT-02", + US_SC_SCSI, US_PR_USBAT02, init_usbat02, + US_FL_SINGLE_LUN), +#endif + /* Reported by Bob Sass <rls(a)vectordb.com> -- only rev 1.33 tested */ UNUSUAL_DEV( 0x050d, 0x0115, 0x0133, 0x0133, "Belkin", @@ -495,6 +503,14 @@ US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_IGNORE_SER ), +#ifdef CONFIG_USB_STORAGE_USBAT02 +UNUSUAL_DEV( 0x0781, 0x0005, 0x0005, 0x0005, + "Sandisk", + "ImageMate SDDR-05b", + US_SC_SCSI, US_PR_USBAT02, init_usbat02, + US_FL_SINGLE_LUN), +#endif + UNUSUAL_DEV( 0x0781, 0x0100, 0x0100, 0x0100, "Sandisk", "ImageMate SDDR-12", diff -urN linux-2.6.5/drivers/usb/storage/usb.c linux-2.6.5-dsd/drivers/usb/storage/usb.c --- linux-2.6.5/drivers/usb/storage/usb.c 2004-04-20 14:38:27.000000000 +0100 +++ linux-2.6.5-dsd/drivers/usb/storage/usb.c 2004-04-19 19:16:13.000000000 +0100 @@ -81,7 +81,9 @@ #ifdef CONFIG_USB_STORAGE_JUMPSHOT #include "jumpshot.h" #endif - +#ifdef CONFIG_USB_STORAGE_USBAT02 +#include "shuttle_usbat02.h" +#endif #include <linux/module.h> #include <linux/sched.h> @@ -620,6 +622,15 @@ break; #endif +#ifdef CONFIG_USB_STORAGE_USBAT02 + case US_PR_USBAT02: + us->transport_name = "USBAT-02 Control/Bulk"; + us->transport = usbat02_transport; + us->transport_reset = usb_stor_Bulk_reset; + us->max_lun = 1; + break; +#endif + default: return -EIO; }

3 9

2.4 kernel
by kamstrup＠daimi.au.dk 22 Apr '04

22 Apr '04

Ok, I'm on it. I have also enabled verbose debug for usb_storage in my 2.6.5 kernel but where do I find this extra info? Is it just in /var/log/messages or someplace else? greetings, kamstrup >I'll do that tomorrow sometime. > >One other thing which you could possibly do for me, pretty please, is compile >a 2.4 kernel with verbose usb debug and verbose usb-storage debug, and post >the output here again. Hopefully the 2.4 debug info is just as good, and I'll >be able to make a direct comparison. > >I started comparing the log you just posted to the sniffed data from CVS, and >I have pinpointed where the differences start. I don't know if these >differences matter or not, which is why I am curious to see exactly how the >2.4 driver behaves. > >thanks again > >Daniel

2 1

rediff would be nice
by kamstrup＠daimi.au.dk 21 Apr '04

21 Apr '04

I would appreciate a rediff, I am paying per dl'ed megabyte :) Downloading to many kernel sources would damage my economy ;-P cheers, kamstrup

1 0

Output of 'lsusb -v'
by kamstrup＠daimi.au.dk 21 Apr '04

21 Apr '04

Here's the output of 'lsusb -v'. My terminal locked up after issuing this command, I couldn't ctrl-c. Is this supposed to happend? greetings, kamstrup Output: root@bitsplitter:/mnt/mdk/home/slacker# lsusb -v Unknown line at line 1809 Duplicate HUT Usage Spec at line 2650 Bus 004 Device 001: ID 0000:0000 Virtual Hub Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 1.10 bDeviceClass 9 Hub bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 8 idVendor 0x0000 Virtual idProduct 0x0000 Hub bcdDevice 2.06 iManufacturer 3 Linux 2.6.5 uhci_hcd iProduct 2 VIA Technologies, Inc. USB (#3) iSerial 1 0000:00:10.2 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 25 bNumInterfaces 1 bConfigurationValue 1 iConfiguration 0 bmAttributes 0x40 Self Powered MaxPower 0mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 1 bInterfaceClass 9 Hub bInterfaceSubClass 0 bInterfaceProtocol 0 iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x81 EP 1 IN bmAttributes 3 Transfer Type Interrupt Synch Type none wMaxPacketSize 2 bInterval 255 Language IDs: (length=4) 0409 English(US) Bus 003 Device 002: ID 0781:0005 SanDisk Corp. SDDR-05b (CF II) ImageMate Compac tFlash Reader *** The terminal is frozen here (can't ctrl-c) ***

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

Usbat2 April 2004