deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oem: name change from Newisys to Viking Enterprise Solutions

Browse Source 
Renamed the oem strings containing Newisys to Viking Enterprise Solutions.
IANA 9237
Built and tested with AMI's IPMI stack LTS 12.01.

Resolves ipmitool/ipmitool#124

Signed-off-by: dan mcgee <dan.mcgee@vikingenterprise.com>
Signed-off-by: dan mcgee <dan.mcgee@sanmina.com>
This commit is contained in:
dan mcgee 2019-06-03 15:46:05 -06:00 committed by Alexander Amelkin
parent ca7767793e
commit 8071cf7389
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ipmitool/ipmi.h
View File

@ -283,7 +283,7 @@ typedef enum IPMI_OEM {
IPMI_OEM_MAGNUM = 5593, IPMI_OEM_MAGNUM = 5593,
IPMI_OEM_TYAN = 6653, IPMI_OEM_TYAN = 6653,
IPMI_OEM_QUANTA = 7244, IPMI_OEM_QUANTA = 7244,
IPMI_OEM_NEWISYS = 9237, IPMI_OEM_VIKING = 9237,
IPMI_OEM_ADVANTECH = 10297, IPMI_OEM_ADVANTECH = 10297,
IPMI_OEM_FUJITSU_SIEMENS = 10368, IPMI_OEM_FUJITSU_SIEMENS = 10368,
IPMI_OEM_AVOCENT = 10418, IPMI_OEM_AVOCENT = 10418,

2
include/ipmitool/ipmi_sel.h
View File

@ -679,7 +679,7 @@ void ipmi_sel_print_extended_entry_verbose(struct ipmi_intf * intf, struct sel_e
void ipmi_get_event_desc(struct ipmi_intf * intf, struct sel_event_record * rec, char ** desc); void ipmi_get_event_desc(struct ipmi_intf * intf, struct sel_event_record * rec, char ** desc);
const char * ipmi_get_sensor_type(struct ipmi_intf *intf, uint8_t code); const char * ipmi_get_sensor_type(struct ipmi_intf *intf, uint8_t code);
uint16_t ipmi_sel_get_std_entry(struct ipmi_intf * intf, uint16_t id, struct sel_event_record * evt); uint16_t ipmi_sel_get_std_entry(struct ipmi_intf * intf, uint16_t id, struct sel_event_record * evt);
char * get_newisys_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec); char * get_viking_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec);
IPMI_OEM ipmi_get_oem(struct ipmi_intf * intf); IPMI_OEM ipmi_get_oem(struct ipmi_intf * intf);
char * ipmi_get_oem_desc(struct ipmi_intf * intf, struct sel_event_record * rec); char * ipmi_get_oem_desc(struct ipmi_intf * intf, struct sel_event_record * rec);
int ipmi_sel_oem_init(const char * filename); int ipmi_sel_oem_init(const char * filename);

16
lib/ipmi_sel.c
View File

@ -454,10 +454,10 @@ get_kontron_evt_desc(struct ipmi_intf *__UNUSED__(intf), struct sel_event_record
} }
char * char *
get_newisys_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec) get_viking_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
{ {
/* /*
* Newisys OEM event descriptions can be retrieved through an * Viking OEM event descriptions can be retrieved through an
* OEM IPMI command. * OEM IPMI command.
*/ */
struct ipmi_rs * rsp; struct ipmi_rs * rsp;
@ -495,17 +495,17 @@ get_newisys_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
/* Verify our response before we use it */ /* Verify our response before we use it */
if (rsp->data_len < 5) if (rsp->data_len < 5)
{ {
lprintf(LOG_ERR, "Newisys OEM response too short"); lprintf(LOG_ERR, "Viking OEM response too short");
return NULL; return NULL;
} }
else if (rsp->data_len != (4 + rsp->data[3])) else if (rsp->data_len != (4 + rsp->data[3]))
{ {
lprintf(LOG_ERR, "Newisys OEM response has unexpected length"); lprintf(LOG_ERR, "Viking OEM response has unexpected length");
return NULL; return NULL;
} }
else if (IPM_DEV_MANUFACTURER_ID(rsp->data) != IPMI_OEM_NEWISYS) else if (IPM_DEV_MANUFACTURER_ID(rsp->data) != IPMI_OEM_VIKING)
{ {
lprintf(LOG_ERR, "Newisys OEM response has unexpected length"); lprintf(LOG_ERR, "Viking OEM response has unexpected length");
return NULL; return NULL;
} }
@ -1205,8 +1205,8 @@ ipmi_get_oem_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
switch (ipmi_get_oem(intf)) switch (ipmi_get_oem(intf))
{ {
case IPMI_OEM_NEWISYS: case IPMI_OEM_VIKING:
desc = get_newisys_evt_desc(intf, rec); desc = get_viking_evt_desc(intf, rec);
break; break;
case IPMI_OEM_KONTRON: case IPMI_OEM_KONTRON:
desc = get_kontron_evt_desc(intf, rec); desc = get_kontron_evt_desc(intf, rec);