Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Libsocketcan merge #106

Open
wants to merge 89 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
d9b6577
initial create libsocketcan-nl project
Nov 20, 2009
529838a
fix header checking, add dist header
Nov 20, 2009
64c23c6
rename set_link and switch to static. remove internally used structs …
Nov 20, 2009
0e3319d
update copyright, remove obsolete prints
Nov 23, 2009
8c25d8d
Lindent
Nov 23, 2009
9b33290
add get/set raw ctrlmode callbacks
Nov 23, 2009
12a155a
rename API functions
Nov 23, 2009
9c5c109
change fixed char size in strncmp
Nov 23, 2009
0c3e5a7
fix printf format
Nov 23, 2009
dc90880
fix noinst header
Nov 23, 2009
7e041b9
remove own copy of can/netlink.h file
Nov 23, 2009
bae25c1
fixed dependency in .pc file
Nov 23, 2009
bbac00b
move internally used defines away from header
Nov 23, 2009
022be45
fix set_restart callback
Nov 23, 2009
ba5cc5b
add set_bitrate callback
Nov 23, 2009
fb19f0e
change get_state/restart_ms function prototype
Nov 23, 2009
dc8f25b
switch netif_up/down to internal static function
Nov 23, 2009
c730352
move internally used defines away from header
Nov 23, 2009
4a8daa7
changed licence to LGPL
Nov 23, 2009
d8940fa
switch back to trunk
Nov 24, 2009
0e6e5fa
fix header check in configure.ac
Nov 24, 2009
6cfd09a
v0.0.2
Nov 24, 2009
c3fa1d8
switch version back to trunk
Nov 24, 2009
6809185
add .gitignore file
Nov 25, 2009
14bb106
API change
Nov 25, 2009
cfcc904
update libtool version due to API change
Nov 25, 2009
5acb738
fix linkerflag in .pc file
Nov 25, 2009
6f73bd1
add set samplepoint value to set_bitrate
Nov 25, 2009
5b2ef2f
add get clock callbacks
Nov 25, 2009
d480c2c
v0.0.3
Nov 25, 2009
338a640
switch version back to trunk
Nov 25, 2009
32c72a4
removed duplicated code in get_ callbacks
Nov 26, 2009
1751269
remove internal netif_up/down callbacks and export them
Nov 26, 2009
257877f
rename library and API prefix
Nov 27, 2009
b2306d4
splitted up set_bitrate
Nov 27, 2009
bedbd37
update libtool version
Nov 27, 2009
96b6e75
lindent, remove debug print
Nov 27, 2009
73a4999
v0.0.4
Nov 27, 2009
463ac87
Add can_get_bittiming_const()
grandwolf Dec 1, 2009
8373c1f
switch version back to trunk
Dec 1, 2009
d6747aa
update libtool revision
Dec 4, 2009
f38c3b6
v0.0.5
Dec 4, 2009
7ee625b
switch version back to trunk
Dec 4, 2009
6f0eac7
add doxygen documentation
Dec 7, 2009
917c6fb
fix typo
Dec 11, 2009
d75a02c
remove dependency on kernel header include
Dec 11, 2009
3f2a397
add dist doc files
Dec 15, 2009
94e9370
v0.0.6
Dec 15, 2009
c9f7a3d
switch back to trunk
Dec 15, 2009
7422435
fix distinstall of can_netlink.h
Dec 15, 2009
fbb55a4
v0.0.7
Dec 15, 2009
1183583
fix header install
Feb 14, 2010
298e6ef
add get error counter call
Feb 14, 2010
1b50d55
change libtool library versioning
Feb 14, 2010
cbe29b6
add berr counter call prototype to library header
Feb 14, 2010
33f96f9
v0.0.8
Feb 14, 2010
3632866
switch back to trunk
Feb 14, 2010
9f1be15
configure: disable debug by default, turn off maintainer mode
marckleinebudde Oct 25, 2010
d99010f
libsocketcan: remove trailing whitespace
marckleinebudde Oct 25, 2010
42a3b65
tests: remove test example
marckleinebudde Oct 18, 2011
6db5d77
add can_get_device_stats()
Oct 12, 2011
3a2cec6
allow linking from c++
Oct 12, 2011
5b990a4
configure: fix tests/GNUmakefile.in not found regression
marckleinebudde Dec 16, 2011
5ba2310
Modified do_get_nl_link to potentially process multiple netlink dump …
Aug 3, 2012
10a2051
configure.ac: enable AM_SILENT_RULES
marckleinebudde Nov 6, 2012
e1a224b
v0.0.9
marckleinebudde Nov 6, 2012
58f117a
configure.ac: back to trunk
marckleinebudde Nov 6, 2012
94094cc
Use strcmp instead of sizeof on char* string
Nov 14, 2012
d5deaf6
libsocketcan: add LICENSE file
Nov 28, 2012
9a889d5
build: avoid expansion of commented macros
jengelh Dec 30, 2012
8ec77c4
build: fix bracket imbalance
jengelh Dec 30, 2012
9db8e13
README: typos and beautification
yegorich Jan 16, 2014
d946985
Use "%u" printf-format specifier for unsigned variable
shcgit Jan 31, 2014
9a28d69
Optimize can_do_restart() function
shcgit Jan 31, 2014
24500fc
libsocketcan: Fix return value for get{set}_link() function
shcgit Feb 3, 2014
0c4609f
libsocketcan: Remove excess gotos.
shcgit Feb 7, 2014
c503a5b
configure.ac: add hints from autoupdate
rschwebel Mar 19, 2014
c2f7f8e
autogen-oldtools.sh: remove
marckleinebudde Mar 19, 2014
51f1610
v0.0.10
marckleinebudde Mar 19, 2014
4608afb
configure: back to trunk
marckleinebudde Mar 24, 2014
0c91940
GNUmakefile: include LICENSE file in tarball
marckleinebudde Mar 24, 2014
5938ac7
Update CAN netlink header
nebaruzdin Jul 21, 2014
4ea9ec7
Update can_set_ctrlmode() documentation
nebaruzdin Jul 21, 2014
f5392c3
Fix parse_rtattr() does not completely initialize
LeoRuan Aug 4, 2018
6f13cef
Get link information only from specified interface
LeoRuan Aug 4, 2018
9679a3f
Add interface to retrieve link statistics
LeoRuan Aug 4, 2018
15af38a
Add compile option to disable error logging
LeoRuan Aug 4, 2018
b217774
Add configure switch for error logging
MarkAtBosch Aug 9, 2018
b10cc9a
Merge branch 'master' of https://git.pengutronix.de/git/tools/libsock…
marckleinebudde Oct 4, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ GNUmakefile.in
/config.log
/config.status
/config/autoconf/
/config/libsocketcan.pc
/config/m4/libtool.m4
/config/m4/ltoptions.m4
/config/m4/ltsugar.m4
/config/m4/ltversion.m4
/config/m4/lt~obsolete.m4
/include/libsocketcan_config.h.in

