Skip to content
Snippets Groups Projects
Commit 6572c7e0 authored by Adam Wujek's avatar Adam Wujek
Browse files

arch-wrs: rename PPSI_INSTANCE_USE_PORT to PPSIEXP_PPSI_INSTANCE_USE_PORT 


Signed-off-by: default avatarAdam Wujek <dev_public@wujek.eu>
parent 74801b5e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arch-wrs/include/ppsi_exports.h
+ 1
− 1
View file @ 6572c7e0
......@@ -47,7 +47,7 @@
#define PPSIEXP_COMMAND_TRACKING_TOGGLE WRH_TRACKING_TOGGLE
#define PPSI_INSTANCE_USE_PORT 0x80000000
#define PPSIEXP_PPSI_INSTANCE_USE_PORT 0x80000000
/* Export structures, shared by server and client for argument matching */
#ifdef PPSI_EXPORT_STRUCTURES
......
arch-wrs/wrs-ipcserver.c
+ 6
− 6
View file @ 6572c7e0
......@@ -343,11 +343,11 @@ static int update_param_instance_cmd(const struct minipc_pd *pd,
char iface_name[16];
int all_ports = 0;
if (param_instance & PPSI_INSTANCE_USE_PORT) {
all_ports = (param_instance == PPSI_INSTANCE_USE_PORT);
if (param_instance & PPSIEXP_PPSI_INSTANCE_USE_PORT) {
all_ports = (param_instance == PPSIEXP_PPSI_INSTANCE_USE_PORT);
/* Execute command for all instances in a given interface */
snprintf(iface_name, 16, "wri%d",
param_instance & ~PPSI_INSTANCE_USE_PORT);
param_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT);
for (i = 0; i < get_numberPorts(GDSDEF(ppg_local)); i++) {
ppi = INST(ppg_local, i);
if (!all_ports && strcmp(iface_name, ppi->iface_name))
......@@ -410,11 +410,11 @@ static int update_param_instance_str_cmd(const struct minipc_pd *pd,
char iface_name[16];
int all_ports = 0;
if (param_instance & PPSI_INSTANCE_USE_PORT) {
all_ports = (param_instance == PPSI_INSTANCE_USE_PORT);
if (param_instance & PPSIEXP_PPSI_INSTANCE_USE_PORT) {
all_ports = (param_instance == PPSIEXP_PPSI_INSTANCE_USE_PORT);
/* Execute command for all instances in a given interface */
snprintf(iface_name, 16, "wri%d",
param_instance & ~PPSI_INSTANCE_USE_PORT);
param_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT);
for (i = 0; i < get_numberPorts(GDSDEF(ppg_local)); i++) {
ppi = INST(ppg_local, i);
if (!all_ports && strcmp(iface_name, ppi->iface_name))
......
tools/ppsi_conf.c
+ 22
− 22
View file @ 6572c7e0
......@@ -193,8 +193,8 @@ static int ppsi_set_param_instance(int param, int instance, int val)
printf("%s: set param (%d) for %s %d, val %d\n",
__func__, param,
instance & PPSI_INSTANCE_USE_PORT ? "port" : "instance",
instance & ~PPSI_INSTANCE_USE_PORT, val);
instance & PPSIEXP_PPSI_INSTANCE_USE_PORT ? "port" : "instance",
instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT, val);
minipc_call(ptp_ch, MINIPC_TIMEOUT, &ppsiexp_update_param_instance_cmd, &rval,
param, instance, val);
......@@ -207,8 +207,8 @@ static int ppsi_set_param_instance_str(int param, int instance, char *val)
printf("%s: set param (%d) for %s %d, val %s\n",
__func__, param,
instance & PPSI_INSTANCE_USE_PORT ? "port" : "instance",
instance & ~PPSI_INSTANCE_USE_PORT, val);
instance & PPSIEXP_PPSI_INSTANCE_USE_PORT ? "port" : "instance",
instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT, val);
minipc_call(ptp_ch, MINIPC_TIMEOUT,
&ppsiexp_update_param_instance_str_cmd, &rval, param,
instance, val);
......@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
printf("Setting autonegotiation for "
"%s %d to %s\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp ? "enable" : "disable");
ret = ppsi_set_param_instance(
PPSIEXP_PARAM_INST_AUTONEG_CMD,
......@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Error setting autonegotiation "
"for %s %d to %s, ret %d\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp ? "enable" : "disable", ret);
exit (1);
}
......@@ -322,7 +322,7 @@ int main(int argc, char *argv[])
printf("Setting delay request interval for "
"%s %d to %d\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp);
ret = ppsi_set_param_instance(
PPSIEXP_PARAM_INST_DELAY_REQ_INT_CMD,
......@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Error setting delay request "
"interval for %s %d to %d, ret %d\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp, ret);
exit (1);
}
......@@ -359,7 +359,7 @@ int main(int argc, char *argv[])
printf("Setting diagnostics for "
"%s %d to %s\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
optarg);
ret = ppsi_set_param_instance_str(
PPSIEXP_PARAM_INST_STR_DIAG_CMD,
......@@ -369,7 +369,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Error setting delay request "
"interval for %s %d to %s, ret %d\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
optarg, ret);
exit (1);
}
......@@ -393,7 +393,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Error setting extension for %s"
" %d to %s, wrong value\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
optarg);
exit (1);
}
......@@ -401,7 +401,7 @@ int main(int argc, char *argv[])
if (verbose)
printf("Setting extension for %s %d to %s\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp_str);
ret = ppsi_set_param_instance(
PPSIEXP_PARAM_INST_EXTENSION_CMD,
......@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Error setting extension for %s"
" %d to %s, ret %d\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp_str, ret);
exit (1);
}
......@@ -427,14 +427,14 @@ int main(int argc, char *argv[])
}
if (!strcmp("all", optarg)) {
ppsi_port = 0;
ppsi_instance = PPSI_INSTANCE_USE_PORT;
ppsi_instance = PPSIEXP_PPSI_INSTANCE_USE_PORT;
} else {
ppsi_port = -1;
}
if (verbose)
printf("Setting instance to %d%s\n",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance == PPSI_INSTANCE_USE_PORT
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
ppsi_instance == PPSIEXP_PPSI_INSTANCE_USE_PORT
? " (all)" : ""
);
......@@ -448,11 +448,11 @@ int main(int argc, char *argv[])
exit (1);
}
ppsi_port = ppsi_instance;
ppsi_instance |= PPSI_INSTANCE_USE_PORT;
ppsi_instance |= PPSIEXP_PPSI_INSTANCE_USE_PORT;
if (verbose)
printf("Setting port to %d%s\n",
ppsi_port,
ppsi_instance == PPSI_INSTANCE_USE_PORT
ppsi_instance == PPSIEXP_PPSI_INSTANCE_USE_PORT
? " (all)" : ""
);
break;
......@@ -510,7 +510,7 @@ int main(int argc, char *argv[])
if (verbose)
printf("Setting profile for %s %d to %s\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp_str);
ret = ppsi_set_param_instance(
PPSIEXP_PARAM_INST_PROFILE_CMD,
......@@ -520,7 +520,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Error setting profile for %s "
"%d to %s, ret %d\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp_str, ret);
exit (1);
}
......@@ -534,7 +534,7 @@ int main(int argc, char *argv[])
printf("Setting sync interval for %s %d"
"to %d\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp);
ret = ppsi_set_param_instance(
PPSIEXP_PARAM_INST_SYNC_INT_CMD,
......@@ -544,7 +544,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Error setting sync interval "
"for %s %d to %d, ret %d\n",
ppsi_port == -1 ? "instance" : "port",
ppsi_instance & ~PPSI_INSTANCE_USE_PORT,
ppsi_instance & ~PPSIEXP_PPSI_INSTANCE_USE_PORT,
tmp, ret);
exit (1);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment