Skip to content

S
Software for White Rabbit PTP Core
Commit 8737a126 authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

minor fixes/cleanups

parent 98aac55c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 10 deletions
dev/minic.c
View file @ 8737a126
...@@ -46,14 +46,8 @@ struct wr_minic { ...@@ -46,14 +46,8 @@ struct wr_minic {
uint32_t rx_avail, rx_size; uint32_t rx_avail, rx_size;
volatile uint32_t *tx_head, *tx_base; volatile uint32_t *tx_head, *tx_base;
uint32_t tx_avail, tx_size; uint32_t tx_avail, tx_size;
int synced;
int syncing_counters;
int iface_up;
int tx_count, rx_count; int tx_count, rx_count;
uint32_t cur_rx_desc;
}; };
static struct wr_minic minic; static struct wr_minic minic;
......
dev/pps_gen.c
View file @ 8737a126
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include "pps_gen.h" #include "pps_gen.h"
#include "hw/pps_gen_regs.h" #include "hw/pps_gen_regs.h"
/* PPS Generator driver */ /* PPS Generator driver */
/* Warning: references to "UTC" in the registers DO NOT MEAN actual UTC time, it's just a plain second counter /* Warning: references to "UTC" in the registers DO NOT MEAN actual UTC time, it's just a plain second counter
...@@ -39,8 +40,8 @@ int pps_gen_adjust(int counter, int64_t how_much) ...@@ -39,8 +40,8 @@ int pps_gen_adjust(int counter, int64_t how_much)
{ {
uint32_t cr; uint32_t cr;
TRACE_DEV("Adjust: counter = %s [%c%lld]", TRACE_DEV("Adjust: counter = %s [%c%d]\n",
counter == PPSG_ADJUST_SEC ? "seconds" : "nanoseconds", how_much<0?'-':'+', abs(how_much)); counter == PPSG_ADJUST_SEC ? "seconds" : "nanoseconds", how_much<0?'-':'+', (int32_t)abs(how_much));
if(counter == PPSG_ADJUST_NSEC) if(counter == PPSG_ADJUST_NSEC)
{ {
......
wrc_ptp.c
View file @ 8737a126
...@@ -59,8 +59,6 @@ int wrc_ptp_init() ...@@ -59,8 +59,6 @@ int wrc_ptp_init()
ptpPortDS = ptpdStartup(0, NULL, &ret, &rtOpts, &ptpClockDS); ptpPortDS = ptpdStartup(0, NULL, &ret, &rtOpts, &ptpClockDS);
initDataClock(&rtOpts, &ptpClockDS); initDataClock(&rtOpts, &ptpClockDS);
displayConfigINFO(&rtOpts);
//initialize sockets //initialize sockets
if(!netInit(&ptpPortDS->netPath, &rtOpts, ptpPortDS)) if(!netInit(&ptpPortDS->netPath, &rtOpts, ptpPortDS))
{ {
......
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