summaryrefslogtreecommitdiff
path: root/util/oem_dell.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/oem_dell.c
parentd3c90cdcdf56146af89056ed36bfcc7b4d4956c5 (diff)
Imported Upstream version 2.9.9upstream/2.9.9
Diffstat (limited to 'util/oem_dell.c')
-rw-r--r--util/oem_dell.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/util/oem_dell.c b/util/oem_dell.c
index e700ebd..4fa7e5f 100644
--- a/util/oem_dell.c
+++ b/util/oem_dell.c
@@ -132,7 +132,7 @@ char NIC_Selection_Mode_String_12g[] [50] = {
"shared with failover all loms"
};
-static char * progver = "2.98";
+static char * progver = "2.99";
static char * progname = "idelloem";
static int verbose = 0;
static char fdebug = 0;
@@ -399,7 +399,7 @@ ipmi_delloem_password_policy(void * intf, int argc, char ** argv)
{
int rv = 0;
int rsp_len;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
uint8_t rsp[IPMI_RSPBUF_SIZE];
uint8_t bval;
@@ -889,7 +889,7 @@ ipmi_lcd_get_platform_model_name (void * intf,
{
uint8_t rsp[IPMI_RSPBUF_SIZE];
int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
IPMI_DELL_LCD_STRING * lcdstringblock;
int lcdstring_len = 0;
@@ -967,7 +967,7 @@ ipmi_idracvalidator_command (void * intf)
{
uint8_t rsp[IPMI_RSPBUF_SIZE];
int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
memset (&req,0,sizeof(req));
@@ -1024,7 +1024,7 @@ ipmi_lcd_get_configure_command_wh (void * intf)
{
uint8_t rsp[IPMI_RSPBUF_SIZE];
int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
req.msg.netfn = IPMI_NETFN_APP;
@@ -1068,7 +1068,7 @@ ipmi_lcd_get_configure_command (void * intf,
{
uint8_t rsp[IPMI_RSPBUF_SIZE];
int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
req.msg.netfn = IPMI_NETFN_APP;
@@ -1114,7 +1114,7 @@ ipmi_lcd_set_configure_command (void * intf, int command)
uint8_t rsp[IPMI_RSPBUF_SIZE];
int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[2];
req.msg.netfn = IPMI_NETFN_APP;
@@ -1159,7 +1159,7 @@ ipmi_lcd_set_configure_command_wh (void * intf,
uint8_t rsp[IPMI_RSPBUF_SIZE];
int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[13];
ipmi_lcd_get_configure_command_wh(intf);
@@ -1248,7 +1248,7 @@ ipmi_lcd_get_single_line_text (void * intf, char* lcdstring, uint8_t max_length)
{
uint8_t rsp[IPMI_RSPBUF_SIZE];
int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
IPMI_DELL_LCD_STRING * lcdstringblock;
int lcdstring_len = 0;
@@ -1322,7 +1322,7 @@ ipmi_lcd_get_info_wh(void * intf)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
uint8_t command = 0;
IPMI_DELL_LCD_CAPS* lcd_caps;
@@ -1449,7 +1449,7 @@ ipmi_lcd_get_info_wh(void * intf)
static int ipmi_lcd_get_info(void * intf)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
IPMI_DELL_LCD_CAPS * lcd_caps;
uint8_t command = 0;
@@ -1531,7 +1531,7 @@ static int
ipmi_lcd_get_status_val(void * intf, LCD_STATUS* lcdstatus)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
@@ -1588,7 +1588,7 @@ static int IsLCDSupported ()
static void CheckLCDSupport(void * intf)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
LcdSupported = 0;
@@ -1695,7 +1695,7 @@ ipmi_lcd_set_kvm(void * intf, char status)
LCD_STATUS lcdstatus;
int rc=0;
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[5];
rc=ipmi_lcd_get_status_val(intf,&lcdstatus);
if (rc < 0)
@@ -1737,7 +1737,7 @@ ipmi_lcd_set_lock(void * intf, char lock)
LCD_STATUS lcdstatus;
int rc =0;
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[5];
rc=ipmi_lcd_get_status_val(intf,&lcdstatus);
if (rc < 0)
@@ -1777,7 +1777,7 @@ static int
ipmi_lcd_set_single_line_text (void * intf, char * text)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[18];
int bytes_to_store = strlen_(text);
int bytes_stored = 0;
@@ -1858,7 +1858,7 @@ ipmi_lcd_set_text(void * intf, char * text, int line_number)
int rc = 0;
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
IPMI_DELL_LCD_CAPS * lcd_caps;
@@ -3431,7 +3431,7 @@ static int
ipmi_get_power_capstatus_command (void * intf)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[2];
req.msg.netfn = IPMI_DELL_OEM_NETFN;
@@ -3473,7 +3473,7 @@ static int
ipmi_set_power_capstatus_command (void * intf,uint8_t val)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[2];
if(ipmi_get_power_capstatus_command(intf) < 0)
return -1;
@@ -3767,7 +3767,7 @@ static uint32_t btuphr_to_watt_conversion(uint64_t powerinbtuphr)
static int ipmi_get_power_headroom_command (void * intf,uint8_t unit)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint64_t peakpowerheadroombtuphr;
uint64_t instantpowerhearoom;
@@ -3809,8 +3809,8 @@ static int ipmi_get_power_headroom_command (void * intf,uint8_t unit)
}
else
{
- printf ("System Instantaneous Headroom : %ld W\n",powerheadroom.instheadroom);
- printf ("System Peak Headroom : %ld W\n",powerheadroom.peakheadroom);
+ printf ("System Instantaneous Headroom : %d W\n",powerheadroom.instheadroom);
+ printf ("System Peak Headroom : %d W\n",powerheadroom.peakheadroom);
}
return 0;
@@ -3926,7 +3926,7 @@ static int ipmi_get_instan_power_consmpt_data(void* intf,
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req={0};
+ struct ipmi_rq req;
uint8_t msg_data[2];
@@ -4056,7 +4056,7 @@ static int ipmi_print_get_power_consmpt_data(void* intf,uint8_t unit)
static int ipmi_get_avgpower_consmpt_history(void* intf,IPMI_AVGPOWER_CONSUMP_HISTORY* pavgpower )
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
req.msg.netfn = IPMI_NETFN_APP;
@@ -4114,7 +4114,7 @@ static int ipmi_get_peakpower_consmpt_history(void* intf,IPMI_POWER_CONSUMP_HIST
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
req.msg.netfn = IPMI_NETFN_APP;
@@ -4180,7 +4180,7 @@ static int ipmi_get_minpower_consmpt_history(void* intf,IPMI_POWER_CONSUMP_HISTO
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[4];
req.msg.netfn = IPMI_NETFN_APP;
@@ -4207,7 +4207,7 @@ static int ipmi_get_minpower_consmpt_history(void* intf,IPMI_POWER_CONSUMP_HISTO
if (verbose > 1)
{
- printf("Peak power consmhistory Data : %x %x %x %x %x %x %x %x %x %x\n %x %x %x %x %x %x %x %x %x %x %x %x %x\n\n",
+ printf("Peak power consmhistory Data : %x %x %x %x %x %x %x %x %x %x\n %x %x %x %x %x %x %x %x %x %x %x %x %x %x\n\n",
rsp[0], rsp[1], rsp[2], rsp[3],
rsp[4], rsp[5], rsp[6], rsp[7],
rsp[8], rsp[9], rsp[10], rsp[11],
@@ -4401,7 +4401,7 @@ static int ipmi_print_power_consmpt_history(void* intf,int unit )
static int ipmi_get_power_cap(void* intf,IPMI_POWER_CAP* ipmipowercap )
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req={0};
+ struct ipmi_rq req;
//uint64_t tempbtuphrconv;
uint8_t data[4];
@@ -4505,7 +4505,7 @@ static int ipmi_print_power_cap(void* intf,uint8_t unit )
static int ipmi_set_power_cap(void* intf,int unit,int val )
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req={0};
+ struct ipmi_rq req;
uint8_t data[13];
uint16_t powercapval;
uint64_t maxpowerbtuphr;
@@ -4552,7 +4552,7 @@ static int ipmi_set_power_cap(void* intf,int unit,int val )
}
if (verbose > 1)
{
- printf("power cap Data :%x %x %x %x %x %x %x %x %x %x ",
+ printf("power cap Data :%x %x %x %x %x %x %x %x %x %x %x",
rsp[1], rsp[2], rsp[3],
rsp[4], rsp[5], rsp[6], rsp[7],
rsp[8], rsp[9], rsp[10],rsp[11]);
@@ -5142,7 +5142,7 @@ static int
CheckSetLEDSupport(void * intf)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[10];
SetLEDSupported = 0;
@@ -5186,7 +5186,7 @@ static int
ipmi_getdrivemap(void * intf, int b, int d, int f, int *bay, int *slot)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[8];
/* Get mapping of BDF to bay:slot */
@@ -5240,7 +5240,7 @@ static int
ipmi_setled_state (void * intf, int bayId, int slotId, int state)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[20];
/* Issue Drive Status Update to bay:slot */
@@ -5278,7 +5278,7 @@ ipmi_setled_state (void * intf, int bayId, int slotId, int state)
int ipmi_delloem_getled_state (void * intf, uint8_t *state)
{
uint8_t rsp[IPMI_RSPBUF_SIZE]; int rsp_len, rv;
- struct ipmi_rq req = {0};
+ struct ipmi_rq req;
uint8_t data[2];
uint8_t led_state = 0;