Commit 7373cc02 authored by Aurelio Colosimo's avatar Aurelio Colosimo

fix defines and includes for compilation inside wrpc-sw

Two main problems where found when compiling into wrpc-sw, commit
e00d99f82:

- wrpc_sw/include/hw/memlayout.h defines some symbols into a header file
(I think they should be defined there as "extern" and actually declared
somewhere else);
- there was an include to be removed

The simple solution for the first issue is to define __REGS_H where
the compiler complains; the better solution, to me, is to follow include
chain to discover who is including memlayout.h, or define those symbols as
extern.
Signed-off-by: Aurelio Colosimo's avatarAurelio Colosimo <aurelio@aureliocolosimo.it>
parent fec023b3
......@@ -8,7 +8,7 @@
*/
#include <stdint.h>
#include <errno.h>
#define __REGS_H
#include <ppsi/ppsi.h>
#include "wrpc.h"
#include "../proto-ext-whiterabbit/wr-api.h"
......
......@@ -2,9 +2,11 @@
* Aurelio Colosimo for CERN, 2012 -- public domain
*/
#define __REGS_H
#include <endpoint.h>
#include <ppsi/ppsi.h>
#include <softpll_ng.h>
#include <hal_exports.h>
#include "wrpc.h"
#include "../proto-ext-whiterabbit/wr-constants.h"
......
/*
* Alessandro Rubini for CERN, 2011 -- public domain
*/
#define __REGS_H
#include <ppsi/ppsi.h>
#include "wrpc.h"
#include "uart.h" /* wrpc-sw */
......
/*
* Alessandro Rubini for CERN, 2011 -- GNU LGPL v2.1 or later
*/
#define __REGS_H
#include <ppsi/ppsi.h>
#include "wrpc.h"
#include "ptpdump.h"
......
......@@ -2,6 +2,7 @@
* Alessandro Rubini for CERN, 2013 -- LGPL 2.1 or later
* (Mostly code by Tomasz Wlostowski in wrpc-sw)
*/
#define __REGS_H
#include <ppsi/ppsi.h>
#include "wrpc.h"
#include "pps_gen.h" /* in wrpc-sw */
......
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