Skip to content

P
PPSi
Commit 6a535b97 authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

wrpc-v5: follow up changes in the wrpc-sw API

parent 0cc9d341
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 14 deletions
Makefile
View file @ 6a535b97
......@@ -50,6 +50,7 @@ CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
CFLAGS += -O$(CONFIG_OPTIMIZATION)
CFLAGS += -ggdb -Iinclude -fno-common
CFLAGS += -DPPSI_VERSION=\"$(VERSION)\"
CFLAGS += -I$(WRPCSW_ROOT)
# to avoid ifdef as much as possible, I use the kernel trick for OBJ variables
OBJ-y := fsm.o diag.o timeout.o msgtype.o
......
arch-wrpc/wrc_ptp_ppsi.c
View file @ 6a535b97
......@@ -15,13 +15,14 @@
#include "../proto-ext-whiterabbit/wr-constants.h"
/* All of these live in wrpc-sw/include */
#include "minic.h"
#include "syscon.h"
#include "endpoint.h"
#include "dev/minic.h"
#include "dev/syscon.h"
#include "dev/endpoint.h"
#include "dev/pps_gen.h"
#include "dev/uart.h"
#include "dev/rxts_calibrator.h"
#include "softpll_ng.h"
#include "pps_gen.h"
#include "uart.h"
#include "rxts_calibrator.h"
extern int32_t cal_phase_transition;
......
arch-wrpc/wrpc-calibration.c
View file @ 6a535b97
......@@ -5,7 +5,7 @@
* Released to the public domain
*/
#include <endpoint.h>
#include <dev/endpoint.h>
#include <ppsi/ppsi.h>
#include <softpll_ng.h>
#include <hal_exports.h>
......
arch-wrpc/wrpc-io.c
View file @ 6a535b97
......@@ -6,7 +6,7 @@
*/
#include <ppsi/ppsi.h>
#include "wrpc.h"
#include "uart.h" /* wrpc-sw */
#include "dev/uart.h" /* wrpc-sw */
void pp_puts(const char *s)
{
......
arch-wrpc/wrpc-spll.c
View file @ 6a535b97
......@@ -7,10 +7,10 @@
#include <stdint.h>
#include <ppsi/ppsi.h>
#include <pps_gen.h>
#include <dev/pps_gen.h>
#include <softpll_ng.h>
#include "../proto-ext-whiterabbit/wr-constants.h"
#include <rxts_calibrator.h>
#include <dev/rxts_calibrator.h>
#include "wrpc.h"
extern uint32_t cal_phase_transition;
......
include/ppsi/ppsi.h
View file @ 6a535b97
......@@ -9,6 +9,10 @@
#define __PPSI_PPSI_H__
#include <generated/autoconf.h>
//#if defined(CONFIG_WRPCSW_ROOT)
#include "../../../include/generated/autoconf.h"
//#endif
#include <stdint.h>
#include <stdarg.h>
#include <stddef.h>
......
time-wrpc/wrpc-socket.c
View file @ 6a535b97
......@@ -8,8 +8,8 @@
#include "ptpdump.h"
#include "../arch-wrpc/wrpc.h"
#include <syscon.h> /* wrpc-sw */
#include <endpoint.h> /* wrpc-sw */
#include <dev/syscon.h> /* wrpc-sw */
#include <dev/endpoint.h> /* wrpc-sw */
#include <ptpd_netif.h> /* wrpc-sw */
int frame_rx_delay_us; /* set by faults.c */
......
time-wrpc/wrpc-time.c
View file @ 6a535b97
......@@ -6,8 +6,8 @@
* Released according to the GNU LGPL, version 2.1 or any later version.
*/
#include <ppsi/ppsi.h>
#include "pps_gen.h" /* in wrpc-sw */
#include "syscon.h" /* in wrpc-sw */
#include "dev/pps_gen.h" /* in wrpc-sw */
#include "dev/syscon.h" /* in wrpc-sw */
static int wrpc_time_get(struct pp_instance *ppi, struct pp_time *t)
{
......
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