diff -ur mpt-status-1.1.5/doc/Changelog mpt-status-1.2.0-RC1/doc/Changelog --- mpt-status-1.1.5/doc/Changelog 2006-03-04 15:55:38.000000000 +0100 +++ mpt-status-1.2.0-RC1/doc/Changelog 2006-03-05 13:37:01.000000000 +0100 @@ -1,3 +1,10 @@ +2006-03-05, ratz [ratz@drugphish.ch]: + o doc/Changelog + - fixed overly long line + o mpt-status.c + - added human readable output for IM, IME, IS, which is nothing + else than RAID0, RAID1E and RAID1. + 2006-03-04, ratz [ratz@drugphish.ch]: * Version: 1.1.5 [released] (Codename: Sebnem) o doc/README @@ -33,7 +40,8 @@ o mpt-status.{ch} - s/log_id/vol_id/ in the first line if -s is submitted - added --probe_id which will probe for the first scsi id - - fixed a long standing bug resulting in a coredump when using the -d parameter + - fixed a long standing bug resulting in a coredump when using + the -d parameter - moved print_status_only, id_of_primary_device, ioc_unit into global context, so there is no need to pass those variables through the stack all the time diff -ur mpt-status-1.1.5/mpt-status.c mpt-status-1.2.0-RC1/mpt-status.c --- mpt-status-1.1.5/mpt-status.c 2006-03-04 14:22:13.000000000 +0100 +++ mpt-status-1.2.0-RC1/mpt-status.c 2006-03-05 13:35:21.000000000 +0100 @@ -223,7 +223,8 @@ RaidVolumePage0_t *page; RaidPhysDiskPage0_t *phys; //IOCPage5_t *ioc_hotspare; - char *VolumeTypes[] = { "IS", "IME", "IM" }; + static char *VolumeTypes[] = { "IS", "IME", "IM" }; + static char *VolumeTypesHuman[] = { "RAID 0", "RAID 1E", "RAID 1" }; int i; int ioc = 0; @@ -253,13 +254,15 @@ if (1 == print_status_only) { printf("vol_id %d", page->VolumeID); } else { - printf("ioc%d vol_id %d type %s, %d phy, %d GB", - page->VolumeIOC, - page->VolumeID, - page->VolumeType < sizeof(VolumeTypes) ? + printf("ioc%d vol_id %d type %s [%s], %d phy, %d GB", + page->VolumeIOC, + page->VolumeID, + page->VolumeType < sizeof(VolumeTypes) ? VolumeTypes[page->VolumeType] : "unknown", - page->NumPhysDisks, - page->MaxLBA / (2 * 1024 * 1024)); + page->VolumeType < sizeof(VolumeTypes) ? + VolumeTypesHuman[page->VolumeType] : "", + page->NumPhysDisks, + page->MaxLBA / (2 * 1024 * 1024)); printf(", state"); } if (page->VolumeStatus.State == MPI_RAIDVOL0_STATUS_STATE_OPTIMAL)