Commit 51c7bc86 authored by Alessandro Rubini's avatar Alessandro Rubini

general: kill pp_memcmp

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent d60fdeed
......@@ -30,11 +30,6 @@ void *posix_memcpy(void *d, const void *s, int count)
return memcpy(d, s, count);
}
int posix_memcmp(const void *s1, const void *s2, int count)
{
return memcmp(s1, s2, count);
}
void *posix_memset(void *s, int c, int count)
{
return memset(s, c, count);
......@@ -84,9 +79,6 @@ int posix_adj_freq(Integer32 adj)
void pp_puts(const char *s)
__attribute__((alias("posix_puts")));
int pp_memcmp(const void *s1, const void *s2, int count)
__attribute__((alias("posix_memcmp")));
void *pp_memset(void *s, int c, int count)
__attribute__((alias("posix_memset")));
......
......@@ -8,7 +8,6 @@
/* What follow is the old way, being phased out */
extern void pp_puts(const char *s);
extern int pp_memcmp(const void *s1, const void *s2, int count);
extern void *pp_memset(void *s, int c, int count);
extern uint32_t __div64_32(uint64_t *n, uint32_t base);
......
......@@ -57,7 +57,5 @@ char *strcpy(char *dest, const char *src)
}
/* As a first step in removing pp_memset etc, provide aliases */
extern int pp_memcmp(const void *s1, const void *s2, int count)
__attribute__((alias("memcmp")));
extern void *pp_memset(void *s, int c, int count)
__attribute__((alias("memset")));
......@@ -132,7 +132,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
PP_VPRINTF("BMC: in bmc_dataset_cmp\n");
/* Identity comparison */
if (!pp_memcmp(ann_a->grandmasterIdentity,
if (!memcmp(ann_a->grandmasterIdentity,
ann_b->grandmasterIdentity, PP_CLOCK_IDENTITY_LENGTH)) {
/* Algorithm part2 Fig 28 */
......@@ -147,7 +147,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
ppci = DSPAR(ppi)->parentPortIdentity.clockIdentity;
if (ann_a->stepsRemoved > ann_b->stepsRemoved) {
if (!pp_memcmp(
if (!memcmp(
hdr_a->sourcePortIdentity.clockIdentity,
ppci,
PP_CLOCK_IDENTITY_LENGTH)) {
......@@ -157,7 +157,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return 1;
} else if (ann_b->stepsRemoved > ann_a->stepsRemoved) {
if (!pp_memcmp(
if (!memcmp(
hdr_b->sourcePortIdentity.clockIdentity,
ppci,
PP_CLOCK_IDENTITY_LENGTH)) {
......@@ -167,13 +167,13 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return -1;
}
} else { /* steps removed A == steps removed B */
if (!pp_memcmp(
if (!memcmp(
hdr_a->sourcePortIdentity.clockIdentity,
hdr_b->sourcePortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH)) {
PP_PRINTF("Sender=Receiver: Error -2");
return 0;
} else if ((pp_memcmp(
} else if ((memcmp(
hdr_a->sourcePortIdentity.clockIdentity,
hdr_b->sourcePortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH)) < 0)
......@@ -190,7 +190,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
if (ann_a->grandmasterClockQuality.clockAccuracy == ann_b->grandmasterClockQuality.clockAccuracy) {
if (ann_a->grandmasterClockQuality.offsetScaledLogVariance == ann_b->grandmasterClockQuality.offsetScaledLogVariance) {
if (ann_a->grandmasterPriority2 == ann_b->grandmasterPriority2) {
comp = pp_memcmp(ann_a->grandmasterIdentity, ann_b->grandmasterIdentity, PP_CLOCK_IDENTITY_LENGTH);
comp = memcmp(ann_a->grandmasterIdentity, ann_b->grandmasterIdentity, PP_CLOCK_IDENTITY_LENGTH);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -199,7 +199,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return 0;
} else {
/* Priority2 are not identical */
comp = pp_memcmp(&ann_a->grandmasterPriority2, &ann_b->grandmasterPriority2, 1);
comp = memcmp(&ann_a->grandmasterPriority2, &ann_b->grandmasterPriority2, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -209,7 +209,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
}
} else {
/* offsetScaledLogVariance are not identical */
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
comp = memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -219,7 +219,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
}
} else { /* Accuracy are not identitcal */
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockAccuracy, &ann_b->grandmasterClockQuality.clockAccuracy, 1);
comp = memcmp(&ann_a->grandmasterClockQuality.clockAccuracy, &ann_b->grandmasterClockQuality.clockAccuracy, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -228,7 +228,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return 0;
}
} else { /* ClockClass are not identical */
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
comp = memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -237,7 +237,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return 0;
}
} else { /* Priority1 are not identical */
comp = pp_memcmp(&ann_a->grandmasterPriority1, &ann_b->grandmasterPriority1, 1);
comp = memcmp(&ann_a->grandmasterPriority1, &ann_b->grandmasterPriority1, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......
......@@ -97,7 +97,7 @@ void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
/* Check if foreign master is already known */
for (i = 0; i < ppi->number_foreign_records; i++) {
if (!pp_memcmp(hdr->sourcePortIdentity.clockIdentity,
if (!memcmp(hdr->sourcePortIdentity.clockIdentity,
ppi->frgn_master[j].port_identity.
clockIdentity,
PP_CLOCK_IDENTITY_LENGTH) &&
......
......@@ -106,14 +106,14 @@ void msg_unpack_header(struct pp_instance *ppi, void *buf)
if (DSPOR(ppi)->portIdentity.portNumber ==
ppi->msg_tmp_header.sourcePortIdentity.portNumber
&& !pp_memcmp(ppi->msg_tmp_header.sourcePortIdentity.clockIdentity,
&& !memcmp(ppi->msg_tmp_header.sourcePortIdentity.clockIdentity,
DSPOR(ppi)->portIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH))
ppi->is_from_self = 1;
else
ppi->is_from_self = 0;
if (!pp_memcmp(DSPAR(ppi)->parentPortIdentity.clockIdentity,
if (!memcmp(DSPAR(ppi)->parentPortIdentity.clockIdentity,
hdr->sourcePortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH) &&
(DSPAR(ppi)->parentPortIdentity.portNumber ==
......
......@@ -113,7 +113,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (!((ppi->sent_seq_id[PPM_PDELAY_REQ] ==
hdr->sequenceId)
&& (!pp_memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
&& (!memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
ppi->msg_tmp.presp.requestingPortIdentity.
clockIdentity,
PP_CLOCK_IDENTITY_LENGTH))
......
......@@ -89,7 +89,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
msg_unpack_delay_resp(pkt, &ppi->msg_tmp.resp);
if ((pp_memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
if ((memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
ppi->msg_tmp.resp.requestingPortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH) == 0) &&
((ppi->sent_seq_id[PPM_DELAY_REQ] - 1) ==
......@@ -155,7 +155,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (!((ppi->sent_seq_id[PPM_PDELAY_REQ] ==
hdr->sequenceId)
&& (!pp_memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
&& (!memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
ppi->msg_tmp.presp.requestingPortIdentity.
clockIdentity, PP_CLOCK_IDENTITY_LENGTH))
&& (DSPOR(ppi)->portIdentity.portNumber ==
......
......@@ -120,7 +120,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
PP_VPRINTF("BMC: in bmc_dataset_cmp\n");
/* Identity comparison */
if (!pp_memcmp(ann_a->grandmasterIdentity,
if (!memcmp(ann_a->grandmasterIdentity,
ann_b->grandmasterIdentity, PP_CLOCK_IDENTITY_LENGTH)) {
/* Algorithm part2 Fig 28 */
......@@ -135,7 +135,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
ppci = DSPAR(ppi)->parentPortIdentity.clockIdentity;
if (ann_a->stepsRemoved > ann_b->stepsRemoved) {
if (!pp_memcmp(
if (!memcmp(
hdr_a->sourcePortIdentity.clockIdentity,
ppci,
PP_CLOCK_IDENTITY_LENGTH)) {
......@@ -145,7 +145,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return 1;
} else if (ann_b->stepsRemoved > ann_a->stepsRemoved) {
if (!pp_memcmp(
if (!memcmp(
hdr_b->sourcePortIdentity.clockIdentity,
ppci,
PP_CLOCK_IDENTITY_LENGTH)) {
......@@ -155,13 +155,13 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return -1;
}
} else { /* steps removed A == steps removed B */
if (!pp_memcmp(
if (!memcmp(
hdr_a->sourcePortIdentity.clockIdentity,
hdr_b->sourcePortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH)) {
PP_PRINTF("Sender=Receiver: Error -2");
return 0;
} else if ((pp_memcmp(
} else if ((memcmp(
hdr_a->sourcePortIdentity.clockIdentity,
hdr_b->sourcePortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH)) < 0)
......@@ -178,7 +178,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
if (ann_a->grandmasterClockQuality.clockAccuracy == ann_b->grandmasterClockQuality.clockAccuracy) {
if (ann_a->grandmasterClockQuality.offsetScaledLogVariance == ann_b->grandmasterClockQuality.offsetScaledLogVariance) {
if (ann_a->grandmasterPriority2 == ann_b->grandmasterPriority2) {
comp = pp_memcmp(ann_a->grandmasterIdentity, ann_b->grandmasterIdentity, PP_CLOCK_IDENTITY_LENGTH);
comp = memcmp(ann_a->grandmasterIdentity, ann_b->grandmasterIdentity, PP_CLOCK_IDENTITY_LENGTH);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -187,7 +187,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return 0;
} else {
/* Priority2 are not identical */
comp = pp_memcmp(&ann_a->grandmasterPriority2, &ann_b->grandmasterPriority2, 1);
comp = memcmp(&ann_a->grandmasterPriority2, &ann_b->grandmasterPriority2, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -197,7 +197,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
}
} else {
/* offsetScaledLogVariance are not identical */
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
comp = memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -207,7 +207,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
}
} else { /* Accuracy are not identitcal */
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockAccuracy, &ann_b->grandmasterClockQuality.clockAccuracy, 1);
comp = memcmp(&ann_a->grandmasterClockQuality.clockAccuracy, &ann_b->grandmasterClockQuality.clockAccuracy, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -216,7 +216,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return 0;
}
} else { /* ClockClass are not identical */
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
comp = memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -225,7 +225,7 @@ Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
return 0;
}
} else { /* Priority1 are not identical */
comp = pp_memcmp(&ann_a->grandmasterPriority1, &ann_b->grandmasterPriority1, 1);
comp = memcmp(&ann_a->grandmasterPriority1, &ann_b->grandmasterPriority1, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......
......@@ -88,7 +88,7 @@ void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
/* Check if foreign master is already known */
for (i = 0; i < ppi->number_foreign_records; i++) {
if (!pp_memcmp(hdr->sourcePortIdentity.clockIdentity,
if (!memcmp(hdr->sourcePortIdentity.clockIdentity,
ppi->frgn_master[j].port_identity.
clockIdentity,
PP_CLOCK_IDENTITY_LENGTH) &&
......
......@@ -103,14 +103,14 @@ void msg_unpack_header(struct pp_instance *ppi, void *buf)
if (DSPOR(ppi)->portIdentity.portNumber ==
ppi->msg_tmp_header.sourcePortIdentity.portNumber
&& !pp_memcmp(ppi->msg_tmp_header.sourcePortIdentity.clockIdentity,
&& !memcmp(ppi->msg_tmp_header.sourcePortIdentity.clockIdentity,
DSPOR(ppi)->portIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH))
ppi->is_from_self = 1;
else
ppi->is_from_self = 0;
if (!pp_memcmp(DSPAR(ppi)->parentPortIdentity.clockIdentity,
if (!memcmp(DSPAR(ppi)->parentPortIdentity.clockIdentity,
hdr->sourcePortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH) &&
(DSPAR(ppi)->parentPortIdentity.portNumber ==
......
......@@ -103,7 +103,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (!((ppi->sent_seq_id[PPM_PDELAY_REQ] ==
hdr->sequenceId)
&& (!pp_memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
&& (!memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
ppi->msg_tmp.presp.requestingPortIdentity.
clockIdentity,
PP_CLOCK_IDENTITY_LENGTH))
......
......@@ -87,7 +87,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
msg_unpack_delay_resp(pkt, &ppi->msg_tmp.resp);
if ((pp_memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
if ((memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
ppi->msg_tmp.resp.requestingPortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH) == 0) &&
((ppi->sent_seq_id[PPM_DELAY_REQ] - 1) ==
......@@ -143,7 +143,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (!((ppi->sent_seq_id[PPM_PDELAY_REQ] ==
hdr->sequenceId)
&& (!pp_memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
&& (!memcmp(DSPOR(ppi)->portIdentity.clockIdentity,
ppi->msg_tmp.presp.requestingPortIdentity.
clockIdentity, PP_CLOCK_IDENTITY_LENGTH))
&& (DSPOR(ppi)->portIdentity.portNumber ==
......
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