Skip to content

M
Mock Turtle
Commit bbee11b8 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw: re-organize header files for better distribution 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent f0a42f39
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
software/Makefile
View file @ bbee11b8
...@@ -5,11 +5,11 @@ CURDIR:=$(shell /bin/pwd) ...@@ -5,11 +5,11 @@ CURDIR:=$(shell /bin/pwd)
REPO_PARENT ?= $(CURDIR)/.. REPO_PARENT ?= $(CURDIR)/..
-include $(REPO_PARENT)/parent_common.mk -include $(REPO_PARENT)/parent_common.mk
DIRS = kernel lib tools include/hw DIRS = kernel lib tools include/mockturtle/hw
all clean modules install modules_install: $(DIRS) all clean modules install modules_install: $(DIRS)
headers: include/hw headers: include/mockturtle/hw
kernel lib: headers kernel lib: headers
tools: lib tools: lib
......
software/firmware/lib/mockturtle-rt.h
View file @ bbee11b8
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
#include <stdarg.h> #include <stdarg.h>
#include <generated/autoconf.h> #include <generated/autoconf.h>
#include <hw/mockturtle_addresses.h> #include mockturtle/hw/mockturtle_addresses.h>
#include <hw/mockturtle_queue.h> #include mockturtle/hw/mockturtle_queue.h>
#include <hw/mockturtle_endpoint.h> #include mockturtle/hw/mockturtle_endpoint.h>
#include <hw/mockturtle_cpu_lr.h> #include mockturtle/hw/mockturtle_cpu_lr.h>
#include <urv/riscv.h> #include <urv/riscv.h>
......
software/include/hw/Makefile → software/include/mockturtle/hw/Makefile
View file @ bbee11b8
HEADERS := mockturtle_cpu_csr.h HEADERS := mockturtle_cpu_csr.h
HEADERS += mockturtle_cpu_lr.h HEADERS += mockturtle_cpu_lr.h
TRTL ?= ../../.. TRTL ?= ../../../..
TRTL_HDL = $(TRTL)/hdl/rtl/ TRTL_HDL = $(TRTL)/hdl/rtl/
WBGEN2 ?= wbgen2 WBGEN2 ?= wbgen2
......
software/lib/libmockturtle.h → software/include/mockturtle/libmockturtle.h
View file @ bbee11b8
...@@ -19,7 +19,7 @@ extern "C" { ...@@ -19,7 +19,7 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <poll.h> #include <poll.h>
#include "mockturtle.h" #include "mockturtle/mockturtle.h"
extern const unsigned int trtl_default_timeout_ms; extern const unsigned int trtl_default_timeout_ms;
......
software/kernel/Makefile
View file @ bbee11b8
...@@ -36,7 +36,7 @@ all modules: hw_header ...@@ -36,7 +36,7 @@ all modules: hw_header
hw_header: hw_header:
ifeq ($(DKMS), 0) ifeq ($(DKMS), 0)
$(MAKE) -C ../include/hw/ $(MAKE) -C ../include/mockturtle/hw/
endif endif
install modules_install: install modules_install:
......
software/kernel/mockturtle-core.c
View file @ bbee11b8
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <hw/mockturtle_cpu_csr.h> #include <mockturtle/hw/mockturtle_cpu_csr.h>
#include <hw/mockturtle_queue.h> #include <mockturtle/hw/mockturtle_queue.h>
#include "mockturtle-drv.h" #include "mockturtle-drv.h"
#include "mockturtle-compat.h" #include "mockturtle-compat.h"
......
software/kernel/mockturtle-cpu.c
View file @ bbee11b8
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <hw/mockturtle_cpu_csr.h> #include <mockturtle/hw/mockturtle_cpu_csr.h>
#include "mockturtle-drv.h" #include "mockturtle-drv.h"
......
software/kernel/mockturtle-dbg.c
View file @ bbee11b8
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <hw/mockturtle_cpu_csr.h> #include <mockturtle/hw/mockturtle_cpu_csr.h>
#include "mockturtle-drv.h" #include "mockturtle-drv.h"
#include "mockturtle-compat.h" #include "mockturtle-compat.h"
......
software/kernel/mockturtle-drv.h
View file @ bbee11b8
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#include <linux/circ_buf.h> #include <linux/circ_buf.h>
#include <linux/tty.h> #include <linux/tty.h>
#include "hw/mockturtle_addresses.h" #include "mockturtle/hw/mockturtle_addresses.h"
#include "hw/mockturtle_queue.h" #include "mockturtle/hw/mockturtle_queue.h"
#include "mockturtle.h" #include "mockturtle/mockturtle.h"
#define MAX_MQUEUE_SLOTS (TRTL_MAX_HMQ_SLOT / 2) #define MAX_MQUEUE_SLOTS (TRTL_MAX_HMQ_SLOT / 2)
#define TRTL_MAX_CPU_MINORS (TRTL_MAX_CPU * TRTL_MAX_CARRIER) #define TRTL_MAX_CPU_MINORS (TRTL_MAX_CPU * TRTL_MAX_CARRIER)
......
software/kernel/mockturtle-hmq.c
View file @ bbee11b8
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/circ_buf.h> #include <linux/circ_buf.h>
#include <hw/mockturtle_queue.h> #include <mockturtle/hw/mockturtle_queue.h>
#include <hw/mockturtle_cpu_csr.h> #include <mockturtle/hw/mockturtle_cpu_csr.h>
#include "mockturtle-drv.h" #include "mockturtle-drv.h"
......
software/kernel/mockturtle-tty.c
View file @ bbee11b8
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/tty_flip.h> #include <linux/tty_flip.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <hw/mockturtle_cpu_csr.h> #include <mockturtle/hw/mockturtle_cpu_csr.h>
#include "mockturtle-drv.h" #include "mockturtle-drv.h"
......
software/lib/Makefile
View file @ bbee11b8
...@@ -23,7 +23,7 @@ LOBJ := libmockturtle.o ...@@ -23,7 +23,7 @@ LOBJ := libmockturtle.o
LOBJ += libmockturtle-rt-msg.o LOBJ += libmockturtle-rt-msg.o
CFLAGS += -Wall -Werror -fPIC CFLAGS += -Wall -Werror -fPIC
CFLAGS += -I. -I$(TRTL_SW)/include CFLAGS += -I$(TRTL_SW)/include
CFLAGS += -DVERSION="\"$(GIT_VERSION)\"" CFLAGS += -DVERSION="\"$(GIT_VERSION)\""
CFLAGS += $(EXTRACFLAGS) CFLAGS += $(EXTRACFLAGS)
ARFLAGS = rcv ARFLAGS = rcv
......
software/lib/libmockturtle-internal.h
View file @ bbee11b8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef __LIBTRTL_INTERNAL_H__ #ifndef __LIBTRTL_INTERNAL_H__
#define __LIBTRTL_INTERNAL_H__ #define __LIBTRTL_INTERNAL_H__
#include "libmockturtle.h" #include <mockturtle/libmockturtle.h>
/** /**
* Maximum size for device name * Maximum size for device name
......
software/tools/Makefile
View file @ bbee11b8
...@@ -13,7 +13,7 @@ TRTL_SW = $(TRTL)/software ...@@ -13,7 +13,7 @@ TRTL_SW = $(TRTL)/software
GIT_VERSION := $(shell git describe --dirty --long --tags) GIT_VERSION := $(shell git describe --dirty --long --tags)
CFLAGS += -Wall -Werror -I$(TRTL_SW)/lib CFLAGS += -Wall -Werror
CFLAGS += -I$(TRTL_SW)/include CFLAGS += -I$(TRTL_SW)/include
CFLAGS += $(EXTRACFLAGS) CFLAGS += $(EXTRACFLAGS)
LDFLAGS += -L$(TRTL_SW)/lib LDFLAGS += -L$(TRTL_SW)/lib
......
software/tools/lsmockturtle.c
View file @ bbee11b8
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
/** /**
......
software/tools/mockturtle-buffer.c
View file @ bbee11b8
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
static void help(char *name) static void help(char *name)
{ {
......
software/tools/mockturtle-count.c
View file @ bbee11b8
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
......
software/tools/mockturtle-cpu-restart.c
View file @ bbee11b8
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
static void help() static void help()
{ {
......
software/tools/mockturtle-gdbserver.c
View file @ bbee11b8
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include <hw/mockturtle_cpu_csr.h> #include <mockturtle/hw/mockturtle_cpu_csr.h>
#define TRTL_DBG_PORT_SIZE pagesize #define TRTL_DBG_PORT_SIZE pagesize
#define TRTL_GDB_PACKET_SIZE_MAX 2048 #define TRTL_GDB_PACKET_SIZE_MAX 2048
......
software/tools/mockturtle-loader.c
View file @ bbee11b8
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
#include <getopt.h> #include <getopt.h>
......
software/tools/mockturtle-messages.c
View file @ bbee11b8
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
#include <getopt.h> #include <getopt.h>
#include <pthread.h> #include <pthread.h>
#include <unistd.h> #include <unistd.h>
......
software/tools/mockturtle-ping.c
View file @ bbee11b8
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
/** /**
......
software/tools/mockturtle-smem.c
View file @ bbee11b8
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
#include <getopt.h> #include <getopt.h>
#include <pthread.h> #include <pthread.h>
#include <time.h> #include <time.h>
......
software/tools/mockturtle-variable.c
View file @ bbee11b8
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
static void help(char *name) static void help(char *name)
{ {
......
software/tools/trtl-project-creator/templates/software/lib/libproject.c
View file @ bbee11b8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <libmockturtle.h> #include <mockturtle/libmockturtle.h>
#include <lib{{short_name}}-internal.h> #include <lib{{short_name}}-internal.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