Skip to content

P
PPSi
Commit 1ce9244c authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

More const-ification

parent b8dcd40f
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 18 deletions
include/ppsi/ppsi.h
View file @ 1ce9244c
......@@ -85,8 +85,8 @@ enum pp_msg_format {
PPM_MSG_FMT_MAX
};
extern struct pp_msgtype_info pp_msgtype_info[];
extern char *pp_msgtype_name[];
extern const struct pp_msgtype_info pp_msgtype_info[];
extern const char * const pp_msgtype_name[];
/* Helpers for the fsm (fsm-lib.c) */
extern int pp_lib_may_issue_sync(struct pp_instance *ppi);
......
msgtype.c
View file @ 1ce9244c
......@@ -6,7 +6,7 @@
* the numeric 0..5 is the "controlField" (magic ptpV1 numbers in byte 32).
* PP_LOG is the kind of logInterval to put in byte 33.
*/
struct pp_msgtype_info pp_msgtype_info[] = {
const struct pp_msgtype_info pp_msgtype_info[] = {
[PPM_SYNC_FMT] = {
PPM_SYNC, PP_SYNC_LENGTH,
PP_NP_EVT, MECH_E2E, 0, PP_LOG_SYNC },
......@@ -41,7 +41,7 @@ struct pp_msgtype_info pp_msgtype_info[] = {
[PPM_MANAGEMENT_FMT] = { PPM_MANAGEMENT, -1, PP_NP_GEN, MECH_E2E, 4, 0x7f},
};
char *pp_msgtype_name[] = {
const char * const pp_msgtype_name[] = {
[PPM_SYNC] = "sync",
[PPM_DELAY_REQ] = "delay_req",
[PPM_PDELAY_REQ] = "pdelay_req",
......
proto-standard/common-fun.c
View file @ 1ce9244c
......@@ -128,7 +128,7 @@ int st_com_handle_signaling(struct pp_instance *ppi, void *buf, int len)
int __send_and_log(struct pp_instance *ppi, int msglen, int chtype,enum pp_msg_format msg_fmt)
{
struct pp_msgtype_info *mf = pp_msgtype_info + msg_fmt;
const struct pp_msgtype_info *mf = pp_msgtype_info + msg_fmt;
struct pp_time *t = &ppi->last_snt_time;
TimeInterval adjust;
int ret;
......
proto-standard/msg.c
View file @ 1ce9244c
......@@ -63,14 +63,14 @@ void msg_init_header(struct pp_instance *ppi, void *buf)
}
/* set the sequence id in the buffer and update the stored one */
void __msg_set_seq_id(struct pp_instance *ppi, struct pp_msgtype_info *mf) {
void __msg_set_seq_id(struct pp_instance *ppi, const struct pp_msgtype_info *mf) {
void *buf = ppi->tx_ptp;
ppi->sent_seq[mf->msg_type]++;
*(UInteger16 *) (buf + 30) = htons(ppi->sent_seq[mf->msg_type]); /* SequenceId */
}
/* Helper used by all "msg_pack" below */
int __msg_pack_header(struct pp_instance *ppi, struct pp_msgtype_info *msg_fmt)
int __msg_pack_header(struct pp_instance *ppi, const struct pp_msgtype_info *msg_fmt)
{
void *buf = ppi->tx_ptp;
int len, log;
......@@ -103,7 +103,7 @@ static int __msg_pack_signaling(struct pp_instance *ppi,enum pp_msg_format msg_f
{
void *buf = ppi->tx_ptp;
int len;
struct pp_msgtype_info *mf = pp_msgtype_info + msg_fmt;
const struct pp_msgtype_info *mf = pp_msgtype_info + msg_fmt;
if (msg_fmt >=PPM_MSG_FMT_MAX)
return 0;
......@@ -156,7 +156,7 @@ int msg_pack_sync(struct pp_instance *ppi, struct pp_time *orig_tstamp)
{
void *buf = ppi->tx_ptp;
UInteger8 *flags8 = buf + 6;
struct pp_msgtype_info *mf = pp_msgtype_info + PPM_SYNC_FMT;
const struct pp_msgtype_info *mf = pp_msgtype_info + PPM_SYNC_FMT;
int len= __msg_pack_header(ppi, mf);
/* Header */
......@@ -212,7 +212,7 @@ static int msg_pack_announce(struct pp_instance *ppi)
{
void *buf = ppi->tx_ptp;
UInteger8 *flags8 = buf + 6;;
struct pp_msgtype_info *mf = pp_msgtype_info + PPM_ANNOUNCE_FMT;
const struct pp_msgtype_info *mf = pp_msgtype_info + PPM_ANNOUNCE_FMT;
int len= __msg_pack_header(ppi, mf);
/* Header */
......@@ -271,7 +271,7 @@ static int msg_pack_follow_up(struct pp_instance *ppi,
struct pp_time *prec_orig_tstamp)
{
void *buf = ppi->tx_ptp;
struct pp_msgtype_info *mf = pp_msgtype_info + PPM_FOLLOW_UP_FMT;
const struct pp_msgtype_info *mf = pp_msgtype_info + PPM_FOLLOW_UP_FMT;
int len= __msg_pack_header(ppi, mf);
/* Header */
......@@ -301,7 +301,7 @@ static int msg_pack_delay_req(struct pp_instance *ppi,
struct pp_time *now)
{
void *buf = ppi->tx_ptp;
struct pp_msgtype_info *mf = pp_msgtype_info + PPM_DELAY_REQ_FMT;
const struct pp_msgtype_info *mf = pp_msgtype_info + PPM_DELAY_REQ_FMT;
int len= __msg_pack_header(ppi, mf);
Integer64 correction_field;
......@@ -328,7 +328,7 @@ static int msg_pack_delay_resp(struct pp_instance *ppi,
MsgHeader *hdr, struct pp_time *rcv_tstamp)
{
void *buf = ppi->tx_ptp;
struct pp_msgtype_info *mf = pp_msgtype_info + PPM_DELAY_RESP_FMT;
const struct pp_msgtype_info *mf = pp_msgtype_info + PPM_DELAY_RESP_FMT;
int len= __msg_pack_header(ppi, mf);
Integer64 correction_field, sub_ns;
......
proto-standard/msg.h
View file @ 1ce9244c
......@@ -11,12 +11,11 @@
extern int msg_unpack_header(struct pp_instance *ppi, void *buf, int len);
extern void msg_init_header(struct pp_instance *ppi, void *buf);
extern void __msg_set_seq_id(struct pp_instance *ppi,
struct pp_msgtype_info *mf);
const struct pp_msgtype_info *mf);
extern int __msg_pack_header(struct pp_instance *ppi,
struct pp_msgtype_info *msg_fmt);
const struct pp_msgtype_info *msg_fmt);
extern void __pack_origin_timestamp(void *buf, struct pp_time *orig_tstamp);
extern void __unpack_origin_timestamp(void *buf, struct pp_time *orig_tstamp);
extern int __msg_pack_header(struct pp_instance *ppi, struct pp_msgtype_info *msg_fmt);
extern int msg_issue_pdelay_req(struct pp_instance *ppi);
......
time-wrpc/wrpc-socket.c
View file @ 1ce9244c
......@@ -118,7 +118,7 @@ static int wrpc_net_recv(struct pp_instance *ppi, void *pkt, int len,
static int wrpc_net_send(struct pp_instance *ppi, void *pkt, int len, enum pp_msg_format msg_fmt)
{
struct pp_msgtype_info *mf = pp_msgtype_info + msg_fmt;
const struct pp_msgtype_info *mf = pp_msgtype_info + msg_fmt;
int snt, drop;
struct wrpc_socket *sock;
struct wr_timestamp wr_ts;
......
timeout.c
View file @ 1ce9244c
......@@ -13,7 +13,7 @@
#define TIMEOUT_MIN_VALUE_MS (1000>>-(TIMEOUT_MIN_LOG_VALUE))
typedef struct {
char *name; /* if name==NULL then the counter is considered as free */
const char *name; /* if name==NULL then the counter is considered as free */
int ctrlFlag;
} timeOutConfig_t;
......
Markdown is supported
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