Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d) +++ uspace/Makefile (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -165,4 +165,5 @@ lib/block \ lib/clui \ + lib/scsi \ lib/softint \ lib/softfloat \ Index: uspace/Makefile.common =================================================================== --- uspace/Makefile.common (revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d) +++ uspace/Makefile.common (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -120,4 +120,6 @@ LIBNET_PREFIX = $(LIB_PREFIX)/net +LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi + ifeq ($(STATIC_NEEDED),y) STATIC_BUILD = y Index: uspace/drv/bus/usb/usbmast/Makefile =================================================================== --- uspace/drv/bus/usb/usbmast/Makefile (revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d) +++ uspace/drv/bus/usb/usbmast/Makefile (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -32,10 +32,12 @@ $(LIBUSBDEV_PREFIX)/libusbdev.a \ $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a + $(LIBDRV_PREFIX)/libdrv.a \ + $(LIBSCSI_PREFIX)/libscsi.a EXTRA_CFLAGS += \ -I$(LIBUSB_PREFIX)/include \ -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include + -I$(LIBDRV_PREFIX)/include \ + -I$(LIBSCSI_PREFIX)/include BINARY = usbmast Index: uspace/drv/bus/usb/usbmast/inquiry.c =================================================================== --- uspace/drv/bus/usb/usbmast/inquiry.c (revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d) +++ uspace/drv/bus/usb/usbmast/inquiry.c (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -42,6 +42,6 @@ #include #include +#include #include "cmds.h" -#include "scsi.h" #include "mast.h" @@ -54,59 +54,12 @@ #define INQUIRY_RESPONSE_LENGTH 36 -#define STR_UNKNOWN "" - -/** String constants for SCSI peripheral device types. */ -static const char *str_peripheral_device_types[] = { - "direct-access device", - "sequential-access device", - "printer device", - "processor device", - "write-once device", - "CDROM device", - "scanner device", - "optical memory device", - "medium changer", - "communications device", - "graphic arts pre-press device", - "graphic arts pre-press device", - "storage array controller device", - "enclosure services device", - "simplified direct-access device", - "optical card reader/writer device", - "bridging expander", - "object-based storage device", - "automation driver interface", - STR_UNKNOWN, // 0x13 - STR_UNKNOWN, // 0x14 - STR_UNKNOWN, // 0x15 - STR_UNKNOWN, // 0x16 - STR_UNKNOWN, // 0x17 - STR_UNKNOWN, // 0x18 - STR_UNKNOWN, // 0x19 - STR_UNKNOWN, // 0x1A - STR_UNKNOWN, // 0x1B - STR_UNKNOWN, // 0x1C - STR_UNKNOWN, // 0x1D - "well-known logical unit", - "uknown or no device state" -}; -#define str_peripheral_device_types_count \ - (sizeof(str_peripheral_device_types)/sizeof(str_peripheral_device_types[0])) - /** Get string representation for SCSI peripheral device type. - * - * See for example here for a list - * http://en.wikipedia.org/wiki/SCSI_Peripheral_Device_Type. * * @param type SCSI peripheral device type code. * @return String representation. */ -const char *usb_str_masstor_scsi_peripheral_device_type(int type) +const char *usb_str_masstor_scsi_peripheral_device_type(unsigned type) { - if ((type < 0) - || ((size_t)type >= str_peripheral_device_types_count)) { - return STR_UNKNOWN; - } - return str_peripheral_device_types[type]; + return scsi_get_dev_type_str(type); } @@ -136,10 +89,10 @@ usb_massstor_inquiry_result_t *inquiry_result) { - scsi_cmd_inquiry_t inquiry = { - .op_code = 0x12, - .lun_evpd = 0, + scsi_cdb_inquiry_t inquiry = { + .op_code = SCSI_CMD_INQUIRY, + .evpd = 0, .page_code = 0, - .alloc_length = host2uint16_t_be(INQUIRY_RESPONSE_LENGTH), - .ctrl = 0 + .alloc_len = host2uint16_t_be(INQUIRY_RESPONSE_LENGTH), + .control = 0 }; size_t response_len; Index: uspace/drv/bus/usb/usbmast/main.c =================================================================== --- uspace/drv/bus/usb/usbmast/main.c (revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d) +++ uspace/drv/bus/usb/usbmast/main.c (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -41,5 +41,4 @@ #include #include "cmds.h" -#include "scsi.h" #include "mast.h" @@ -107,10 +106,12 @@ (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size); +/* usb_log_debug("Get LUN count...\n"); size_t lun_count = usb_masstor_get_lun_count(dev); - + */ size_t lun_count=1; + usb_log_debug("Inquire...\n"); usb_massstor_inquiry_result_t inquiry; rc = usb_massstor_inquiry(dev, BULK_IN_EP, BULK_OUT_EP, &inquiry); if (rc != EOK) { - usb_log_warning("Failed to inquiry device `%s': %s.\n", + usb_log_warning("Failed to inquire device `%s': %s.\n", dev->ddf_dev->name, str_error(rc)); return EOK; Index: uspace/drv/bus/usb/usbmast/mast.h =================================================================== --- uspace/drv/bus/usb/usbmast/mast.h (revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d) +++ uspace/drv/bus/usb/usbmast/mast.h (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -65,5 +65,5 @@ int usb_massstor_inquiry(usb_device_t *, size_t, size_t, usb_massstor_inquiry_result_t *); -const char *usb_str_masstor_scsi_peripheral_device_type(int); +const char *usb_str_masstor_scsi_peripheral_device_type(unsigned); #endif Index: pace/drv/bus/usb/usbmast/scsi.h =================================================================== --- uspace/drv/bus/usb/usbmast/scsi.h (revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * 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 - -/** - * @} - */ Index: uspace/lib/scsi/Makefile =================================================================== --- uspace/lib/scsi/Makefile (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) +++ uspace/lib/scsi/Makefile (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2011 Jiri Svoboda +# 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. +# + +USPACE_PREFIX = ../.. +EXTRA_CFLAGS = -Iinclude +LIBRARY = libscsi + +SOURCES = \ + src/spc.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/scsi/include/scsi/spc.h =================================================================== --- uspace/lib/scsi/include/scsi/spc.h (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) +++ uspace/lib/scsi/include/scsi/spc.h (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libscsi + * @{ + */ +/** + * @file SCSI Primary Commands. + */ + +#ifndef LIBSCSI_SPC_H_ +#define LIBSCSI_SPC_H_ + +#include + +/** SCSI command codes defined in SCSI-SPC */ +enum scsi_cmd_spc { + SCSI_CMD_INQUIRY = 0x12 +}; + +/** SCSI Inquiry command */ +typedef struct { + /** Operation code (12h, SCSI_CMD_INQUIRY) */ + uint8_t op_code; + /** Reserved:7-2, obsolete:1, evpd:0 */ + uint8_t evpd; + /* Page Code */ + uint8_t page_code; + /* Allocation Length */ + uint16_t alloc_len; + /* Control */ + uint8_t control; +} __attribute__((packed)) scsi_cdb_inquiry_t; + +/** SCSI peripheral device type */ +enum scsi_device_type { + SCSI_DEV_BLOCK = 0x00, + SCSI_DEV_STREAM = 0x01, + SCSI_DEV_CD_DVD = 0x05, + SCSI_DEV_CHANGER = 0x08, + SCSI_DEV_ENCLOSURE = 0x0d, + SCSI_DEV_OSD = 0x11, + + SCSI_DEV_LIMIT = 0x20 +}; + +extern const char *scsi_dev_type_str[SCSI_DEV_LIMIT]; +extern const char *scsi_get_dev_type_str(unsigned); + +#endif + +/** @} + */ Index: uspace/lib/scsi/src/spc.c =================================================================== --- uspace/lib/scsi/src/spc.c (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) +++ uspace/lib/scsi/src/spc.c (revision 0feaae499ef0f72ed8da9eb641f673fab5cbaf7d) @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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. + */ + +#include +#include +#include "scsi/spc.h" + +/** String descriptions for SCSI peripheral device type. + * + * Only device types that we are ever likely to encounter are listed here. + */ +const char *scsi_dev_type_str[SCSI_DEV_LIMIT] = { + [SCSI_DEV_BLOCK] = "Direct-Access Block Device (Disk)", + [SCSI_DEV_STREAM] = "Sequential-Access Device (Tape)", + [SCSI_DEV_CD_DVD] = "CD/DVD", + [SCSI_DEV_CHANGER] = "Media Changer", + [SCSI_DEV_ENCLOSURE] = "SCSI Enclosure", + [SCSI_DEV_OSD] = "Object Storage Device" +}; + +/** Get peripheral device type string. + * + * Return string description of SCSI peripheral device type. + * The returned string is valid indefinitely, the caller should + * not attempt to free it. + */ +const char *scsi_get_dev_type_str(unsigned dev_type) +{ + if (dev_type >= SCSI_DEV_LIMIT || scsi_dev_type_str[dev_type] == NULL) + return ""; + + return scsi_dev_type_str[dev_type]; +}