general: remove now-unused <ppsi/diag.h>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

general: remove now-unused <ppsi/diag.h>
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
5e595126 · Alessandro Rubini · 353ad297 · 5e595126 · 5e595126 · 5e595126
Commit 5e595126 authored Mar 07, 2013 by Alessandro Rubini
29 changed files
--- a/arch-bare-i386/bare-time.c
+++ b/arch-bare-i386/bare-time.c
@@ -2,7 +2,6 @@
 * Alessandro Rubini for CERN, 2013 -- LGPL 2.1 or later
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "bare-i386.h"
 static int bare_time_get(TimeInternal *t)

--- a/arch-gnu-linux/main-loop.c
+++ b/arch-gnu-linux/main-loop.c
@@ -11,7 +11,6 @@
 #include <linux/if_ether.h>
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "posix.h"
 void posix_main_loop(struct pp_instance *ppi)

--- a/arch-gnu-linux/posix-socket.c
+++ b/arch-gnu-linux/posix-socket.c
@@ -17,7 +17,6 @@
 #include <arpa/inet.h>
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "posix.h"
 /* posix_recv_msg uses recvmsg for timestamp query */

--- a/arch-gnu-linux/posix-startup.c
+++ b/arch-gnu-linux/posix-startup.c
@@ -12,7 +12,6 @@
 #include <errno.h>
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "posix.h"
 CONST_VERBOSITY int pp_diag_verbosity = 0;

--- a/arch-gnu-linux/posix-time.c
+++ b/arch-gnu-linux/posix-time.c
@@ -8,7 +8,6 @@
 #include <time.h>
 #include <sys/timex.h>
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 static void clock_fatal_error(char *context)
 {

--- a/arch-wrpc/wrpc-socket.c
+++ b/arch-wrpc/wrpc-socket.c
@@ -6,7 +6,6 @@
 #include <syscon.h>
 #include <pps_gen.h>
 #include <minic.h>
-#include <ppsi/diag.h>
 #include <pps_gen.h>
 #include <softpll_ng.h>
 #include <ptpd_netif.h>

--- a/arch-wrpc/wrpc.h
+++ b/arch-wrpc/wrpc.h
@@ -6,7 +6,6 @@
 #define __WRPC_H
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include <hw/memlayout.h>
 /*
 * These are the functions provided by the various bare files

--- a/fsm.c
+++ b/fsm.c
@@ -2,7 +2,6 @@
 * Alessandro Rubini for CERN, 2011 -- public domain
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 unsigned long pp_global_flags; /* This is the only "global" file in ppsi */

--- a/include/ppsi/diag.h
+++ b/include/ppsi/diag.h
-/*
- * Alessandro Rubini for CERN, 2011 -- public domain
- */
-#ifndef __PPSI_DIAG_H__
-#define __PPSI_DIAG_H__
-#include <ppsi/ppsi.h>
-/*
- * The diagnostic functions
- *
- * error gets an integer, the other ones two strings (so we can
- * strerror(errno) together with the explanation. Avoid diag_printf if
- * possible, for size reasons, but here it is anyways.
- */
-static inline void pp_diag_error(struct pp_instance *ppi, int err)
-{
-	pp_printf("ERR for %p: %i\n", ppi, err);
-}
-static inline void pp_diag_error_str2(struct pp_instance *ppi,
-				      char *s1, char *s2)
-{
-	pp_printf("ERR for %p: %s %s\n", ppi, s1, s2);
-}
-#endif /* __PPSI_DIAG_H__ */
--- a/lib-bare/bare-socket.c
+++ b/lib-bare/bare-socket.c
@@ -4,7 +4,6 @@
 /* Socket interface for bare Linux */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "bare-linux.h"
 /* FIXME: which socket we receive and send with? */

--- a/lib-bare/bare-startup.c
+++ b/lib-bare/bare-startup.c
@@ -7,7 +7,6 @@
 * It must also clear the BSS as I'm too lazy to do that in asm
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "bare-linux.h"

--- a/lib-bare/bare-time.c
+++ b/lib-bare/bare-time.c
@@ -2,7 +2,6 @@
 * Alessandro Rubini for CERN, 2013 -- LGPL 2.1 or later
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "bare-linux.h"
 static int bare_time_get(TimeInternal *t)

--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -4,7 +4,6 @@
 #define CONFIG_PPSI_RUNTIME_VERBOSITY 1
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #define CMD_LINE_SEPARATOR {"", ""}

--- a/proto-ext-whiterabbit/state-wr-calibration.c
+++ b/proto-ext-whiterabbit/state-wr-calibration.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "wr-api.h"
 int wr_calibration(struct pp_instance *ppi, unsigned char *pkt, int plen)

--- a/proto-ext-whiterabbit/wr-msg.c
+++ b/proto-ext-whiterabbit/wr-msg.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "wr-api.h"
 #include "../proto-standard/common-fun.h"

--- a/proto-ext-whiterabbit/wr-servo.c
+++ b/proto-ext-whiterabbit/wr-servo.c
 #include <arch/arch.h>
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "wr-api.h"
 #define WR_SYNC_NSEC 1

--- a/proto-standard/arith.c
+++ b/proto-standard/arith.c
@@ -5,7 +5,6 @@
 #include <limits.h>
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 void int64_to_TimeInternal(Integer64 bigint, TimeInternal *internal)
 {

--- a/proto-standard/bmc.c
+++ b/proto-standard/bmc.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 /* Flag Field bits symbolic names (table 57, pag. 151) */
 #define FFB_LI61	0x01

--- a/proto-standard/common-fun.c
+++ b/proto-standard/common-fun.c
@@ -3,7 +3,6 @@
 * Based on PTPd project v. 2.1.0 (see AUTHORS for details)
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "common-fun.h"
 static void *__align_pointer(void *p)

--- a/proto-standard/common-fun.h
+++ b/proto-standard/common-fun.h
@@ -7,7 +7,6 @@
 #define __COMMON_FUN_H
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 /* Contains all functions common to more than one state */

--- a/proto-standard/msg.c
+++ b/proto-standard/msg.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "common-fun.h"
 static void Integer64_display(const char *label, Integer64 *bigint)

--- a/proto-standard/open-close.c
+++ b/proto-standard/open-close.c
@@ -3,7 +3,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 /*
 * This file deals with opening and closing an instance. The channel

--- a/proto-standard/servo.c
+++ b/proto-standard/servo.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 void pp_init_clock(struct pp_instance *ppi)
 {

--- a/proto-standard/state-faulty.c
+++ b/proto-standard/state-faulty.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 /*
 * Fault troubleshooting. Now only prints an error messages and comes back to

--- a/proto-standard/state-initializing.c
+++ b/proto-standard/state-initializing.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 /*
 * Initializes network and other stuff

--- a/proto-standard/state-listening.c
+++ b/proto-standard/state-listening.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "common-fun.h"
 int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)

--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "common-fun.h"
 int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)

--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
@@ -4,7 +4,6 @@
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include "common-fun.h"
 int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)

--- a/proto-standard/timeout.c
+++ b/proto-standard/timeout.c
@@ -2,7 +2,6 @@
 * Alessandro Rubini for CERN, 2013 -- GNU LGPL v2.1 or later
 */
 #include <ppsi/ppsi.h>
-#include <ppsi/diag.h>
 #include <ppsi/diag-macros.h>
 #define N(n) [n] = #n