Ticket #6503: scsi-device-patch-r1.diff

src/apps/devices/Device.cpp

@@ -12 +12 @@
 #include <iostream>
 
 
-// This list comes from the pciid list, except for the last one
+// This list comes from the pciid list, except for the last few that don't rely on PCIid numbers
 const char* kCategoryString[] = {
-    "Unclassified device",                  // 0x00
+    "Unclassified device",                  // 0x00
     "Mass storage controller",              // 0x01
     "Network controller",                   // 0x02
     "Display controller",                   // 0x03
@@ -26 +26 @@
     "Input device controller",              // 0x09
     "Docking station",                      // 0x0a
     "Processor",                            // 0x0b
-    "Serial bus controller",                // 0x0c
+    "Serial bus controller",                // 0x0c
     "Wireless controller",                  // 0x0d
     "Intelligent controller",               // 0x0e
     "Satellite communications controller",  // 0x0f
     "Encryption controller",                // 0x10
     "Signal processing controller",         // 0x11
     "Computer",                             // 0x12 (added later)
-    "ACPI controller"           // 0x13 (added later)
+    "ACPI controller"                       // 0x13 (added later)
 };
 
 

src/apps/devices/Device.h

@@ -44 +44 @@
 
 
 typedef enum {
-    CAT_NONE = 0,
-    CAT_BUS = 6,
-    CAT_COMPUTER = 0x12,
-    CAT_ACPI = 0x13
+    CAT_NONE = 0x00,        // Unknown / Other
+    CAT_BUS = 0x06,         // Bus Device
+    CAT_COMPUTER = 0x12,    // Generic computer related 
+    CAT_ACPI = 0x13         // ACPI Related
 } Category;
 
 

src/apps/devices/DevicesView.cpp

@@ -318 +318 @@
             newDevice = new DeviceACPI(parent);
             break;
         }
+
+        // SCSI device (or an ATA device playing SCSI?)
+        if (attributes[i].fName == B_DEVICE_BUS
+                && attributes[i].fValue == "scsi") {
+            newDevice = new DeviceSCSI(parent);
+            break;
+        }
     }
 
     if (newDevice == NULL) {

src/apps/devices/DeviceSCSI.cpp

@@ +1 @@
+/*
+ * Copyright 2008-2010 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Handle SCSI devices and show them in a clean way
+ *
+ * Authors:
+ *      Alexander von Gluck (kallisti5)
+ */
+
+
+#include <sstream>
+#include <stdlib.h>
+
+#include "DeviceSCSI.h"
+
+// Standard SCSI device types
+const char* SCSITypeMap[] = {
+    "Disk Drive",           // 0x00
+    "Tape Drive",           // 0x01
+    "Printer",              // 0x02
+    "Processor",            // 0x03
+    "Worm",                 // 0x04
+    "CD-ROM",               // 0x05
+    "Scanner",              // 0x06
+    "Optical",              // 0x07
+    "Changer",              // 0x08
+    "Communications",       // 0x09
+    "Graphics Peripheral",  // 0x0A
+    "Graphics Peripheral",  // 0x0B
+    "Array",                // 0x0C
+    "Enclosure",            // 0x0D
+    "RBC",                  // 0x0E
+    "Card Reader",          // 0x0F
+    "Bridge",               // 0x10
+    "Other"                 // 0x11
+};
+
+DeviceSCSI::DeviceSCSI(Device* parent)
+    :
+    Device(parent)
+{
+}
+
+
+DeviceSCSI::~DeviceSCSI()
+{
+}
+
+
+void
+DeviceSCSI::InitFromAttributes()
+{
+    BString outlineName;
+    BString nodeProduct;
+    BString nodeVendor;
+    BString nodeType;
+    int nodeTypeID;
+
+    nodeProduct = GetAttribute("scsi/product").fValue;
+    nodeVendor = GetAttribute("scsi/vendor").fValue;
+    nodeType = GetAttribute("scsi/type").fValue;
+
+    nodeTypeID = atoi (nodeType.String());
+
+    fCategory = (Category)CAT_COMPUTER;
+
+    outlineName << "SCSI " << SCSITypeMap[nodeTypeID] << " (" << nodeProduct << ")";
+
+    SetAttribute("Device name", outlineName.String());
+    SetAttribute("Manufacturer", nodeVendor.String());
+    SetAttribute("Device class", SCSITypeMap[nodeTypeID]);
+
+    SetText(outlineName.String());
+}
+
+
+Attributes
+DeviceSCSI::GetBusAttributes()
+{
+    // Push back things that matter for SCSI devices
+    Attributes attributes;
+    attributes.push_back(GetAttribute("device/bus"));
+    attributes.push_back(GetAttribute("scsi/product"));
+    attributes.push_back(GetAttribute("scsi/vendor"));
+    attributes.push_back(GetAttribute("scsi/revision"));
+    attributes.push_back(GetAttribute("scsi/target_id"));
+    attributes.push_back(GetAttribute("scsi/target_lun"));
+    attributes.push_back(GetAttribute("dma/max_transfer_blocks"));
+    attributes.push_back(GetAttribute("Device class"));
+    return attributes;
+}
+
+
+BString
+DeviceSCSI::GetBusStrings()
+{
+    BString str;
+    str << "Class Info:\t\t\t\t: " << fAttributeMap["Class Info"];
+    return str;
+}

src/apps/devices/DevicesView.h

@@ -27 +27 @@
 #include "Device.h"
 #include "DevicePCI.h"
 #include "DeviceACPI.h"
+#include "DeviceSCSI.h"
 #include "PropertyList.h"
 #include "PropertyListPlain.h"
 

src/apps/devices/Jamfile

@@ -66 +66 @@
     dm_wrapper.c
     DevicePCI.cpp
     DeviceACPI.cpp
+    DeviceSCSI.cpp
     Device.cpp
     PropertyList.cpp
     PropertyListPlain.cpp

src/apps/devices/DeviceSCSI.h

@@ +1 @@
+/*
+ * Copyright 2008-2010 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Alexander von Gluck (kallisti5)
+ */
+#ifndef DEVICESCSI_H
+#define DEVICESCSI_H
+
+#include "Device.h"
+
+class DeviceSCSI : public Device {
+public:
+                        DeviceSCSI(Device* parent);
+    virtual             ~DeviceSCSI();
+    virtual Attributes  GetBusAttributes();
+    virtual BString     GetBusStrings();
+    virtual void        InitFromAttributes();
+    
+    virtual BString     GetBusTabName()
+                            { return "SCSI Information"; }
+
+};
+
+#endif /* DEVICESCSI_H */