lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.0

Browse source
This commit is contained in:
arnaud.quette@free.fr 2011-01-26 10:35:08 +01:00
parent 26fb71b504
commit 459aaf9392
510 changed files with 40508 additions and 18859 deletions
Download patch file Download diff file Expand all files Collapse all files

30
drivers/apcsmart.c
View file

@ -48,7 +48,7 @@ upsdrv_info_t upsdrv_info = {
static int ups_status = 0, quirk_capability_overflow = 0;
static struct apc_vartab_t *vartab_lookup_char(char cmdchar)
static apc_vartab_t *vartab_lookup_char(char cmdchar)
{
int i;
@ -59,7 +59,7 @@ static struct apc_vartab_t *vartab_lookup_char(char cmdchar)
return NULL;
}
static struct apc_vartab_t *vartab_lookup_name(const char *var)
static apc_vartab_t *vartab_lookup_name(const char *var)
{
int i;
@ -73,7 +73,7 @@ static struct apc_vartab_t *vartab_lookup_name(const char *var)
/* FUTURE: change to use function pointers */
/* convert APC formatting to NUT formatting */
static char *convert_data(struct apc_vartab_t *cmd_entry, char *upsval)
static const char *convert_data(apc_vartab_t *cmd_entry, char *upsval)
{
static char tmp[128];
int tval;
@ -202,7 +202,7 @@ static int read_buf(char *buf, size_t buflen)
return ret;
}
static int poll_data(struct apc_vartab_t *vt)
static int poll_data(apc_vartab_t *vt)
{
int ret;
char tmp[SMALLBUF];
@ -241,8 +241,9 @@ static int poll_data(struct apc_vartab_t *vt)
static int query_ups(const char *var, int first)
{
int ret;
char temp[256], *ptr;
struct apc_vartab_t *vt;
char temp[256];
const char *ptr;
apc_vartab_t *vt;
vt = vartab_lookup_name(var);
@ -293,7 +294,7 @@ static void do_capabilities(void)
const char *ptr, *entptr;
char upsloc, temp[512], cmd, loc, etmp[16], *endtemp;
int nument, entlen, i, matrix, ret;
struct apc_vartab_t *vt;
apc_vartab_t *vt;
upsdebugx(1, "APC - About to get capabilities string");
/* If we can do caps, then we need the Firmware revision which has
@ -914,10 +915,11 @@ static void update_info_all(void)
upsdebugx(3, "update_info_all: done");
}
static int setvar_enum(struct apc_vartab_t *vt, const char *val)
static int setvar_enum(apc_vartab_t *vt, const char *val)
{
int i, ret;
char orig[256], temp[256], *ptr;
char orig[256], temp[256];
const char *ptr;
ret = ser_send_char(upsfd, vt->cmd);
@ -1006,7 +1008,7 @@ static int setvar_enum(struct apc_vartab_t *vt, const char *val)
return STAT_SET_HANDLED;
}
static int setvar_string(struct apc_vartab_t *vt, const char *val)
static int setvar_string(apc_vartab_t *vt, const char *val)
{
unsigned int i;
int ret;
@ -1088,7 +1090,7 @@ static int setvar_string(struct apc_vartab_t *vt, const char *val)
static int setvar(const char *varname, const char *val)
{
struct apc_vartab_t *vt;
apc_vartab_t *vt;
vt = vartab_lookup_name(varname);
@ -1111,7 +1113,7 @@ static int setvar(const char *varname, const char *val)
}
/* actually send the instcmd's char to the ups */
static int do_cmd(struct apc_cmdtab_t *ct)
static int do_cmd(apc_cmdtab_t *ct)
{
int ret;
char buf[SMALLBUF];
@ -1152,7 +1154,7 @@ static int do_cmd(struct apc_cmdtab_t *ct)
}
/* some commands must be repeated in a window to execute */
static int instcmd_chktime(struct apc_cmdtab_t *ct)
static int instcmd_chktime(apc_cmdtab_t *ct)
{
double elapsed;
time_t now;
@ -1176,7 +1178,7 @@ static int instcmd_chktime(struct apc_cmdtab_t *ct)
static int instcmd(const char *cmdname, const char *extra)
{
int i;
struct apc_cmdtab_t *ct;
apc_cmdtab_t *ct;
ct = NULL;