general: rename pproto to pptp

While the code layout comes from ptp-proposal, this is a different package, now called pptp for "Portable PTP". Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Acked-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>

general: rename pproto to pptp
While the code layout comes from ptp-proposal, this is a different package, now called pptp for "Portable PTP". Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Acked-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>
6abbb213 · Alessandro Rubini · Aurelio Colosimo · 0b355da3 · 6abbb213 · 6abbb213
Commit 6abbb213 authored Jan 03, 2012 by Alessandro Rubini Committed by Aurelio Colosimo Jan 09, 2012
51 changed files
--- a/.gitignore
+++ b/.gitignore
 *.map*
 *.o
 *.a
-pproto.bin
+pptp.bin
 *.patch

--- a/MAKEALL
+++ b/MAKEALL
@@ -7,8 +7,8 @@ build_one () {
    echo "####################"
    echo "Build for " "$1"
    make -s -k $2
-    test -f pproto.o && size pproto.o
-    test -f pproto && size pproto
+    test -f pptp.o && size pptp.o
+    test -f pptp && size pptp
 }

 build_diags () {

--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ OBJCOPY         = $(CROSS_COMPILE)objcopy
 OBJDUMP         = $(CROSS_COMPILE)objdump

 # Instead of repeating "proto-daemon" over and over, bless it TARGET
-TARGET = pproto
+TARGET = pptp

 # The main target is the big object file.
 all: $(TARGET).o

--- a/arch-bare-linux/bare-io.c
+++ b/arch-bare-linux/bare-io.c
 /*
 * Alessandro Rubini for CERN, 2011 -- public domain
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "bare-linux.h"

 void pp_puts(const char *s)

--- a/arch-bare-linux/bare-linux.lds
+++ b/arch-bare-linux/bare-linux.lds
 OUTPUT_FORMAT("elf32-i386")
 OUTPUT_ARCH(i386)
-ENTRY(_pproto_start)
+ENTRY(_pptp_start)

 SECTIONS
 {
 	. = 0x10000000; /* A random address, non-standard by choice*/
 	.text : {
-		_pproto_start = .;
+		_pptp_start = .;
 		*(.boot)
 		*(.text)
 	}

--- a/arch-bare-linux/bare-socket.c
+++ b/arch-bare-linux/bare-socket.c
@@ -3,8 +3,8 @@
 */

 /* Socket interface for bare Linux */
-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>
 #include "bare-linux.h"

 /* FIXME: which socket we receive and send with? */

--- a/arch-bare-linux/bare-startup.c
+++ b/arch-bare-linux/bare-startup.c
@@ -6,13 +6,13 @@
 * This is the startup thing for "freestanding" stuff under Linux.
 * It must also clear the BSS as I'm too lazy to do that in asm
 */
-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>
 #include "bare-linux.h"

 extern int __bss_start, __bss_end;

-void pproto_clear_bss(void)
+void pptp_clear_bss(void)
 {
 	int *ptr;

@@ -23,7 +23,7 @@ void pproto_clear_bss(void)
 static struct pp_instance ppi_static;
 static struct pp_net_path net_path_static;

-void pproto_main(void)
+void pptp_main(void)
 {
 	struct pp_instance *ppi = &ppi_static; /* no malloc, one instance */


--- a/arch-bare-linux/crt0.S
+++ b/arch-bare-linux/crt0.S
@@ -4,8 +4,8 @@
 	 * Alessandro Rubini for CERN, 2011 -- GNU GPL v2 or later
 	 */
 	.section .boot, "ax"
-	.extern pproto_main
+	.extern pptp_main

-	call pproto_clear_bss /* In C, lazy me */
-	call pproto_main
+	call pptp_clear_bss /* In C, lazy me */
+	call pptp_main
 	.end
\ No newline at end of file
--- a/arch-bare-linux/main-loop.c
+++ b/arch-bare-linux/main-loop.c
@@ -6,7 +6,7 @@
 /*
 * This is the main loop for "freestanding" stuff under Linux.
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "bare-linux.h"

 /* Define other hackish stuff */

--- a/arch-bare-linux/syscalls.c
+++ b/arch-bare-linux/syscalls.c
@@ -3,7 +3,7 @@
 */
 #include <asm/unistd.h>

-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "bare-linux.h"
 #include "syscalls.h"


--- a/arch-gnu-linux/main-loop.c
+++ b/arch-gnu-linux/main-loop.c
@@ -10,8 +10,8 @@
 #include <sys/select.h>
 #include <linux/if_ether.h>

-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>
 #include "posix.h"

 void posix_main_loop(struct pp_instance *ppi)

--- a/arch-gnu-linux/posix-io.c
+++ b/arch-gnu-linux/posix-io.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 void pp_puts(const char *s)
 {

--- a/arch-gnu-linux/posix-socket.c
+++ b/arch-gnu-linux/posix-socket.c
@@ -15,8 +15,8 @@
 #include <arpa/inet.h>


-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>
 #include "posix.h"

 static int ch_check_stat = 0;

--- a/arch-gnu-linux/posix-startup.c
+++ b/arch-gnu-linux/posix-startup.c
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <errno.h>

-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>
 #include "posix.h"

 int main(int argc, char **argv)

--- a/arch-gnu-linux/posix-timer.c
+++ b/arch-gnu-linux/posix-timer.c
@@ -9,8 +9,8 @@
 #include <errno.h>
 #include <stdlib.h>

-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>
 #include "posix.h"

 /* FIXME

--- a/arch-spec/dev/endpoint.c
+++ b/arch-spec/dev/endpoint.c
@@ -4,7 +4,7 @@
 *
 * GNU LGPL 2.1 or later versions
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "../spec.h"

 #include <hw/endpoint_regs.h>

--- a/arch-spec/dev/minic.c
+++ b/arch-spec/dev/minic.c
@@ -4,7 +4,7 @@
 *
 * GNU LGPL 2.1 or later versions
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "../spec.h"
 //#include "pps_gen.h" /* for pps_gen_get_time() */


--- a/arch-spec/dev/timer.c
+++ b/arch-spec/dev/timer.c
@@ -4,7 +4,7 @@
 * based on code by Tomasz Wlostowski
 */

-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "../spec.h"



--- a/arch-spec/main-loop.c
+++ b/arch-spec/main-loop.c
@@ -6,7 +6,7 @@
 /*
 * This is the main loop for the Spec board
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "spec.h"

 void spec_main_loop(struct pp_instance *ppi)

--- a/arch-spec/spec-io.c
+++ b/arch-spec/spec-io.c
 /*
 * Alessandro Rubini for CERN, 2011 -- public domain
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include <hw/wb_uart.h>
 #include "spec.h"


--- a/arch-spec/spec-socket.c
+++ b/arch-spec/spec-socket.c
 /*
 * Alessandro Rubini for CERN, 2011 -- GNU LGPL v2.1 or later
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "spec.h"
 #include "include/gpio.h"


--- a/arch-spec/spec-startup.c
+++ b/arch-spec/spec-startup.c
 /*
 * Alessandro Rubini for CERN, 2011 -- GNU LGPL v2.1 or later
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "spec.h"
 #include "include/gpio.h"

 static struct pp_instance ppi_static;

-void pproto_main(void)
+void pptp_main(void)
 {
 	struct pp_instance *ppi = &ppi_static; /* no malloc, one instance */

@@ -35,7 +35,7 @@ void pproto_main(void)

 /* Our crt0.S is unchanged: it wants a "main" function, and "_irq_entry" too" */

-int main(void) __attribute__((alias("pproto_main")));
+int main(void) __attribute__((alias("pptp_main")));

 void _irq_entry(void)
 {

--- a/arch-spec/spec.h
+++ b/arch-spec/spec.h
 /*
 * Alessandro Rubini for CERN, 2011 -- GNU LGPL v2.1 or later
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 /*
 * These are the functions provided by the various bare files
 */
@@ -12,7 +12,7 @@ extern int spec_send_packet(struct pp_instance *ppi, void *pkt, int len);

 extern void spec_main_loop(struct pp_instance *ppi);
 extern void _irq_entry(void); /* unused, to make crt0.S happy */
-extern int main(void); /* alias to pproto_main, so crt0.S is happy */
+extern int main(void); /* alias to pptp_main, so crt0.S is happy */

 /* basics */
 extern void *memset(void *s, int c, int count);

--- a/diag/diag-no.c
+++ b/diag/diag-no.c
 /*
 * Alessandro Rubini for CERN, 2011 -- public domain
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /*
 * Having no diagnostics, just make one function that returns 0 and alias

--- a/diag/diag-printf.c
+++ b/diag/diag-printf.c
@@ -5,8 +5,8 @@
 * (please note that the vsprintf is not public domain but GPL)
 */
 #include <stdarg.h>
-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>

 #define PP_BUF 128		/* We prefer small targets */


--- a/diag/diag-yes.c
+++ b/diag/diag-yes.c
 /*
 * Alessandro Rubini for CERN, 2011 -- public domain
 */
-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>

 /*
 * This has diagnostics. It calls pp_printf (which one, we don't know)

--- a/diag/printf-full.c
+++ b/diag/printf-full.c
@@ -14,7 +14,7 @@
 #include <stdarg.h>

 /* BEGIN OF HACKS */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /* <ctype.h> */
 static inline int isdigit(int c)

--- a/include/pproto/constants.h
+++ b/include/pproto/constants.h
--- a/include/pproto/diag.h
+++ b/include/pproto/diag.h
--- a/include/pproto/ieee1588_types.h
+++ b/include/pproto/ieee1588_types.h
--- a/include/pproto/lib.h
+++ b/include/pproto/lib.h
--- a/include/pproto/pproto.h
+++ b/include/pproto/pproto.h
@@ -7,9 +7,9 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <arch/arch.h> /* ntohs and so on */
-#include <pproto/lib.h>
-#include <pproto/ieee1588_types.h>
-#include <pproto/constants.h>
+#include <pptp/lib.h>
+#include <pptp/ieee1588_types.h>
+#include <pptp/constants.h>


 /*

--- a/proto-ext-whiterabbit/ext-wr.c
+++ b/proto-ext-whiterabbit/ext-wr.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /* This is a placeholder for white rabbit extension. */
 /* TODO */
--- a/proto-standard/arith.c
+++ b/proto-standard/arith.c
@@ -2,7 +2,7 @@
 * FIXME header
 */

-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /* FIXME: This is a temp workaround. How to define it? */
 #define PP_INT_MAX 2147483647

--- a/proto-standard/bmc.c
+++ b/proto-standard/bmc.c
 /*
 * FIXME header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /* Local clock is becoming Master. Table 13 (9.3.5) of the spec. */
 void m1(struct pp_instance *ppi)

--- a/proto-standard/msg.c
+++ b/proto-standard/msg.c
@@ -2,7 +2,7 @@
 * FIXME header
 */

-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /* Unpack header from in buffer to msg_tmp_header field */
 void msg_unpack_header(void *buf, struct pp_instance *ppi)

--- a/proto-standard/open-close.c
+++ b/proto-standard/open-close.c
 /*
 * Alessandro Rubini for CERN, 2011 -- public domain
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /*
 * This file deals with opening and closing an instance. The channel

--- a/proto-standard/servo.c
+++ b/proto-standard/servo.c
@@ -2,7 +2,7 @@
 * FIXME header
 */

-#include <pproto/pproto.h>
+#include <pptp/pptp.h>


 void pp_init_clock(struct pp_instance *ppi)

--- a/proto-standard/state-common-fun.c
+++ b/proto-standard/state-common-fun.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "state-common-fun.h"

 void st_com_execute_slave(struct pp_instance *ppi)

--- a/proto-standard/state-common-fun.h
+++ b/proto-standard/state-common-fun.h
@@ -2,7 +2,7 @@
 * FIXME: header
 */

-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /* Contains all functions common to more than one state */


--- a/proto-standard/state-disabled.c
+++ b/proto-standard/state-disabled.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 int pp_disabled(struct pp_instance *ppi, unsigned char *pkt, int plen)
 {

--- a/proto-standard/state-faulty.c
+++ b/proto-standard/state-faulty.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/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
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>

 /*
 * Initializes network and other stuff

--- a/proto-standard/state-listening.c
+++ b/proto-standard/state-listening.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "state-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
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "state-common-fun.h"

 int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)

--- a/proto-standard/state-passive.c
+++ b/proto-standard/state-passive.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "state-common-fun.h"

 int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)

--- a/proto-standard/state-pre-master.c
+++ b/proto-standard/state-pre-master.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 int pp_pre_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
 {

--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "state-common-fun.h"

 int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)

--- a/proto-standard/state-table-default.c
+++ b/proto-standard/state-table-default.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>

 /*
 * This is the default state machine table. It is weak so an extension

--- a/proto-standard/state-uncalibrated.c
+++ b/proto-standard/state-uncalibrated.c
 /*
 * FIXME: header
 */
-#include <pproto/pproto.h>
+#include <pptp/pptp.h>
 #include "state-common-fun.h"

 int pp_uncalibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)

--- a/state-machine.c
+++ b/state-machine.c
 /*
 * Alessandro Rubini for CERN, 2011 -- public domain
 */
-#include <pproto/pproto.h>
-#include <pproto/diag.h>
+#include <pptp/pptp.h>
+#include <pptp/diag.h>

 /*
 * This is the state machine code. i.e. the extension-independent