Index: uspace/drv/bus/usb/usbmast/Makefile =================================================================== --- uspace/drv/bus/usb/usbmast/Makefile (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ 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 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ 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 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ 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 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ 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: uspace/drv/bus/usb/usbmast/scsi.h =================================================================== --- uspace/drv/bus/usb/usbmast/scsi.h (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ (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 - -/** - * @} - */