Changeset 0feaae4 in mainline for uspace/lib/scsi

Timestamp:

2011-07-02T17:21:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

239e7e10

Parents:

2429e4a

Message:

Factor out standard SCSI code from usbmast to a separate SCSI library.

Location:

uspace/lib/scsi

Files:

• Makefile (added)
• include/scsi/spc.h (moved) (moved from uspace/drv/bus/usb/usbmast/scsi.h ) (2 diffs)
• src/spc.c (added)

uspace/lib/scsi/include/scsi/spc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbmast
+/** @addtogroup libscsi
  * @{
  */
-/** @file
- * SCSI related structures.
+/**
+ * @file SCSI Primary Commands.
  */
 
-#ifndef USB_USBMAST_SCSI_H_
-#define USB_USBMAST_SCSI_H_
+#ifndef LIBSCSI_SPC_H_
+#define LIBSCSI_SPC_H_
 
-#include <sys/types.h>
-#include <usb/usb.h>
+#include <stdint.h>
 
+/** 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;
-        uint8_t lun_evpd;
+        /** Reserved:7-2, obsolete:1, evpd:0 */
+        uint8_t evpd;
+        /* Page Code */
         uint8_t page_code;
-        uint16_t alloc_length;
-        uint8_t ctrl;
-} __attribute__((packed)) scsi_cmd_inquiry_t;
+        /* 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
 
-/**
- * @}
+/** @}
  */