Skip to content

P
PPSi
Commit 3ed50d56 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

trivial: arch-bare-x86-64: checkpatch fixes 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent c52bb3e1
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 95 deletions
arch-bare-x86-64/bare-io.c
View file @ 3ed50d56
......@@ -71,7 +71,7 @@ int pp_memcmp(const void *cs, const void *ct, int count)
const unsigned char *su1, *su2;
int res = 0;
for( su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
if ((res = *su1 - *su2) != 0)
break;
return res;
......@@ -108,21 +108,21 @@ int bare_adj_freq(Integer32 adj)
{
struct bare_timex t;
if (adj > PP_ADJ_FREQ_MAX)
adj = PP_ADJ_FREQ_MAX;
else if (adj < -PP_ADJ_FREQ_MAX)
adj = -PP_ADJ_FREQ_MAX;
if (adj > PP_ADJ_FREQ_MAX)
adj = PP_ADJ_FREQ_MAX;
else if (adj < -PP_ADJ_FREQ_MAX)
adj = -PP_ADJ_FREQ_MAX;
t.modes = MOD_FREQUENCY;
t.freq = adj * ((1 << 16) / 1000);
t.modes = MOD_FREQUENCY;
t.freq = adj * ((1 << 16) / 1000);
return !sys_adjtimex(&t);
return !sys_adjtimex(&t);
}
int32_t pp_set_tstamp(TimeInternal *t)
__attribute__((alias("bare_set_tstamp")));
__attribute__((alias("bare_set_tstamp")));
void pp_get_tstamp(TimeInternal *t)
__attribute__((alias("bare_get_tstamp")));
__attribute__((alias("bare_get_tstamp")));
int pp_adj_freq(Integer32 adj)
__attribute__((alias("bare_adj_freq")));
__attribute__((alias("bare_adj_freq")));
arch-bare-x86-64/bare-socket.c
View file @ 3ed50d56
......@@ -17,22 +17,21 @@ int bare_recv_packet(struct pp_instance *ppi, void *pkt, int len,
if (t)
pp_get_tstamp(t);
return sys_recv(NP(ppi)->ch[PP_NP_GEN].fd,
return sys_recv(NP(ppi)->ch[PP_NP_GEN].fd,
pkt - NP(ppi)->proto_ofst, len, 0);
}
int bare_send_packet(struct pp_instance *ppi, void *pkt, int len,
int bare_send_packet(struct pp_instance *ppi, void *pkt, int len,
TimeInternal *t, int chtype, int use_pdelay_addr)
{
struct bare_ethhdr *hdr;
hdr = PROTO_HDR(pkt);
hdr->h_proto = htons(ETH_P_1588);
if (OPTS(ppi)->gptp_mode) {
if (OPTS(ppi)->gptp_mode)
memcpy(hdr->h_dest, PP_PEER_MACADDRESS, 6);
} else {
else
memcpy(hdr->h_dest, PP_MCAST_MACADDRESS, 6);
}
/* raw socket implementation always uses gen socket */
memcpy(hdr->h_source, NP(ppi)->ch[PP_NP_GEN].addr, 6);
......@@ -40,19 +39,19 @@ int bare_send_packet(struct pp_instance *ppi, void *pkt, int len,
if (t)
pp_get_tstamp(t);
return sys_send(NP(ppi)->ch[chtype].fd, hdr,
return sys_send(NP(ppi)->ch[chtype].fd, hdr,
len + NP(ppi)->proto_ofst, 0);
}
int pp_recv_packet(struct pp_instance *ppi, void *pkt, int len, TimeInternal *t)
__attribute__((alias("bare_recv_packet")));
int pp_send_packet(struct pp_instance *ppi, void *pkt, int len,
int pp_send_packet(struct pp_instance *ppi, void *pkt, int len,
TimeInternal *t, int chtype, int use_pdelay_addr)
__attribute__((alias("bare_send_packet")));
#define SHUT_RD 0
#define SHUT_WR 1
#define SHUT_RDWR 2
#define SHUT_WR 1
#define SHUT_RDWR 2
#define PF_PACKET 17
#define SOCK_RAW 3
......@@ -60,7 +59,7 @@ int pp_send_packet(struct pp_instance *ppi, void *pkt, int len,
/* To open a channel we must bind to an interface and so on */
int bare_open_ch(struct pp_instance *ppi, char *ifname)
{
int sock = -1;
int sock = -1;
int temp, iindex;
struct bare_ifreq ifr;
struct bare_sockaddr_ll addr_ll;
......@@ -68,10 +67,10 @@ int bare_open_ch(struct pp_instance *ppi, char *ifname)
if (OPTS(ppi)->ethernet_mode) {
/* open socket */
sock = sys_socket(PF_PACKET, SOCK_RAW, ETH_P_1588);
sock = sys_socket(PF_PACKET, SOCK_RAW, ETH_P_1588);
if (sock < 0) {
pp_diag_error(ppi, bare_errno);
pp_diag_fatal(ppi, "socket()", "");
pp_diag_fatal(ppi, "socket()", "");
sys_close(sock);
return -1;
}
......@@ -82,34 +81,34 @@ int bare_open_ch(struct pp_instance *ppi, char *ifname)
if (sys_ioctl(sock, SIOCGIFINDEX, &ifr) < 0) {
pp_diag_error(ppi, bare_errno);
pp_diag_fatal(ppi, "ioctl(GIFINDEX)", "");
sys_close(sock);
sys_close(sock);
return -1;
}
iindex = ifr.ifr_ifru.index;
if (sys_ioctl(sock, SIOCGIFHWADDR, &ifr) < 0) {
pp_diag_error(ppi, bare_errno);
pp_diag_fatal(ppi, "ioctl(GIFHWADDR)", "");
pp_diag_fatal(ppi, "ioctl(GIFHWADDR)", "");
sys_close(sock);
return -1;
}
memcpy(NP(ppi)->ch[PP_NP_GEN].addr,
ifr.ifr_ifru.ifru_hwaddr.sa_data, 6);
ifr.ifr_ifru.ifru_hwaddr.sa_data, 6);
memcpy(NP(ppi)->ch[PP_NP_EVT].addr,
ifr.ifr_ifru.ifru_hwaddr.sa_data, 6);
ifr.ifr_ifru.ifru_hwaddr.sa_data, 6);
/* bind */
memset(&addr_ll, 0, sizeof(addr_ll));
addr_ll.sll_family = PF_PACKET;
addr_ll.sll_protocol = htons(ETH_P_1588);
addr_ll.sll_ifindex = iindex;
if (sys_bind(sock, (struct bare_sockaddr *)&addr_ll,
if (sys_bind(sock, (struct bare_sockaddr *)&addr_ll,
sizeof(addr_ll)) < 0) {
pp_diag_error(ppi, bare_errno);
pp_diag_fatal(ppi, "bind", "");
pp_diag_fatal(ppi, "bind", "");
sys_close(sock);
return -1;
return -1;
}
/* accept the multicast address for raw-ethernet ptp */
......@@ -131,7 +130,7 @@ int bare_open_ch(struct pp_instance *ppi, char *ifname)
/* make timestamps available through recvmsg() -- FIXME: hw? */
sys_setsockopt(sock, SOL_SOCKET, SO_TIMESTAMP,
&temp, sizeof(int));
&temp, sizeof(int));
return 0;
}
......@@ -144,16 +143,16 @@ int bare_net_init(struct pp_instance *ppi)
ppi->buf_out = PROTO_PAYLOAD(ppi->buf_out);
if (OPTS(ppi)->ethernet_mode) {
PP_PRINTF("bare_net_init IEEE 802.3\n");
PP_PRINTF("bare_net_init IEEE 802.3\n");
/* raw sockets implementation always use gen socket */
return bare_open_ch(ppi, OPTS(ppi)->iface_name);
}
/* raw sockets implementation always use gen socket */
return bare_open_ch(ppi, OPTS(ppi)->iface_name);
}
/* else: UDP */
PP_PRINTF("bare_net_init UDP\n");
/* else: UDP */
PP_PRINTF("bare_net_init UDP\n");
return 0;
return 0;
}
int pp_net_init(struct pp_instance *ppi)
__attribute__((alias("bare_net_init")));
......
arch-bare-x86-64/bare-startup.c
View file @ 3ed50d56
......@@ -61,7 +61,7 @@ void ppsi_main(void)
OPTS(ppi)->iface_name = "eth0";
#ifdef PPSI_SLAVE
OPTS(ppi)->slave_only = 1;
OPTS(ppi)->slave_only = 1;
#endif
bare_main_loop(ppi);
......
arch-bare-x86-64/bare-timer.c
View file @ 3ed50d56
......@@ -9,7 +9,7 @@ int bare_timer_init(struct pp_instance *ppi)
{
uint32_t i;
for(i =0; i<PP_TIMER_ARRAY_SIZE; i++)
for (i = 0; i < PP_TIMER_ARRAY_SIZE; i++)
ppi->timers[i] = &bare_timers[i];
return 0;
......@@ -17,9 +17,9 @@ int bare_timer_init(struct pp_instance *ppi)
int bare_timer_start(uint32_t interval_ms, struct pp_timer *tm)
{
struct bare_timeval now;
struct bare_timeval now;
sys_clock_gettime(CLOCK_MONOTONIC, &now);
tm->start = ((uint64_t)(now.tv_sec)) * 1000 +
tm->start = ((uint64_t)(now.tv_sec)) * 1000 +
(now.tv_nsec / 1000000);
tm->interval_ms = interval_ms;
return 0;
......@@ -39,12 +39,12 @@ int bare_timer_expired(struct pp_timer *tm)
uint64_t now_ms;
if (tm->start == 0) {
PP_PRINTF("%p Warning: bare_timer_expired: timer not started\n",tm);
PP_PRINTF("%s: Warning: timer %p not started\n", __func__, tm);
return 0;
}
sys_clock_gettime(CLOCK_MONOTONIC, &now);
now_ms = ((uint64_t)(now.tv_sec)) * 1000 +
now_ms = ((uint64_t)(now.tv_sec)) * 1000 +
(now.tv_nsec / 1000000);
if (now_ms > tm->start + tm->interval_ms) {
......
arch-bare-x86-64/bare-x86-64.h
View file @ 3ed50d56
......@@ -78,14 +78,13 @@ struct bare_sockaddr_ll {
#define SOL_SOCKET 1
/* from uapi/linux/if_ether.h */
#define ETH_ALEN 6 /* Octets in one ethernet addr */
#define ETH_ALEN 6 /* Octets in one ethernet addr */
/* start copy from linux/socket.h */
/* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx */
#define SOL_IP 0
/* #define SOL_ICMP 1 No-no-no! Due to Linux :-) we cannot use
SOL_ICMP=1 */
/* #define SOL_ICMP 1 No-no-no! We cannot use SOL_ICMP=1 */
#define SOL_TCP 6
#define SOL_UDP 17
#define SOL_IPV6 41
......@@ -123,10 +122,10 @@ struct bare_sockaddr_ll {
/* start copy from uapi/linux/if_packet.h */
struct bare_packet_mreq {
int mr_ifindex;
unsigned short mr_type;
unsigned short mr_alen;
unsigned char mr_address[8];
int mr_ifindex;
unsigned short mr_type;
unsigned short mr_alen;
unsigned char mr_address[8];
};
#define PACKET_MR_MULTICAST 0
......@@ -211,34 +210,34 @@ struct bare_timeval {
#define MOD_TIMECONST ADJ_TIMECONST
struct bare_timex {
unsigned int modes; /* mode selector */
long offset; /* time offset (usec) */
long freq; /* frequency offset (scaled ppm) */
long maxerror; /* maximum error (usec) */
long esterror; /* estimated error (usec) */
int status; /* clock command/status */
long constant; /* pll time constant */
long precision; /* clock precision (usec) (read only) */
long tolerance; /* clock frequency tolerance (ppm)
* (read only)
*/
struct bare_timeval time; /* (read only) */
long tick; /* (modified) usecs between clock ticks */
long ppsfreq; /* pps frequency (scaled ppm) (ro) */
long jitter; /* pps jitter (us) (ro) */
int shift; /* interval duration (s) (shift) (ro) */
long stabil; /* pps stability (scaled ppm) (ro) */
long jitcnt; /* jitter limit exceeded (ro) */
long calcnt; /* calibration intervals (ro) */
long errcnt; /* calibration errors (ro) */
long stbcnt; /* stability limit exceeded (ro) */
int tai; /* TAI offset (ro) */
int :32; int :32; int :32; int :32;
int :32; int :32; int :32; int :32;
int :32; int :32; int :32;
unsigned int modes; /* mode selector */
long offset; /* time offset (usec) */
long freq; /* frequency offset (scaled ppm) */
long maxerror; /* maximum error (usec) */
long esterror; /* estimated error (usec) */
int status; /* clock command/status */
long constant; /* pll time constant */
long precision; /* clock precision (usec) (read only) */
long tolerance; /* clock frequency tolerance (ppm)
* (read only)
*/
struct bare_timeval time; /* (RO, except for ADJ_SETOFFSET) */
long tick; /* (modified) usecs between clock ticks */
long ppsfreq; /* pps frequency (scaled ppm) (ro) */
long jitter; /* pps jitter (us) (ro) */
int shift; /* interval duration (s) (shift) (ro) */
long stabil; /* pps stability (scaled ppm) (ro) */
long jitcnt; /* jitter limit exceeded (ro) */
long calcnt; /* calibration intervals (ro) */
long errcnt; /* calibration errors (ro) */
long stbcnt; /* stability limit exceeded (ro) */
int tai; /* TAI offset (ro) */
int :32; int :32; int :32; int :32;
int :32; int :32; int :32; int :32;
int :32; int :32; int :32;
};
......
arch-bare-x86-64/syscalls.c
View file @ 3ed50d56
......@@ -22,7 +22,7 @@ int __syscall_error(void)
{
register int err_no __asm__ ("%rcx");
__asm__ ("mov %rax, %rcx\n\t"
"neg %rcx");
"neg %rcx");
bare_errno = err_no; /* changed for ptp-proposal/proto */
return -1;
}
......@@ -41,7 +41,7 @@ int __syscall_error(void)
extern long syscall(uint64_t n, uint64_t arg1, uint64_t arg2, uint64_t arg3,
uint64_t arg4, uint64_t arg5, uint64_t arg6);
int write(int fd, const void * buf, int count)
int write(int fd, const void *buf, int count)
{
return syscall(__NR_write, (uint64_t)fd, (uint64_t)buf, (uint64_t)count,
0, 0, 0);
......@@ -53,13 +53,13 @@ int exit(int exitcode)
0, 0, 0);
}
int time(long * t)
int time(long *t)
{
return syscall(__NR_time, (uint64_t)t, 0, 0,
0, 0, 0);
}
int ioctl(int fd, int cmd, void * arg)
int ioctl(int fd, int cmd, void *arg)
{
return syscall(__NR_ioctl, (uint64_t)fd, (uint64_t)cmd, (uint64_t)arg,
0, 0, 0);
......@@ -107,7 +107,7 @@ int sys_send(int fd, void *pkt, int plen, int flags)
(uint64_t)plen, (uint64_t)flags, 0, 0);
}
int sys_setsockopt(int fd, int level, int optname, const void *optval,
int sys_setsockopt(int fd, int level, int optname, const void *optval,
int optlen)
{
return syscall(__NR_setsockopt, (uint64_t)fd, (uint64_t)level,
......@@ -117,32 +117,32 @@ int sys_setsockopt(int fd, int level, int optname, const void *optval,
int sys_close(int fd)
{
return syscall(__NR_close, (uint64_t)fd, 0,
0, 0, 0, 0);
0, 0, 0, 0);
}
int sys_shutdown(int fd, int flags)
{
return syscall(__NR_shutdown, (uint64_t)fd, (uint64_t)flags,
0, 0, 0, 0);
return syscall(__NR_shutdown, (uint64_t)fd, (uint64_t)flags,
0, 0, 0, 0);
}
int sys_gettimeofday(void *tv, void *z)
{
return syscall(__NR_gettimeofday, (uint64_t)tv, (uint64_t)z,
0, 0, 0, 0);
return syscall(__NR_gettimeofday, (uint64_t)tv, (uint64_t)z,
0, 0, 0, 0);
}
int sys_settimeofday(void *tv, void *z)
{
return syscall(__NR_settimeofday, (uint64_t)tv, (uint64_t)z,
0, 0, 0, 0);
0, 0, 0, 0);
}
int sys_adjtimex(void *tv)
{
return syscall(__NR_adjtimex, (uint64_t)tv, 0,
0, 0, 0, 0);
return syscall(__NR_adjtimex, (uint64_t)tv, 0,
0, 0, 0, 0);
}
int sys_clock_gettime(int clock, void *t)
{
return syscall(__NR_clock_gettime, (uint64_t)clock, (uint64_t)t,
0, 0, 0, 0);
return syscall(__NR_clock_gettime, (uint64_t)clock, (uint64_t)t,
0, 0, 0, 0);
}
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