Changeset 0feaae4 in mainline for uspace/drv/bus/usb

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/drv/bus/usb/usbmast

Files:

• Makefile (modified) (1 diff)
• inquiry.c (modified) (3 diffs)
• main.c (modified) (2 diffs)
• mast.h (modified) (1 diff)

uspace/drv/bus/usb/usbmast/Makefile

@@ -32 +32 @@
         $(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

uspace/drv/bus/usb/usbmast/inquiry.c

@@ -42 +42 @@
 #include <str.h>
 #include <ctype.h>
+#include <scsi/spc.h>
 #include "cmds.h"
-#include "scsi.h"
 #include "mast.h"
 
@@ -54 +54 @@
 #define INQUIRY_RESPONSE_LENGTH 36
 
-#define STR_UNKNOWN "<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 +89 @@
     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;

uspace/drv/bus/usb/usbmast/main.c

@@ -41 +41 @@
 #include <str_error.h>
 #include "cmds.h"
-#include "scsi.h"
 #include "mast.h"
 
@@ -107 +106 @@
             (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;

uspace/drv/bus/usb/usbmast/mast.h

@@ -65 +65 @@
 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