osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

change all sbc2 references into sbc 

svn path=/trunk/; revision=20100
This commit is contained in:
Ronnie Sahlberg 2006-12-10 13:52:30 +00:00
parent f819b845bf
commit 34824cb310
4 changed files with 144 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-scsi-mmc.c
View File

@ -1046,7 +1046,7 @@ const value_string scsi_mmc_vals[] = {
{SCSI_MMC4_RESERVETRACK , "Reserve Track"},
{SCSI_MMC4_SETCDSPEED , "Set CD Speed"},
{SCSI_MMC4_SETSTREAMING , "Set Streaming"},
{SCSI_SBC2_STARTSTOPUNIT , "Start Stop Unit"},
{SCSI_SBC_STARTSTOPUNIT , "Start Stop Unit"},
{SCSI_MMC4_SYNCHRONIZECACHE , "Synchronize Cache"},
{SCSI_SPC2_TESTUNITRDY , "Test Unit Ready"},
{SCSI_MMC4_WRITE10 , "Write(10)"},
@ -1084,7 +1084,7 @@ scsi_cdb_table_t scsi_mmc_table[256] = {
/*MMC 0x18*/{NULL},
/*MMC 0x19*/{NULL},
/*MMC 0x1a*/{NULL},
/*MMC 0x1b*/{dissect_sbc2_startstopunit},
/*MMC 0x1b*/{dissect_sbc_startstopunit},
/*MMC 0x1c*/{NULL},
/*MMC 0x1d*/{NULL},
/*MMC 0x1e*/{dissect_spc3_preventallowmediaremoval},
@ -1094,7 +1094,7 @@ scsi_cdb_table_t scsi_mmc_table[256] = {
/*MMC 0x22*/{NULL},
/*MMC 0x23*/{NULL},
/*MMC 0x24*/{NULL},
/*MMC 0x25*/{dissect_sbc2_readcapacity10},
/*MMC 0x25*/{dissect_sbc_readcapacity10},
/*MMC 0x26*/{NULL},
/*MMC 0x27*/{NULL},
/*MMC 0x28*/{dissect_sbc_read10},

116
epan/dissectors/packet-scsi-sbc.c
View File

@ -762,7 +762,7 @@ static const value_string scsi_ssu_pwrcnd_val[] = {
};
void
dissect_sbc2_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
dissect_sbc_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
guint offset, gboolean isreq _U_, gboolean iscdb,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
{
@ -1020,7 +1020,7 @@ dissect_sbc_wrverify16 (tvbuff_t *tvb, packet_info *pinfo _U_,
void
dissect_sbc2_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
dissect_sbc_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
guint offset, gboolean isreq, gboolean iscdb,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
{
@ -1062,7 +1062,7 @@ dissect_sbc2_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
}
static void
dissect_sbc2_readdefectdata10 (tvbuff_t *tvb, packet_info *pinfo _U_,
dissect_sbc_readdefectdata10 (tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *tree, guint offset, gboolean isreq,
gboolean iscdb,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
@ -1211,7 +1211,7 @@ dissect_sbc_writesame16 (tvbuff_t *tvb, packet_info *pinfo _U_,
static void
dissect_sbc2_readdefectdata12 (tvbuff_t *tvb, packet_info *pinfo _U_,
dissect_sbc_readdefectdata12 (tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *tree, guint offset, gboolean isreq,
gboolean iscdb,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
@ -1284,7 +1284,7 @@ const value_string service_action_vals[] = {
action is set to.
*/
static void
dissect_sbc2_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_,
dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *tree, guint offset, gboolean isreq,
gboolean iscdb,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
@ -1392,9 +1392,9 @@ dissect_sbc2_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_,
const value_string scsi_sbc_vals[] = {
{SCSI_SPC2_EXTCOPY , "Extended Copy"},
{SCSI_SPC2_INQUIRY , "Inquiry"},
{SCSI_SBC2_FORMATUNIT , "Format Unit"},
{SCSI_SBC2_LOCKUNLKCACHE10 , "Lock Unlock Cache(10)"},
{SCSI_SBC2_LOCKUNLKCACHE16 , "Lock Unlock Cache(16)"},
{SCSI_SBC_FORMATUNIT , "Format Unit"},
{SCSI_SBC_LOCKUNLKCACHE10 , "Lock Unlock Cache(10)"},
{SCSI_SBC_LOCKUNLKCACHE16 , "Lock Unlock Cache(16)"},
{SCSI_SPC2_LOGSELECT , "Log Select"},
{SCSI_SPC2_LOGSENSE , "Log Sense"},
{SCSI_SPC2_MODESELECT6 , "Mode Select(6)"},
@ -1403,57 +1403,57 @@ const value_string scsi_sbc_vals[] = {
{SCSI_SPC2_MODESENSE10 , "Mode Sense(10)"},
{SCSI_SPC2_PERSRESVIN , "Persistent Reserve In"},
{SCSI_SPC2_PERSRESVOUT , "Persistent Reserve Out"},
{SCSI_SBC2_PREFETCH10 , "Pre-Fetch(10)"},
{SCSI_SBC2_PREFETCH16 , "Pre-Fetch(16)"},
{SCSI_SBC_PREFETCH10 , "Pre-Fetch(10)"},
{SCSI_SBC_PREFETCH16 , "Pre-Fetch(16)"},
{SCSI_SPC2_PREVMEDREMOVAL , "Prevent/Allow Medium Removal"},
{SCSI_SBC2_READ6 , "Read(6)"},
{SCSI_SBC2_READ10 , "Read(10)"},
{SCSI_SBC2_READ12 , "Read(12)"},
{SCSI_SBC2_READ16 , "Read(16)"},
{SCSI_SBC2_READCAPACITY10 , "Read Capacity(10)"},
{SCSI_SBC_READ6 , "Read(6)"},
{SCSI_SBC_READ10 , "Read(10)"},
{SCSI_SBC_READ12 , "Read(12)"},
{SCSI_SBC_READ16 , "Read(16)"},
{SCSI_SBC_READCAPACITY10 , "Read Capacity(10)"},
{SCSI_SPC2_REPORTLUNS , "Report LUNs"},
{SCSI_SPC2_REQSENSE , "Request Sense"},
{SCSI_SBC2_SERVICEACTIONIN16 , "Service Action In(16)"},
{SCSI_SBC2_READDEFDATA10 , "Read Defect Data(10)"},
{SCSI_SBC2_READDEFDATA12 , "Read Defect Data(12)"},
{SCSI_SBC2_READLONG , "Read Long(10)"},
{SCSI_SBC2_REASSIGNBLKS , "Reassign Blocks"},
{SCSI_SBC2_REBUILD16 , "Rebuild(16)"},
{SCSI_SBC2_REBUILD32 , "Rebuild(32)"},
{SCSI_SBC2_REGENERATE16 , "Regenerate(16)"},
{SCSI_SBC2_REGENERATE32 , "Regenerate(32)"},
{SCSI_SBC2_SEEK10 , "Seek(10)"},
{SCSI_SBC_SERVICEACTIONIN16 , "Service Action In(16)"},
{SCSI_SBC_READDEFDATA10 , "Read Defect Data(10)"},
{SCSI_SBC_READDEFDATA12 , "Read Defect Data(12)"},
{SCSI_SBC_READLONG , "Read Long(10)"},
{SCSI_SBC_REASSIGNBLKS , "Reassign Blocks"},
{SCSI_SBC_REBUILD16 , "Rebuild(16)"},
{SCSI_SBC_REBUILD32 , "Rebuild(32)"},
{SCSI_SBC_REGENERATE16 , "Regenerate(16)"},
{SCSI_SBC_REGENERATE32 , "Regenerate(32)"},
{SCSI_SBC_SEEK10 , "Seek(10)"},
{SCSI_SPC2_SENDDIAG , "Send Diagnostic"},
{SCSI_SBC2_SETLIMITS10 , "Set Limits(10)"},
{SCSI_SBC2_SETLIMITS12 , "Set Limits(12)"},
{SCSI_SBC2_STARTSTOPUNIT , "Start Stop Unit"},
{SCSI_SBC2_SYNCCACHE10 , "Synchronize Cache(10)"},
{SCSI_SBC2_SYNCCACHE16 , "Synchronize Cache(16)"},
{SCSI_SBC_SETLIMITS10 , "Set Limits(10)"},
{SCSI_SBC_SETLIMITS12 , "Set Limits(12)"},
{SCSI_SBC_STARTSTOPUNIT , "Start Stop Unit"},
{SCSI_SBC_SYNCCACHE10 , "Synchronize Cache(10)"},
{SCSI_SBC_SYNCCACHE16 , "Synchronize Cache(16)"},
{SCSI_SPC2_TESTUNITRDY , "Test Unit Ready"},
{SCSI_SBC2_VERIFY10 , "Verify(10)"},
{SCSI_SBC2_VERIFY12 , "Verify(12)"},
{SCSI_SBC2_VERIFY16 , "Verify(16)"},
{SCSI_SBC2_WRITE6 , "Write(6)"},
{SCSI_SBC2_WRITE10 , "Write(10)"},
{SCSI_SBC2_WRITE12 , "Write(12)"},
{SCSI_SBC2_WRITE16 , "Write(16)"},
{SCSI_SBC_VERIFY10 , "Verify(10)"},
{SCSI_SBC_VERIFY12 , "Verify(12)"},
{SCSI_SBC_VERIFY16 , "Verify(16)"},
{SCSI_SBC_WRITE6 , "Write(6)"},
{SCSI_SBC_WRITE10 , "Write(10)"},
{SCSI_SBC_WRITE12 , "Write(12)"},
{SCSI_SBC_WRITE16 , "Write(16)"},
{SCSI_SPC2_WRITEBUFFER , "Write Buffer"},
{SCSI_SBC2_WRITENVERIFY10 , "Write & Verify(10)"},
{SCSI_SBC2_WRITENVERIFY12 , "Write & Verify(12)"},
{SCSI_SBC2_WRITENVERIFY16 , "Write & Verify(16)"},
{SCSI_SBC2_WRITELONG , "Write Long"},
{SCSI_SBC2_WRITESAME10 , "Write Same(10)"},
{SCSI_SBC2_WRITESAME16 , "Write Same(16)"},
{SCSI_SBC2_XDREAD10 , "XdRead(10)"},
{SCSI_SBC2_XDREAD32 , "XdRead(32)"},
{SCSI_SBC2_XDWRITE10 , "XdWrite(10)"},
{SCSI_SBC2_XDWRITE32 , "XdWrite(32)"},
{SCSI_SBC2_XDWRITEREAD10 , "XdWriteRead(10)"},
{SCSI_SBC2_XDWRITEREAD32 , "XdWriteRead(32)"},
{SCSI_SBC2_XDWRITEEXTD16 , "XdWrite Extended(16)"},
{SCSI_SBC2_XDWRITEEXTD32 , "XdWrite Extended(32)"},
{SCSI_SBC2_XPWRITE10 , "XpWrite(10)"},
{SCSI_SBC2_XPWRITE32 , "XpWrite(32)"},
{SCSI_SBC_WRITENVERIFY10 , "Write & Verify(10)"},
{SCSI_SBC_WRITENVERIFY12 , "Write & Verify(12)"},
{SCSI_SBC_WRITENVERIFY16 , "Write & Verify(16)"},
{SCSI_SBC_WRITELONG , "Write Long"},
{SCSI_SBC_WRITESAME10 , "Write Same(10)"},
{SCSI_SBC_WRITESAME16 , "Write Same(16)"},
{SCSI_SBC_XDREAD10 , "XdRead(10)"},
{SCSI_SBC_XDREAD32 , "XdRead(32)"},
{SCSI_SBC_XDWRITE10 , "XdWrite(10)"},
{SCSI_SBC_XDWRITE32 , "XdWrite(32)"},
{SCSI_SBC_XDWRITEREAD10 , "XdWriteRead(10)"},
{SCSI_SBC_XDWRITEREAD32 , "XdWriteRead(32)"},
{SCSI_SBC_XDWRITEEXTD16 , "XdWrite Extended(16)"},
{SCSI_SBC_XDWRITEEXTD32 , "XdWrite Extended(32)"},
{SCSI_SBC_XPWRITE10 , "XpWrite(10)"},
{SCSI_SBC_XPWRITE32 , "XpWrite(32)"},
{0, NULL},
};
@ -1485,7 +1485,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
/*SBC 0x18*/{NULL},
/*SBC 0x19*/{NULL},
/*SPC 0x1a*/{dissect_spc3_modesense6},
/*SBC 0x1b*/{dissect_sbc2_startstopunit},
/*SBC 0x1b*/{dissect_sbc_startstopunit},
/*SBC 0x1c*/{NULL},
/*SPC 0x1d*/{dissect_spc3_senddiagnostic},
/*SBC 0x1e*/{dissect_spc3_preventallowmediaremoval},
@ -1495,7 +1495,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
/*SBC 0x22*/{NULL},
/*SBC 0x23*/{NULL},
/*SBC 0x24*/{NULL},
/*SBC 0x25*/{dissect_sbc2_readcapacity10},
/*SBC 0x25*/{dissect_sbc_readcapacity10},
/*SBC 0x26*/{NULL},
/*SBC 0x27*/{NULL},
/*SBC 0x28*/{dissect_sbc_read10},
@ -1513,7 +1513,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
/*SBC 0x34*/{dissect_sbc_prefetch10},
/*SBC 0x35*/{dissect_sbc_synchronizecache10},
/*SBC 0x36*/{NULL},
/*SBC 0x37*/{dissect_sbc2_readdefectdata10},
/*SBC 0x37*/{dissect_sbc_readdefectdata10},
/*SBC 0x38*/{NULL},
/*SBC 0x39*/{NULL},
/*SBC 0x3a*/{NULL},
@ -1616,7 +1616,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
/*SBC 0x9b*/{NULL},
/*SBC 0x9c*/{NULL},
/*SBC 0x9d*/{NULL},
/*SBC 0x9e*/{dissect_sbc2_serviceactionin16},
/*SBC 0x9e*/{dissect_sbc_serviceactionin16},
/*SBC 0x9f*/{NULL},
/*SPC 0xa0*/{dissect_spc3_reportluns},
/*SBC 0xa1*/{NULL},
@ -1641,7 +1641,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
/*SBC 0xb4*/{NULL},
/*SBC 0xb5*/{NULL},
/*SBC 0xb6*/{NULL},
/*SBC 0xb7*/{dissect_sbc2_readdefectdata12},
/*SBC 0xb7*/{dissect_sbc_readdefectdata12},
/*SBC 0xb8*/{NULL},
/*SBC 0xb9*/{NULL},
/*SBC 0xba*/{NULL},

100
epan/dissectors/packet-scsi-sbc.h
View File

@ -30,63 +30,63 @@
#define __PACKET_SCSI_SBC_H_
/* SBC Commands */
#define SCSI_SBC2_FORMATUNIT 0x04
#define SCSI_SBC2_LOCKUNLKCACHE10 0x36
#define SCSI_SBC2_LOCKUNLKCACHE16 0x92
#define SCSI_SBC2_PREFETCH10 0x34
#define SCSI_SBC2_PREFETCH16 0x90
#define SCSI_SBC2_READ6 0x08
#define SCSI_SBC2_READ10 0x28
#define SCSI_SBC2_READ12 0xA8
#define SCSI_SBC2_READ16 0x88
#define SCSI_SBC2_READCAPACITY10 0x25
#define SCSI_SBC2_SERVICEACTIONIN16 0x9E
#define SCSI_SBC2_READDEFDATA10 0x37
#define SCSI_SBC2_READDEFDATA12 0xB7
#define SCSI_SBC2_READLONG 0x3E
#define SCSI_SBC2_REASSIGNBLKS 0x07
#define SCSI_SBC2_REBUILD16 0x81
#define SCSI_SBC2_REBUILD32 0x7F
#define SCSI_SBC2_REGENERATE16 0x82
#define SCSI_SBC2_REGENERATE32 0x7F
#define SCSI_SBC2_SEEK10 0x2B
#define SCSI_SBC2_SETLIMITS10 0x33
#define SCSI_SBC2_SETLIMITS12 0xB3
#define SCSI_SBC2_STARTSTOPUNIT 0x1B
#define SCSI_SBC2_SYNCCACHE10 0x35
#define SCSI_SBC2_SYNCCACHE16 0x91
#define SCSI_SBC2_VERIFY10 0x2F
#define SCSI_SBC2_VERIFY12 0xAF
#define SCSI_SBC2_VERIFY16 0x8F
#define SCSI_SBC2_WRITE6 0x0A
#define SCSI_SBC2_WRITE10 0x2A
#define SCSI_SBC2_WRITE12 0xAA
#define SCSI_SBC2_WRITE16 0x8A
#define SCSI_SBC2_WRITENVERIFY10 0x2E
#define SCSI_SBC2_WRITENVERIFY12 0xAE
#define SCSI_SBC2_WRITENVERIFY16 0x8E
#define SCSI_SBC2_WRITELONG 0x3F
#define SCSI_SBC2_WRITESAME10 0x41
#define SCSI_SBC2_WRITESAME16 0x93
#define SCSI_SBC2_XDREAD10 0x52
#define SCSI_SBC2_XDREAD32 0x7F
#define SCSI_SBC2_XDWRITE10 0x50
#define SCSI_SBC2_XDWRITE32 0x7F
#define SCSI_SBC2_XDWRITEREAD10 0x53
#define SCSI_SBC2_XDWRITEREAD32 0x7F
#define SCSI_SBC2_XDWRITEEXTD16 0x80
#define SCSI_SBC2_XDWRITEEXTD32 0x7F
#define SCSI_SBC2_XPWRITE10 0x51
#define SCSI_SBC2_XPWRITE32 0x7F
#define SCSI_SBC_FORMATUNIT 0x04
#define SCSI_SBC_LOCKUNLKCACHE10 0x36
#define SCSI_SBC_LOCKUNLKCACHE16 0x92
#define SCSI_SBC_PREFETCH10 0x34
#define SCSI_SBC_PREFETCH16 0x90
#define SCSI_SBC_READ6 0x08
#define SCSI_SBC_READ10 0x28
#define SCSI_SBC_READ12 0xA8
#define SCSI_SBC_READ16 0x88
#define SCSI_SBC_READCAPACITY10 0x25
#define SCSI_SBC_SERVICEACTIONIN16 0x9E
#define SCSI_SBC_READDEFDATA10 0x37
#define SCSI_SBC_READDEFDATA12 0xB7
#define SCSI_SBC_READLONG 0x3E
#define SCSI_SBC_REASSIGNBLKS 0x07
#define SCSI_SBC_REBUILD16 0x81
#define SCSI_SBC_REBUILD32 0x7F
#define SCSI_SBC_REGENERATE16 0x82
#define SCSI_SBC_REGENERATE32 0x7F
#define SCSI_SBC_SEEK10 0x2B
#define SCSI_SBC_SETLIMITS10 0x33
#define SCSI_SBC_SETLIMITS12 0xB3
#define SCSI_SBC_STARTSTOPUNIT 0x1B
#define SCSI_SBC_SYNCCACHE10 0x35
#define SCSI_SBC_SYNCCACHE16 0x91
#define SCSI_SBC_VERIFY10 0x2F
#define SCSI_SBC_VERIFY12 0xAF
#define SCSI_SBC_VERIFY16 0x8F
#define SCSI_SBC_WRITE6 0x0A
#define SCSI_SBC_WRITE10 0x2A
#define SCSI_SBC_WRITE12 0xAA
#define SCSI_SBC_WRITE16 0x8A
#define SCSI_SBC_WRITENVERIFY10 0x2E
#define SCSI_SBC_WRITENVERIFY12 0xAE
#define SCSI_SBC_WRITENVERIFY16 0x8E
#define SCSI_SBC_WRITELONG 0x3F
#define SCSI_SBC_WRITESAME10 0x41
#define SCSI_SBC_WRITESAME16 0x93
#define SCSI_SBC_XDREAD10 0x52
#define SCSI_SBC_XDREAD32 0x7F
#define SCSI_SBC_XDWRITE10 0x50
#define SCSI_SBC_XDWRITE32 0x7F
#define SCSI_SBC_XDWRITEREAD10 0x53
#define SCSI_SBC_XDWRITEREAD32 0x7F
#define SCSI_SBC_XDWRITEEXTD16 0x80
#define SCSI_SBC_XDWRITEEXTD32 0x7F
#define SCSI_SBC_XPWRITE10 0x51
#define SCSI_SBC_XPWRITE32 0x7F
void dissect_sbc2_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
void dissect_sbc_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
void dissect_sbc_read12 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
void dissect_sbc_write12 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
void dissect_sbc_read10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
void dissect_sbc_write10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
void dissect_sbc2_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
void dissect_sbc_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
extern int hf_scsi_sbc_opcode;

66
epan/dissectors/packet-scsi.c
View File

@ -256,7 +256,7 @@ typedef guint32 scsi_device_type;
/* Valid SCSI Command Types */
#define SCSI_CMND_SPC2 1
#define SCSI_CMND_SBC2 2
#define SCSI_CMND_SBC 2
#define SCSI_CMND_SSC2 3
#define SCSI_CMND_SMC2 4
#define SCSI_CMND_MMC 5
@ -392,26 +392,26 @@ static const value_string scsi_spc2_modepage_val[] = {
{0, NULL},
};
#define SCSI_SBC2_MODEPAGE_RDWRERR 0x01
#define SCSI_SBC2_MODEPAGE_FMTDEV 0x03
#define SCSI_SBC2_MODEPAGE_DISKGEOM 0x04
#define SCSI_SBC2_MODEPAGE_FLEXDISK 0x05
#define SCSI_SBC2_MODEPAGE_VERERR 0x07
#define SCSI_SBC2_MODEPAGE_CACHE 0x08
#define SCSI_SBC2_MODEPAGE_MEDTYPE 0x0B
#define SCSI_SBC2_MODEPAGE_NOTPART 0x0C
#define SCSI_SBC2_MODEPAGE_XORCTL 0x10
#define SCSI_SBC_MODEPAGE_RDWRERR 0x01
#define SCSI_SBC_MODEPAGE_FMTDEV 0x03
#define SCSI_SBC_MODEPAGE_DISKGEOM 0x04
#define SCSI_SBC_MODEPAGE_FLEXDISK 0x05
#define SCSI_SBC_MODEPAGE_VERERR 0x07
#define SCSI_SBC_MODEPAGE_CACHE 0x08
#define SCSI_SBC_MODEPAGE_MEDTYPE 0x0B
#define SCSI_SBC_MODEPAGE_NOTPART 0x0C
#define SCSI_SBC_MODEPAGE_XORCTL 0x10
static const value_string scsi_sbc2_modepage_val[] = {
{SCSI_SBC2_MODEPAGE_RDWRERR, "Read/Write Error Recovery"},
{SCSI_SBC2_MODEPAGE_FMTDEV, "Format Device"},
{SCSI_SBC2_MODEPAGE_DISKGEOM, "Rigid Disk Geometry"},
{SCSI_SBC2_MODEPAGE_FLEXDISK, "Flexible Disk"},
{SCSI_SBC2_MODEPAGE_VERERR, "Verify Error Recovery"},
{SCSI_SBC2_MODEPAGE_CACHE, "Caching"},
{SCSI_SBC2_MODEPAGE_MEDTYPE, "Medium Types Supported"},
{SCSI_SBC2_MODEPAGE_NOTPART, "Notch & Partition"},
{SCSI_SBC2_MODEPAGE_XORCTL, "XOR Control"},
static const value_string scsi_sbc_modepage_val[] = {
{SCSI_SBC_MODEPAGE_RDWRERR, "Read/Write Error Recovery"},
{SCSI_SBC_MODEPAGE_FMTDEV, "Format Device"},
{SCSI_SBC_MODEPAGE_DISKGEOM, "Rigid Disk Geometry"},
{SCSI_SBC_MODEPAGE_FLEXDISK, "Flexible Disk"},
{SCSI_SBC_MODEPAGE_VERERR, "Verify Error Recovery"},
{SCSI_SBC_MODEPAGE_CACHE, "Caching"},
{SCSI_SBC_MODEPAGE_MEDTYPE, "Medium Types Supported"},
{SCSI_SBC_MODEPAGE_NOTPART, "Notch & Partition"},
{SCSI_SBC_MODEPAGE_XORCTL, "XOR Control"},
{0x3F, "Return All Mode Pages"},
{0, NULL},
};
@ -1955,13 +1955,13 @@ dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
}
static gboolean
dissect_scsi_sbc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
dissect_scsi_sbc_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *tree, guint offset, guint8 pcode)
{
guint8 flags;
switch (pcode) {
case SCSI_SBC2_MODEPAGE_FMTDEV:
case SCSI_SBC_MODEPAGE_FMTDEV:
proto_tree_add_text (tree, tvb, offset+2, 2, "Tracks Per Zone: %u",
tvb_get_ntohs (tvb, offset+2));
proto_tree_add_text (tree, tvb, offset+4, 2,
@ -1991,7 +1991,7 @@ dissect_scsi_sbc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
(flags & 0x80) >> 7, (flags & 0x40) >> 6,
(flags & 0x20) >> 5, (flags & 0x10) >> 4);
break;
case SCSI_SBC2_MODEPAGE_RDWRERR:
case SCSI_SBC_MODEPAGE_RDWRERR:
flags = tvb_get_guint8 (tvb, offset+2);
proto_tree_add_text (tree, tvb, offset+2, 1,
"AWRE: %u, ARRE: %u, TB: %u, RC: %u, EER: %u, PER: %u, DTE: %u, DCR: %u",
@ -2014,7 +2014,7 @@ dissect_scsi_sbc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
"Recovery Time Limit: %u ms",
tvb_get_ntohs (tvb, offset+10));
break;
case SCSI_SBC2_MODEPAGE_DISKGEOM:
case SCSI_SBC_MODEPAGE_DISKGEOM:
proto_tree_add_text (tree, tvb, offset+2, 3, "Number of Cylinders: %u",
tvb_get_ntoh24 (tvb, offset+2));
proto_tree_add_text (tree, tvb, offset+5, 1, "Number of Heads: %u",
@ -2035,11 +2035,11 @@ dissect_scsi_sbc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
"Medium Rotation Rate: %u",
tvb_get_ntohs (tvb, offset+20));
break;
case SCSI_SBC2_MODEPAGE_FLEXDISK:
case SCSI_SBC_MODEPAGE_FLEXDISK:
return FALSE;
case SCSI_SBC2_MODEPAGE_VERERR:
case SCSI_SBC_MODEPAGE_VERERR:
return FALSE;
case SCSI_SBC2_MODEPAGE_CACHE:
case SCSI_SBC_MODEPAGE_CACHE:
flags = tvb_get_guint8 (tvb, offset+2);
proto_tree_add_text (tree, tvb, offset+2, 1,
"IC: %u, ABPF: %u, CAP %u, Disc: %u, Size: %u, WCE: %u, MF: %u, RCD: %u",
@ -2075,11 +2075,11 @@ dissect_scsi_sbc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
"Non-Cache Segment Size: %u",
tvb_get_ntoh24 (tvb, offset+17));
break;
case SCSI_SBC2_MODEPAGE_MEDTYPE:
case SCSI_SBC_MODEPAGE_MEDTYPE:
return FALSE;
case SCSI_SBC2_MODEPAGE_NOTPART:
case SCSI_SBC_MODEPAGE_NOTPART:
return FALSE;
case SCSI_SBC2_MODEPAGE_XORCTL:
case SCSI_SBC_MODEPAGE_XORCTL:
return FALSE;
default:
return FALSE;
@ -2482,9 +2482,9 @@ dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo,
*/
switch (devtype) {
case SCSI_DEV_SBC:
modepage_val = scsi_sbc2_modepage_val;
modepage_val = scsi_sbc_modepage_val;
hf_pagecode = hf_scsi_sbcpagecode;
dissect_modepage = dissect_scsi_sbc2_modepage;
dissect_modepage = dissect_scsi_sbc_modepage;
break;
case SCSI_DEV_SSC:
@ -4206,7 +4206,7 @@ proto_register_scsi (void)
VALS (scsi_spc2_modepage_val), 0x3F, "", HFILL}},
{ &hf_scsi_sbcpagecode,
{"SBC-2 Page Code", "scsi.mode.sbc.pagecode", FT_UINT8, BASE_HEX,
VALS (scsi_sbc2_modepage_val), 0x3F, "", HFILL}},
VALS (scsi_sbc_modepage_val), 0x3F, "", HFILL}},
{ &hf_scsi_sscpagecode,
{"SSC-2 Page Code", "scsi.mode.ssc.pagecode", FT_UINT8, BASE_HEX,
VALS (scsi_ssc2_modepage_val), 0x3F, "", HFILL}},