Index: uspace/drv/usbmast/cmds.h =================================================================== --- uspace/drv/usbmast/cmds.h (revision 7a5c8b8f82132c9f09d2e3db3d57eb25a66cfeb7) +++ uspace/drv/usbmast/cmds.h (revision 7a5c8b8f82132c9f09d2e3db3d57eb25a66cfeb7) @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvusbmast + * @{ + */ +/** @file + * USB mass storage commands. + */ + +#ifndef USB_USBMAST_CMDS_H_ +#define USB_USBMAST_CMDS_H_ + +#include +#include + +typedef struct { + uint32_t dCBWSignature; + uint32_t dCBWTag; + uint32_t dCBWDataTransferLength; + uint8_t bmCBWFlags; + uint8_t bCBWLUN; + uint8_t bCBWBLength; + uint8_t CBWCB[16]; +} __attribute__((packed)) usb_massstor_cbw_t; + +typedef struct { + uint32_t dCSWSignature; + uint32_t dCSWTag; + uint32_t dCSWDataResidue; + uint8_t dCSWStatus; +} __attribute__((packed)) usb_massstor_csw_t; + +static inline void usb_massstor_cbw_prepare(usb_massstor_cbw_t *cbw, + uint32_t tag, uint32_t transfer_length, usb_direction_t dir, + uint8_t lun, uint8_t cmd_len, uint8_t *cmd) +{ + cbw->dCBWSignature = uint32_host2usb(0x43425355); + cbw->dCBWTag = tag; + cbw->dCBWDataTransferLength = transfer_length; + + cbw->bmCBWFlags = 0; + if (dir == USB_DIRECTION_IN) { + cbw->bmCBWFlags |= (1 << 7); + } + + /* Only lowest 4 bits. */ + cbw->bCBWLUN = lun & 0x0F; + + /* Only lowest 5 bits. */ + cbw->bCBWBLength = cmd_len & 0x1F; + + memcpy(cbw->CBWCB, cmd, cbw->bCBWBLength); +} + +#endif + +/** + * @} + */ Index: uspace/drv/usbmast/main.c =================================================================== --- uspace/drv/usbmast/main.c (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) +++ uspace/drv/usbmast/main.c (revision 7a5c8b8f82132c9f09d2e3db3d57eb25a66cfeb7) @@ -40,4 +40,6 @@ #include #include +#include "cmds.h" +#include "scsi.h" #define NAME "usbmast" @@ -45,4 +47,7 @@ #define BULK_IN_EP 0 #define BULK_OUT_EP 1 + +#define GET_BULK_IN(dev) ((dev)->pipes[BULK_IN_EP].pipe) +#define GET_BULK_OUT(dev) ((dev)->pipes[BULK_OUT_EP].pipe) static usb_endpoint_description_t bulk_in_ep = { @@ -68,4 +73,47 @@ NULL }; + +#define INQUIRY_RESPONSE_LENGTH 35 + +static void try_inquiry(usb_device_t *dev) +{ + usb_massstor_cbw_t cbw; + scsi_cmd_inquiry_t inquiry = { + .op_code = 0x12, + .lun_evpd = 0, + .page_code = 0, + .alloc_length = INQUIRY_RESPONSE_LENGTH, + .ctrl = 0 + }; + size_t response_len; + uint8_t response[INQUIRY_RESPONSE_LENGTH]; + usb_massstor_csw_t csw; + size_t csw_len; + + usb_massstor_cbw_prepare(&cbw, 0xdeadbeef, INQUIRY_RESPONSE_LENGTH, + USB_DIRECTION_IN, 0, sizeof(inquiry), (uint8_t *) &inquiry); + + int rc; + rc = usb_pipe_write(GET_BULK_OUT(dev), &cbw, sizeof(cbw)); + usb_log_debug("Wrote CBW: %s.\n", str_error(rc)); + if (rc != EOK) { + return; + } + + rc = usb_pipe_read(GET_BULK_IN(dev), response, INQUIRY_RESPONSE_LENGTH, + &response_len); + usb_log_debug("Read response (%zuB): '%s' (%s).\n", response_len, + usb_debug_str_buffer(response, response_len, 0), + str_error(rc)); + if (rc != EOK) { + return; + } + + rc = usb_pipe_read(GET_BULK_IN(dev), &csw, sizeof(csw), &csw_len); + usb_log_debug("Read CSW (%zuB): '%s' (%s).\n", csw_len, + usb_debug_str_buffer((uint8_t *) &csw, csw_len, 0), + str_error(rc)); + +} /** Callback when new device is attached and recognized as a mass storage. @@ -101,4 +149,6 @@ (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size); + try_inquiry(dev); + return EOK; } Index: uspace/drv/usbmast/scsi.h =================================================================== --- uspace/drv/usbmast/scsi.h (revision 7a5c8b8f82132c9f09d2e3db3d57eb25a66cfeb7) +++ uspace/drv/usbmast/scsi.h (revision 7a5c8b8f82132c9f09d2e3db3d57eb25a66cfeb7) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvusbmast + * @{ + */ +/** @file + * SCSI related structures. + */ + +#ifndef USB_USBMAST_SCSI_H_ +#define USB_USBMAST_SCSI_H_ + +#include +#include + +typedef struct { + uint8_t op_code; + uint8_t lun_evpd; + uint8_t page_code; + uint16_t alloc_length; + uint8_t ctrl; +} __attribute__((packed)) scsi_cmd_inquiry_t; + +#endif + +/** + * @} + */