Skip to content

Commit

Permalink
Normalize line endings (OpenEtherCATsociety#126)
Browse files Browse the repository at this point in the history
* add .gitattributes

* normalize line-endings
  • Loading branch information
hefloryd authored and nakarlsson committed Aug 16, 2017
1 parent da7d55e commit 3daefae
Show file tree
Hide file tree
Showing 13 changed files with 131 additions and 114 deletions.
17 changes: 17 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.cpp text
*.h text
*.S text
*.txt text
*.md text

# Declare files that will always have LF line endings on checkout.
*.sh text eol=lf

# Denote all files that are truly binary and should not be modified.
*.lib binary
Empty file modified CMakeLists.txt
100755 → 100644
Empty file.
68 changes: 34 additions & 34 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
Simple Open EtherCAT Master Library
Copyright (C) 2005-2017 Speciaal Machinefabriek Ketels v.o.f.
Copyright (C) 2005-2017 Arthur Ketels
Copyright (C) 2008-2009 TU/e Technische Universiteit Eindhoven
Copyright (C) 2009-2017 rt-labs AB, Sweden
SOEM is free software; you can redistribute it and/or modify it under the terms
of the GNU General Public License version 2 as published by the Free Software
Foundation.
SOEM is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details.
As a special exception, if other files instantiate templates or use macros or
inline functions from this file, or you compile this file and link it with other
works to produce a work based on this file, this file does not by itself cause
the resulting work to be covered by the GNU General Public License. However the
source code for this file must still be made available in accordance with
section (3) of the GNU General Public License.
This exception does not invalidate any other reasons why a work based on this
file might be covered by the GNU General Public License.
The EtherCAT Technology, the trade name and logo "EtherCAT" are the intellectual
property of, and protected by Beckhoff Automation GmbH. You can use SOEM for the
sole purpose of creating, using and/or selling or otherwise distributing an
EtherCAT network master provided that an EtherCAT Master License is obtained
from Beckhoff Automation GmbH.
In case you did not receive a copy of the EtherCAT Master License along with
SOEM write to Beckhoff Automation GmbH, Eiserstrasse 5, D-33415 Verl, Germany
(www.beckhoff.com).
Simple Open EtherCAT Master Library

Copyright (C) 2005-2017 Speciaal Machinefabriek Ketels v.o.f.
Copyright (C) 2005-2017 Arthur Ketels
Copyright (C) 2008-2009 TU/e Technische Universiteit Eindhoven
Copyright (C) 2009-2017 rt-labs AB, Sweden

SOEM is free software; you can redistribute it and/or modify it under the terms
of the GNU General Public License version 2 as published by the Free Software
Foundation.

SOEM is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details.

As a special exception, if other files instantiate templates or use macros or
inline functions from this file, or you compile this file and link it with other
works to produce a work based on this file, this file does not by itself cause
the resulting work to be covered by the GNU General Public License. However the
source code for this file must still be made available in accordance with
section (3) of the GNU General Public License.

This exception does not invalidate any other reasons why a work based on this
file might be covered by the GNU General Public License.

The EtherCAT Technology, the trade name and logo "EtherCAT" are the intellectual
property of, and protected by Beckhoff Automation GmbH. You can use SOEM for the
sole purpose of creating, using and/or selling or otherwise distributing an
EtherCAT network master provided that an EtherCAT Master License is obtained
from Beckhoff Automation GmbH.

In case you did not receive a copy of the EtherCAT Master License along with
SOEM write to Beckhoff Automation GmbH, Eiserstrasse 5, D-33415 Verl, Germany
(www.beckhoff.com).
26 changes: 13 additions & 13 deletions cmake/Modules/Platform/rt-kernel-C.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

message("rt-kernel-C.cmake")

# Determine toolchain
include(CMakeForceCompiler)

if(${ARCH} MATCHES "kinetis")
cmake_force_c_compiler(arm-eabi-gcc GNU)
cmake_force_cxx_compiler(arm-eabi-g++ GNU)
elseif(${ARCH} MATCHES "bfin")
cmake_force_c_compiler(bfin-elf-gcc GNU)
cmake_force_cxx_compiler(bfin-elf-g++ GNU)
endif()

message("rt-kernel-C.cmake")

# Determine toolchain
include(CMakeForceCompiler)

if(${ARCH} MATCHES "kinetis")
cmake_force_c_compiler(arm-eabi-gcc GNU)
cmake_force_cxx_compiler(arm-eabi-g++ GNU)
elseif(${ARCH} MATCHES "bfin")
cmake_force_c_compiler(bfin-elf-gcc GNU)
cmake_force_cxx_compiler(bfin-elf-g++ GNU)
endif()
6 changes: 3 additions & 3 deletions cmake/Modules/Platform/rt-kernel-gcc-bfin.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

set(MACHINE "-mcpu=bf537")
set(LDFLAGS "-T${RT_KERNEL_PATH}/bsp/${BSP}/${BSP}.ld")

set(MACHINE "-mcpu=bf537")
set(LDFLAGS "-T${RT_KERNEL_PATH}/bsp/${BSP}/${BSP}.ld")
14 changes: 7 additions & 7 deletions cmake/Modules/Platform/rt-kernel-gcc-kinetis.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

message("rt-kernel-gcc-kinetis.cmake")

#SET_PROPERTY(GLOBAL PROPERTY ARCH kinetis)
#SET_PROPERTY(GLOBAL PROPERTY BSP twrk60)

set(MACHINE "-mfpu=vfp -mcpu=cortex-m3 -mthumb")

message("rt-kernel-gcc-kinetis.cmake")

#SET_PROPERTY(GLOBAL PROPERTY ARCH kinetis)
#SET_PROPERTY(GLOBAL PROPERTY BSP twrk60)

set(MACHINE "-mfpu=vfp -mcpu=cortex-m3 -mthumb")
38 changes: 19 additions & 19 deletions cmake/Modules/Platform/rt-kernel-gcc.cmake
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@

message("rt-kernel-gcc.cmake")

set(CMAKE_C_OUTPUT_EXTENSION .o)
set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)