/asc2log
/bcmserver
Expand Down
35 changes: 35 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
cmake_minimum_required(VERSION 3.3)

project(can-utils LANGUAGES C)
set(LIB_CURRENT 4)
set(LIB_REVISION 1)
set(LIB_AGE 2)
math(EXPR LIB_SOVERSION "${LIB_CURRENT} - ${LIB_AGE}")
set(LIB_VERSION ${LIB_SOVERSION}.${LIB_AGE}.${LIB_REVISION})

include (GNUInstallDirs)

Expand All @@ -14,6 +19,7 @@ endif()

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-parentheses")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSO_RXQ_OVFL=40")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPF_CAN=29")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DAF_CAN=PF_CAN")
Expand Down Expand Up @@ -73,6 +79,35 @@ add_library(j1939 STATIC
libj1939.c
)

add_library(socketcan SHARED
libsocketcan.c
)

set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix \${prefix})
set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
set(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
configure_file(config/libsocketcan.pc.in config/libsocketcan.pc @ONLY)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/config/libsocketcan.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)

set_target_properties(socketcan
PROPERTIES PUBLIC_HEADER include/libsocketcan.h
SOVERSION ${LIB_SOVERSION}
VERSION ${LIB_VERSION}
)

install(TARGETS socketcan
LIBRARY
DESTINATION lib
COMPONENT Development
PUBLIC_HEADER
DESTINATION include
COMPONENT Development
)

foreach(name ${PROGRAMS})
add_executable(${name} ${name}.c)

Expand Down
9 changes: 9 additions & 0 deletions Documentation/main.dox
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/** @mainpage libsocketcan

This is libsocketcan, a userspace library to do some common tasks while dealing
with the socketcan Framework.

@defgroup extern External API
@defgroup intern Interally used callbacks and structures

*/
Loading