Index: uspace/lib/scsi/Makefile =================================================================== --- uspace/lib/scsi/Makefile (revision 239e7e10b291d0b930cbf65fb727aa3cf7cfc533) +++ uspace/lib/scsi/Makefile (revision 239e7e10b291d0b930cbf65fb727aa3cf7cfc533) @@ -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 239e7e10b291d0b930cbf65fb727aa3cf7cfc533) +++ uspace/lib/scsi/include/scsi/spc.h (revision 239e7e10b291d0b930cbf65fb727aa3cf7cfc533) @@ -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 239e7e10b291d0b930cbf65fb727aa3cf7cfc533) +++ uspace/lib/scsi/src/spc.c (revision 239e7e10b291d0b930cbf65fb727aa3cf7cfc533) @@ -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]; +}