minor fixes/cleanups

8737a126 · Tomasz Wlostowski · 98aac55c · 8737a126 · 8737a126 · 8737a126
Commit 8737a126 authored Jun 13, 2012 by Tomasz Wlostowski
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 10 deletions

minic.c dev/minic.c +0 -6

pps_gen.c dev/pps_gen.c +3 -2

wrc_ptp.c wrc_ptp.c +0 -2

No files found.
--- a/dev/minic.c
+++ b/dev/minic.c
@@ -46,14 +46,8 @@ struct wr_minic {
  uint32_t rx_avail, rx_size;
  volatile uint32_t *tx_head, *tx_base;
  uint32_t tx_avail, tx_size;
-
-  int synced;
-  int syncing_counters;
-  int iface_up;
  
  int tx_count, rx_count;
-
-  uint32_t cur_rx_desc;
 };

 static struct wr_minic minic;

--- a/dev/pps_gen.c
+++ b/dev/pps_gen.c
@@ -2,6 +2,7 @@
 #include "pps_gen.h"

 #include "hw/pps_gen_regs.h"
+
 /* PPS Generator driver */

 /* 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)
 {
  uint32_t cr;

-  TRACE_DEV("Adjust: counter = %s [%c%lld]", 
-  	counter == PPSG_ADJUST_SEC ? "seconds" : "nanoseconds", how_much<0?'-':'+', abs(how_much));
+  TRACE_DEV("Adjust: counter = %s [%c%d]\n", 
+  	counter == PPSG_ADJUST_SEC ? "seconds" : "nanoseconds", how_much<0?'-':'+', (int32_t)abs(how_much));

 	if(counter == PPSG_ADJUST_NSEC)
 	{

--- a/wrc_ptp.c
+++ b/wrc_ptp.c
@@ -59,8 +59,6 @@ int wrc_ptp_init()
  ptpPortDS = ptpdStartup(0, NULL, &ret, &rtOpts, &ptpClockDS);
  initDataClock(&rtOpts, &ptpClockDS);

-  displayConfigINFO(&rtOpts);
-
  //initialize sockets
  if(!netInit(&ptpPortDS->netPath, &rtOpts, ptpPortDS))
  {