Skip to content

W
White Rabbit Switch - Software
Commit f1641094 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

userspace/include: move trace.h to libwr/ 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent cf028aae
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
userspace/include/libwr/switch_hw.h
View file @ f1641094
......@@ -2,7 +2,7 @@
#define __LIBWR_SWITCH_HW_H
#include <libwr/pio.h>
#include "trace.h"
#include <libwr/trace.h>
#include <libwr/pps_gen.h>
#include <libwr/fan.h>
......
userspace/include/trace.h → userspace/include/libwr/trace.h
View file @ f1641094
#ifndef __TRACE_H
#define __TRACE_H
#ifndef __LIBWR_TRACE_H
#define __LIBWR_TRACE_H
#define TRACE_INFO 0x10
#define TRACE_INFO_L1 0x11
......@@ -18,4 +18,4 @@ void trace_log_stderr();
void trace_log_file(const char *filename);
void trace_printf(const char *fname, int lineno, int level, const char *fmt, ...);
#endif
#endif /* __LIBWR_TRACE_H */
userspace/libwr/fan.c
View file @ f1641094
......@@ -24,7 +24,7 @@
#include <sys/ioctl.h>
#include <fcntl.h>
#include <unistd.h>
#include <trace.h>
#include <libwr/trace.h>
#include <libwr/pio.h>
#include <libwr/fan.h>
......
userspace/libwr/i2c.c
View file @ f1641094
......@@ -6,7 +6,7 @@
#include "i2c_bitbang.h"
#include "i2c_fpga_reg.h"
#include "trace.h"
#include <libwr/trace.h>
#include "util.h"
int i2c_init_bus(struct i2c_bus *bus)
......
userspace/libwr/i2c_bitbang.c
View file @ f1641094
......@@ -8,7 +8,7 @@
#include "i2c_bitbang.h"
#include "trace.h"
#include <libwr/trace.h>
static int32_t i2c_bitbang_transfer(struct i2c_bus* bus, uint32_t address, uint32_t to_write, uint32_t to_read, uint8_t* data);
static int32_t i2c_bitbang_scan(struct i2c_bus* bus, uint32_t address);
......
userspace/libwr/i2c_io.c
View file @ f1641094
......@@ -26,7 +26,7 @@
#include <errno.h>
#include <libwr/pio.h>
#include <trace.h>
#include <libwr/trace.h>
#include "i2c.h"
#include "i2c_io.h"
......
userspace/libwr/i2c_sfp.c
View file @ f1641094
......@@ -14,7 +14,7 @@
#include <lualib.h>
#include <libwr/pio.h>
#include "trace.h"
#include <libwr/trace.h>
#include "util.h"
#include "i2c.h"
......
userspace/libwr/pio.c
View file @ f1641094
......@@ -11,7 +11,7 @@
#include <at91/at91_pio.h>
#include <libwr/pio.h>
#include "trace.h"
#include <libwr/trace.h>
#include <libwr/shw_io.h>
#include "util.h"
......
userspace/libwr/pps_gen.c
View file @ f1641094
......@@ -14,7 +14,7 @@
#include <regs/ppsg-regs.h>
#include <libwr/switch_hw.h>
#include <trace.h>
#include <libwr/trace.h>
/* Default width (in 8ns units) of the pulses on the PPS output */
#define PPS_WIDTH 100000
......
userspace/libwr/shw_io.c
View file @ f1641094
......@@ -20,7 +20,7 @@
* You should have received a copy of the GNU General Public License...
*/
#include <libwr/pio.h>
#include <trace.h>
#include <libwr/trace.h>
#include <string.h>
#include <stdio.h>
......
userspace/libwr/trace.c
View file @ f1641094
......@@ -3,7 +3,7 @@
#include <stdarg.h>
#include <string.h>
#include <trace.h>
#include <libwr/trace.h>
static FILE *trace_file = NULL;
static int trace_to_stderr = 0;
......
userspace/libwr/util.c
View file @ f1641094
......@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/time.h>
#include <trace.h>
#include <libwr/trace.h>
#include <util.h>
void shw_udelay(uint32_t microseconds)
......
userspace/wrsw_hal/hal_config.c
View file @ f1641094
......@@ -8,7 +8,7 @@
#include <lauxlib.h>
#include <lualib.h>
#include <trace.h>
#include <libwr/trace.h>
#define HAL_CONFIG_FILE "/wr/etc/wrsw_hal.conf"
......
userspace/wrsw_hal/hal_exports.c
View file @ f1641094
......@@ -3,7 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <trace.h>
#include <libwr/trace.h>
#include <libwr/pps_gen.h> /* for direct access to DMPLL and PPS generator */
#include "wrsw_hal.h"
......
userspace/wrsw_hal/hal_main.c
View file @ f1641094
......@@ -10,7 +10,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <trace.h>
#include <libwr/trace.h>
#include <libwr/switch_hw.h>
#include <libwr/shw_io.h>
......
userspace/wrsw_hal/hal_ports.c
View file @ f1641094
......@@ -17,7 +17,7 @@
/* LOTs of hardware includes */
#include <libwr/switch_hw.h>
#include <trace.h>
#include <libwr/trace.h>
#include <libwr/pio.h>
#include <libwr/sfp_lib.h>
......
userspace/wrsw_rtud/rtu_fd.c
View file @ f1641094
......@@ -38,7 +38,7 @@
#include <fpga_io.h>
#include <regs/rtu-regs.h>
#include <trace.h>
#include <libwr/trace.h>
#include "rtu_fd.h"
#include "rtu_drv.h"
......
userspace/wrsw_rtud/rtud.c
View file @ f1641094
......@@ -38,7 +38,7 @@
#include <sys/ioctl.h>
#include <linux/if.h>
#include <trace.h>
#include <libwr/trace.h>
#include <libwr/switch_hw.h>
#include <hal_client.h>
......
userspace/wrsw_rtud/rtud_exports.c
View file @ f1641094
......@@ -31,7 +31,7 @@
#include <stdint.h>
#include <errno.h>
#include <trace.h>
#include <libwr/trace.h>
#include "minipc.h"
#include "rtu.h"
......
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