diff options
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 2 | ||||
| -rw-r--r-- | gtk/scsi_stat.c | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 74a2d2e2fc..ea919ff720 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -676,6 +676,8 @@ static const enum_val_t scsi_devtype_options[] = { {"block", "Block Device", SCSI_DEV_SBC}, {"sequential", "Sequential Device", SCSI_DEV_SSC}, {"objectbased", "Object Based Storage Device", SCSI_DEV_OSD}, + {"mediumchanger", "Medium Changer Device", SCSI_DEV_SMC}, + {"cdrom", "Multimedia Device", SCSI_DEV_CDROM}, {NULL, NULL, -1}, }; diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index 198070ce35..a4531bdd54 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -53,6 +53,8 @@ #include <epan/dissectors/packet-scsi.h> #include <epan/dissectors/packet-fc.h> #include <epan/dissectors/packet-scsi-ssc.h> +#include <epan/dissectors/packet-scsi-smc.h> +#include <epan/dissectors/packet-scsi-osd.h> static GtkWidget *dlg=NULL; @@ -217,6 +219,16 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_) rs->cdbnames=scsi_mmc_vals; hf_name="scsi.mmc.opcode"; break; + case SCSI_DEV_SMC: + rs->prog="SMC (tape robot)"; + rs->cdbnames=scsi_smc_vals; + hf_name="scsi.smc.opcode"; + break; + case SCSI_DEV_OSD: + rs->prog="OSD (object based)"; + rs->cdbnames=scsi_osd_vals; + hf_name="scsi.osd.opcode"; + break; } rs->win=window_new(GTK_WINDOW_TOPLEVEL, "scsi-stat"); |