summaryrefslogtreecommitdiff
path: root/util/ihealth.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-05-08 23:32:28 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-05-08 23:32:28 +0200
commit55adddbc16f65732b57ab8585c47001fced91d77 (patch)
tree27e8239d48c8a6b353db356aff92ee4d225c0a0e /util/ihealth.c
parentd3c90cdcdf56146af89056ed36bfcc7b4d4956c5 (diff)
Imported Upstream version 2.9.9upstream/2.9.9
Diffstat (limited to 'util/ihealth.c')
-rw-r--r--util/ihealth.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/util/ihealth.c b/util/ihealth.c
index 76f1121..abc7fdb 100644
--- a/util/ihealth.c
+++ b/util/ihealth.c
@@ -74,7 +74,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
extern int get_BiosVersion(char *str);
extern int get_SystemGuid(uchar *guid);
extern int GetSDR(int id, int *next, uchar *recdata, int srecdata, int *rlen);
-extern int get_device_guid(char *pbuf, int *sz); /*subs.c*/
+extern int get_device_guid(uchar *pbuf, int *sz); /*subs.c*/
extern int oem_supermicro_get_health(char *pstr, int sz); /*oem_supermicro.c*/
extern int oem_supermicro_get_firmware_str(char *pstr, int sz); /*oem_supermicro.c*/
@@ -82,7 +82,7 @@ extern int oem_supermicro_get_firmware_str(char *pstr, int sz); /*oem_supermicro
* Global variables
*/
static char * progname = "ihealth";
-static char * progver = "2.98";
+static char * progver = "2.99";
static char fdebug = 0;
static char fipmilan = 0;
static char fcanonical = 0;
@@ -604,11 +604,15 @@ void show_devid_all(int dtype, uchar *devrec, int sdevrec)
if (prod >= 0x200) prodstr = "(iRMC S2)";
else prodstr = "";
break;
- case VENDOR_CISCO: /*=0x00168b*/
+ case VENDOR_CISCO: /*=0x00168b, 5771.*/
if (prod == 0x0005) prodstr = "(UCS C200)";
else prodstr = "";
if (fipmilan) lan_ch_restrict = 1; /*fw bug, gets 0xC1 on ipmilan*/
break;
+ case 0x003C0A: /*=15370, Giga-Byte*/
+ prodstr = "";
+ lan_ch_restrict = 1; /*fw bug, gets 0xC1*/
+ break;
case VENDOR_INTEL: /*=0x000157*/
if (do_hsc && (dtype == BMC)) /*if HSC option, also show extra*/
sprintf(extraver," (Boot %x.%x PIA %x.%x)", /*BMC extra*/
@@ -796,7 +800,7 @@ int GetPowerOnHours(unsigned int *val)
char *decode_selftest(int stat)
{
- uchar *s;
+ char *s;
uchar b;
if (stat == 0x0055) s = "(OK)";
else {