Merge pull request #487 from olerem/isobusfs

Implement ISOBUS File Server (FS) Interface as a Personal Project
linux-can · Feb 2, 2024 · 8a2619c · 8a2619c
2 parents 186bd96 + 42edaea
commit 8a2619c
Show file tree

Hide file tree

Showing 31 changed files with 9,784 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,8 @@ GNUmakefile.in
 /cansend
 /cansequence
 /cansniffer
+/isobusfs-cli
+/isobusfs-srv
 /isotpdump
 /isotpperf
 /isotprecv

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,6 +53,11 @@ set(PROGRAMS_J1939
     testj1939
 )
 
+set(PROGRAMS_ISOBUSFS
+    isobusfs-srv
+    isobusfs-cli
+)
+
 set(PROGRAMS
     ${PROGRAMS_CANLIB}
     canfdtest
@@ -86,6 +91,7 @@ add_executable(mcp251xfd-dump
 
 if(NOT ANDROID)
   list(APPEND PROGRAMS ${PROGRAMS_J1939})
+  list(APPEND PROGRAMS ${PROGRAMS_ISOBUSFS})
 
   add_library(j1939 STATIC
       libj1939.c

diff --git a/GNUmakefile.am b/GNUmakefile.am
@@ -13,6 +13,14 @@ LDADD = \
 
 noinst_HEADERS = \
 	canframelen.h \
+	isobusfs/isobusfs_cli.h \
+	isobusfs/isobusfs_cmn.h \
+	isobusfs/isobusfs_cmn_cm.h \
+	isobusfs/isobusfs_cmn_dh.h \
+	isobusfs/isobusfs_cmn_fa.h \
+	isobusfs/isobusfs_cmn_fh.h \
+	isobusfs/isobusfs_cmn_va.h \
+	isobusfs/isobusfs_srv.h \
 	lib.h \
 	libj1939.h \
 	terminal.h \
@@ -75,6 +83,13 @@ EXTRA_DIST += \
 	mcp251xfd/devcoredump \
 	mcp251xfd/mcp251xfd-gen-testdata.sh
 
+lib_LTLIBRARIES = \
+	libisobusfs.la
+
+libisobusfs_la_SOURCES = \
+	isobusfs/isobusfs_cmn.c \
+	isobusfs/isobusfs_cmn_dh.c
+
 bin_PROGRAMS = \
 	asc2log \
 	can-calc-bit-timing \
@@ -87,6 +102,8 @@ bin_PROGRAMS = \
 	cansend \
 	cansequence \
 	cansniffer \
+	isobusfs-cli \
+	isobusfs-srv \
 	isotpdump \
 	isotpperf \
 	isotprecv \
@@ -112,6 +129,33 @@ bin_PROGRAMS += \
 	isotpserver
 endif
 
+isobusfs_cli_SOURCES = \
+	isobusfs/isobusfs_cli.c \
+	isobusfs/isobusfs_cli_cm.c \
+	isobusfs/isobusfs_cli_dh.c \
+	isobusfs/isobusfs_cli_fa.c \
+	isobusfs/isobusfs_cli_selftests.c \
+	isobusfs/isobusfs_cli_int.c
+
+isobusfs_cli_LDADD = \
+	libisobusfs.la \
+	libj1939.la \
+	libcan.la
+
+isobusfs_srv_SOURCES = \
+	isobusfs/isobusfs_srv.c \
+	isobusfs/isobusfs_srv_cm.c \
+	isobusfs/isobusfs_srv_cm_fss.c \
+	isobusfs/isobusfs_srv_dh.c \
+	isobusfs/isobusfs_srv_fa.c \
+	isobusfs/isobusfs_srv_fh.c \
+	isobusfs/isobusfs_srv_vh.c
+
+isobusfs_srv_LDADD = \
+	libisobusfs.la \
+	libj1939.la \
+	libcan.la
+
 j1939acd_LDADD = libj1939.la
 j1939cat_LDADD = libj1939.la
 j1939spy_LDADD = libj1939.la

diff --git a/Makefile b/Makefile
@@ -63,6 +63,10 @@ CPPFLAGS += \
 PROGRAMS_CANGW := \
 	cangw
 
+PROGRAMS_ISOBUSFS := \
+	isobusfs-srv \
+	isobusfs-cli
+
 PROGRAMS_ISOTP := \
 	isotpdump \
 	isotpperf \
@@ -89,6 +93,7 @@ PROGRAMS_SLCAN := \
 
 PROGRAMS := \
 	$(PROGRAMS_CANGW) \
+	$(PROGRAMS_ISOBUSFS) \
 	$(PROGRAMS_ISOTP) \
 	$(PROGRAMS_J1939) \
 	$(PROGRAMS_SLCAN) \
@@ -139,6 +144,8 @@ j1939cat.o:	libj1939.h
 j1939spy.o:	libj1939.h
 j1939sr.o:	libj1939.h
 testj1939.o:	libj1939.h
+isobusfs_srv.o:		libj1939.h lib.h
+isobusfs_c.o:		libj1939.h lib.h
 canframelen.o:  canframelen.h
 
 asc2log:	asc2log.o	lib.o
@@ -156,6 +163,21 @@ j1939cat:	j1939cat.o	libj1939.o
 j1939spy:	j1939spy.o	libj1939.o
 j1939sr:	j1939sr.o	libj1939.o
 testj1939:	testj1939.o	libj1939.o
+isobusfs-srv:	isobusfs_srv.o isobusfs_cmn.o libj1939.o lib.o \
+			isobusfs_srv_cm.o \
+			isobusfs_srv_cm_fss.o \
+			isobusfs_srv_dh.o \
+			isobusfs_srv_fa.o \
+			isobusfs_srv_fh.o \
+			isobusfs_srv_vh.o \
+			isobusfs_cmn_dh.o
+
+isobusfs-cli:	isobusfs_cli.o isobusfs_cmn.o libj1939.o lib.o \
+			isobusfs_cli_cm.o \
+			isobusfs_cli_dh.o \
+			isobusfs_cli_fa.o \
+			isobusfs_cli_selftests.o \
+			isobusfs_cli_int.o
 canbusload:	canbusload.o	canframelen.o
 
 can-calc-bit-timing: calc-bit-timing/can-calc-bit-timing.o