set(CFLAGS "${CFLAGS} -Wall -Wextra -Wno-unused-parameter -Werror")
set(CFLAGS "${CFLAGS} -fomit-frame-pointer -fno-strict-aliasing -fshort-wchar")
#set(CFLAGS" ${CFLAGS} -B$(GCC_PATH)/libexec/gcc")

set(CXXFLAGS "${CXXFLAGS} -fno-rtti -fno-exceptions")

set(LDFLAGS "${LDFLAGS} -nostartfiles")

set(CMAKE_C_FLAGS "${CFLAGS} ${MACHINE}" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS "${MACHINE} ${LDFLAGS}" CACHE STRING "")




message("rt-kernel-gcc.cmake")

set(CMAKE_C_OUTPUT_EXTENSION .o)
set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)

set(CFLAGS "${CFLAGS} -Wall -Wextra -Wno-unused-parameter -Werror")
set(CFLAGS "${CFLAGS} -fomit-frame-pointer -fno-strict-aliasing -fshort-wchar")
#set(CFLAGS" ${CFLAGS} -B$(GCC_PATH)/libexec/gcc")

set(CXXFLAGS "${CXXFLAGS} -fno-rtti -fno-exceptions")

set(LDFLAGS "${LDFLAGS} -nostartfiles")

set(CMAKE_C_FLAGS "${CFLAGS} ${MACHINE}" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS "${MACHINE} ${LDFLAGS}" CACHE STRING "")



40 changes: 20 additions & 20 deletions cmake/Modules/Platform/rt-kernel.cmake
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
if(__RTK_CMAKE_INCLUDED)
return()
endif()
set(__RTK_CMAKE_INCLUDED TRUE)
message("rt-kernel.cmake")

include_directories(
${RT_KERNEL_PATH}/include
${RT_KERNEL_PATH}/include/kern
${RT_KERNEL_PATH}/kern
${RT_KERNEL_PATH}/include/drivers
${RT_KERNEL_PATH}/include/arch/${ARCH}
${RT_KERNEL_PATH}/bsp/${BSP}/include
${RT_KERNEL_PATH}/lwip/src/include
${RT_KERNEL_PATH}/lwip/src/include/ipv4
)

link_directories(
${RT_KERNEL_PATH}/lib/${ARCH}
)
if(__RTK_CMAKE_INCLUDED)
return()
endif()
set(__RTK_CMAKE_INCLUDED TRUE)
message("rt-kernel.cmake")

include_directories(
${RT_KERNEL_PATH}/include
${RT_KERNEL_PATH}/include/kern
${RT_KERNEL_PATH}/kern
${RT_KERNEL_PATH}/include/drivers
${RT_KERNEL_PATH}/include/arch/${ARCH}
${RT_KERNEL_PATH}/bsp/${BSP}/include
${RT_KERNEL_PATH}/lwip/src/include
${RT_KERNEL_PATH}/lwip/src/include/ipv4
)

link_directories(
${RT_KERNEL_PATH}/lib/${ARCH}
)
18 changes: 9 additions & 9 deletions cmake/Toolchains/rt-kernel-bfin.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

message("rt-kernel-kinetis.cmake")

set(CMAKE_SYSTEM_NAME rt-kernel)
set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR bfin)

set(ARCH bfin CACHE STRING "Architecture")
set(BSP stamp537 CACHE STRING "Board")

message("rt-kernel-kinetis.cmake")

set(CMAKE_SYSTEM_NAME rt-kernel)
set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR bfin)

set(ARCH bfin CACHE STRING "Architecture")
set(BSP stamp537 CACHE STRING "Board")
18 changes: 9 additions & 9 deletions cmake/Toolchains/rt-kernel-kinetis.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

message("rt-kernel-kinetis.cmake")

set(CMAKE_SYSTEM_NAME rt-kernel)
set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR kinetis)

set(ARCH kinetis CACHE STRING "Architecture")
set(BSP twrk60 CACHE STRING "Board")

message("rt-kernel-kinetis.cmake")

set(CMAKE_SYSTEM_NAME rt-kernel)
set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR kinetis)

set(ARCH kinetis CACHE STRING "Architecture")
set(BSP twrk60 CACHE STRING "Board")
Empty file modified osal/linux/osal.c
100755 → 100644
Empty file.
Empty file modified soem/ethercatmain.h
100755 → 100644
Empty file.
Empty file modified test/linux/slaveinfo/CMakeLists.txt
100755 → 100644
Empty file.

0 comments on commit 3daefae

Please sign in to comment.