--- a/Doxyfile.in Thu Sep 06 19:52:17 2012 +0200
+++ b/Doxyfile.in Thu Sep 06 20:22:24 2012 +0200
@@ -14,198 +14,198 @@
# Project related configuration options
#---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file that
-# follow. The default is UTF-8 which is also the encoding used for all text before
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
+# This tag specifies the encoding used for all characters in the config file that
+# follow. The default is UTF-8 which is also the encoding used for all text before
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
# possible encodings.
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = "IgH EtherCAT Master"
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = @VERSION@
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = doxygen-output
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
# otherwise cause performance problems for the file system.
CREATE_SUBDIRS = NO
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
OUTPUT_LANGUAGE = English
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
# Set to NO to disable this.
BRIEF_MEMBER_DESC = YES
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
# brief descriptions will be completely suppressed.
REPEAT_BRIEF = YES
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
# description.
ALWAYS_DETAILED_SEC = NO
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
# operators of the base classes will not be shown.
INLINE_INHERITED_MEMB = NO
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
FULL_PATH_NAMES = NO
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
# path to strip.
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
# (thus requiring an explicit @brief command for a brief description.)
JAVADOC_AUTOBRIEF = YES
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
# an explicit \brief command for a brief description.)
QT_AUTOBRIEF = NO
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
# description. Set this tag to YES if you prefer the old behaviour instead.
MULTILINE_CPP_IS_BRIEF = YES
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
+# If set to NO, the detailed description appears after the member
# documentation.
DETAILS_AT_TOP = YES
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
# re-implements.
INHERIT_DOCS = YES
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
# be part of the file/class/namespace that contains it.
SEPARATE_MEMBER_PAGES = NO
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
TAB_SIZE = 4
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
# of all members will be omitted, etc.
OPTIMIZE_OUTPUT_FOR_C = YES
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
# will look different, etc.
OPTIMIZE_OUTPUT_JAVA = NO
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
-# include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
+# include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = NO
@@ -215,17 +215,17 @@
CPP_CLI_SUPPORT = NO
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
# all members of a group must be documented explicitly.
DISTRIBUTE_GROUP_DOC = NO
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
# the \nosubgrouping command.
SUBGROUPING = YES
@@ -234,349 +234,349 @@
# Build related configuration options
#---------------------------------------------------------------------------
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = NO
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
EXTRACT_PRIVATE = YES
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
EXTRACT_STATIC = YES
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included.
EXTRACT_LOCAL_CLASSES = YES
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
# If set to NO (the default) only methods in the interface are included.
EXTRACT_LOCAL_METHODS = YES
-# If this flag is set to YES, the members of anonymous namespaces will be extracted
-# and appear in the documentation as a namespace called 'anonymous_namespace{file}',
-# where file will be replaced with the base name of the file that contains the anonymous
+# If this flag is set to YES, the members of anonymous namespaces will be extracted
+# and appear in the documentation as a namespace called 'anonymous_namespace{file}',
+# where file will be replaced with the base name of the file that contains the anonymous
# namespace. By default anonymous namespace are hidden.
EXTRACT_ANON_NSPACES = NO
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
# This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_MEMBERS = NO
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
# overviews. This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_CLASSES = NO
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
# documentation.
HIDE_FRIEND_COMPOUNDS = NO
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
# function's detailed documentation block.
HIDE_IN_BODY_DOCS = NO
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
# Set it to YES to include the internal documentation.
INTERNAL_DOCS = NO
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
# and Mac users are advised to set this option to NO.
CASE_SENSE_NAMES = YES
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
# documentation. If set to YES the scope will be hidden.
HIDE_SCOPE_NAMES = NO
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
# of that file.
SHOW_INCLUDE_FILES = NO
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
INLINE_INFO = YES
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
# declaration order.
SORT_MEMBER_DOCS = NO
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
# declaration order.
SORT_BRIEF_DOCS = NO
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
+# Note: This option applies only to the class list, not to the
# alphabetical list.
SORT_BY_SCOPE_NAME = NO
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
GENERATE_TODOLIST = YES
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
# commands in the documentation.
GENERATE_TESTLIST = NO
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
# commands in the documentation.
GENERATE_BUGLIST = NO
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
# \deprecated commands in the documentation.
GENERATE_DEPRECATEDLIST= NO
-# The ENABLED_SECTIONS tag can be used to enable conditional
+# The ENABLED_SECTIONS tag can be used to enable conditional
# documentation sections, marked by \if sectionname ... \endif.
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
MAX_INITIALIZER_LINES = 30
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
# list will mention the files that were used to generate the documentation.
SHOW_USED_FILES = NO
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
# in the documentation. The default is NO.
SHOW_DIRECTORIES = YES
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from the
-# version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from the
+# version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
# is used as the file version. See the manual for examples.
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-# The QUIET tag can be used to turn on/off the messages that are generated
+# The QUIET tag can be used to turn on/off the messages that are generated
# by doxygen. Possible values are YES and NO. If left blank NO is used.
QUIET = YES
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
# NO is used.
WARNINGS = YES
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
WARN_IF_UNDOCUMENTED = YES
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
# don't exist or using markup commands wrongly.
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
# documentation.
WARN_NO_PARAMDOC = YES
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
# be obtained via FILE_VERSION_FILTER)
WARN_FORMAT = "$file:$line: $text "
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
# to stderr.
-WARN_LOGFILE =
+WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
INPUT = master \
include \
devices/ecdev.h
-# This tag can be used to specify the character encoding of the source files that
-# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
-# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
+# This tag can be used to specify the character encoding of the source files that
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
# See http://www.gnu.org/software/libiconv for the list of possible encodings.
INPUT_ENCODING = UTF-8
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
-FILE_PATTERNS =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
+FILE_PATTERNS =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used.
RECURSIVE = NO
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
-EXCLUDE =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
EXCLUDE_PATTERNS = *.mod.c
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the output.
-# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the output.
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
# blank all files are included.
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
# Possible values are YES and NO. If left blank NO is used.
EXAMPLE_RECURSIVE = NO
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
# the \image command).
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output. If FILTER_PATTERNS is specified, this tag will be
# ignored.
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
# files to browse (i.e. when SOURCE_BROWSER is set to YES).
FILTER_SOURCE_FILES = NO
@@ -585,34 +585,34 @@
# configuration options related to source browsing
#---------------------------------------------------------------------------
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH
-# then you must also enable this option. If you don't then doxygen will produce
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH
+# then you must also enable this option. If you don't then doxygen will produce
# a warning and turn it on anyway
SOURCE_BROWSER = YES
-# Setting the INLINE_SOURCES tag to YES will include the body
+# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
INLINE_SOURCES = NO
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
# fragments. Normal C and C++ comments will always remain visible.
STRIP_CODE_COMMENTS = YES
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
# functions referencing it will be listed.
REFERENCED_BY_RELATION = NO
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
# called/used by that function will be listed.
REFERENCES_RELATION = NO
@@ -624,16 +624,16 @@
REFERENCES_LINK_SOURCE = YES
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
# will need version 4.8.6 or higher.
USE_HTAGS = NO
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
# which an include is specified. Set to NO to disable this.
VERBATIM_HEADERS = YES
@@ -642,141 +642,141 @@
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
# contains a lot of classes, structs, unions or interfaces.
ALPHABETICAL_INDEX = NO
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
# in which this list will be split (can be a number in the range [1..20])
COLS_IN_ALPHA_INDEX = 5
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
GENERATE_HTML = YES
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
HTML_OUTPUT = html
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
# doxygen will generate files with .html extension.
HTML_FILE_EXTENSION = .html
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard header.
-HTML_HEADER =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
# stylesheet in the HTML output directory as well, or it will be erased!
-HTML_STYLESHEET =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
+HTML_STYLESHEET =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.
HTML_ALIGN_MEMBERS = YES
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
# of the generated HTML documentation.
GENERATE_HTMLHELP = NO
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
HTML_DYNAMIC_SECTIONS = NO
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
# written to the html output directory.
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
# the HTML help compiler on the generated index.hhp.
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
# it should be included in the master .chm file (NO).
GENERATE_CHI = NO
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
# normal table of contents (NO) in the .chm file.
BINARY_TOC = NO
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
# to the contents of the HTML help documentation and to the tree view.
TOC_EXPAND = NO
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
# the value YES disables it.
DISABLE_INDEX = NO
-# This tag can be used to set the number of enum values (range [1..20])
+# This tag can be used to set the number of enum values (range [1..20])
# that doxygen will group on one line in the generated HTML documentation.
ENUM_VALUES_PER_LINE = 4
# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
# probably better off using the HTML help feature.
GENERATE_TREEVIEW = YES
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
TREEVIEW_WIDTH = 250
@@ -785,74 +785,74 @@
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
GENERATE_LATEX = YES
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `latex' will be used as the default path.
LATEX_OUTPUT = latex
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
LATEX_CMD_NAME = latex
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
# default command name.
MAKEINDEX_CMD_NAME = makeindex
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
# save some trees in general.
COMPACT_LATEX = NO
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
# executive. If left blank a4wide will be used.
PAPER_TYPE = a4wide
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
# packages that should be included in the LaTeX output.
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
# standard header. Notice: only use this tag if you know what you are doing!
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
PDF_HYPERLINKS = NO
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
# higher quality PDF documentation.
USE_PDFLATEX = YES
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
# This option is also used when generating formulas in HTML.
LATEX_BATCHMODE = NO
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
# in the output.
LATEX_HIDE_INDICES = NO
@@ -861,68 +861,68 @@
# configuration options related to the RTF output
#---------------------------------------------------------------------------
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
# other RTF readers or editors.
GENERATE_RTF = NO
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `rtf' will be used as the default path.
RTF_OUTPUT = rtf
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
# save some trees in general.
COMPACT_RTF = NO
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
# Note: wordpad (write) and others do not support links.
RTF_HYPERLINKS = NO
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
# Syntax is similar to doxygen's config file.
-RTF_EXTENSIONS_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
# generate man pages
GENERATE_MAN = NO
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `man' will be used as the default path.
MAN_OUTPUT = man
-# The MAN_EXTENSION tag determines the extension that is added to
+# The MAN_EXTENSION tag determines the extension that is added to
# the generated man pages (default is the subroutine's section .3)
MAN_EXTENSION = .3
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
# would be unable to find the correct page. The default is NO.
MAN_LINKS = NO
@@ -931,33 +931,33 @@
# configuration options related to the XML output
#---------------------------------------------------------------------------
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
# the code including all documentation.
GENERATE_XML = NO
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
XML_OUTPUT = xml
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
# syntax of the XML files.
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
# syntax of the XML files.
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
# enabling this will significantly increase the size of the XML output.
XML_PROGRAMLISTING = YES
@@ -966,10 +966,10 @@
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
# and incomplete at the moment.
GENERATE_AUTOGEN_DEF = NO
@@ -978,319 +978,319 @@
# configuration options related to the Perl module output
#---------------------------------------------------------------------------
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
# moment.
GENERATE_PERLMOD = NO
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
# to generate PDF and DVI output from the Perl module output.
PERLMOD_LATEX = NO
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader. This is useful
-# if you want to understand what is going on. On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader. This is useful
+# if you want to understand what is going on. On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
# and Perl will parse it just the same.
PERLMOD_PRETTY = YES
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
# Makefile don't overwrite each other's variables.
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
# files.
ENABLE_PREPROCESSING = YES
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
# way by setting EXPAND_ONLY_PREDEF to YES.
MACRO_EXPANSION = NO
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
# PREDEFINED and EXPAND_AS_DEFINED tags.
EXPAND_ONLY_PREDEF = NO
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
# in the INCLUDE_PATH (see below) will be search if a #include is found.
SEARCH_INCLUDES = YES
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
# the preprocessor.
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used.
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
PREDEFINED = __KERNEL__
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
# Use the PREDEFINED tag if you want to use a different macro definition.
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
# the parser if not removed.
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
# does not have to be run to correct the links.
# Note that each tag file must have a unique name
# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
+# If a tag file is not located in the directory in which doxygen
# is run, you must also specify the path to the tagfile here.
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
# will be listed.
ALLEXTERNALS = NO
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
# be listed.
EXTERNAL_GROUPS = YES
-# The PERL_PATH should be the absolute path and name of the perl script
+# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
# powerful graphs.
CLASS_DIAGRAMS = YES
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to
-# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to
-# specify the directory where the mscgen tool resides. If left empty the tool is assumed to
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to
# be found in the default search path.
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
# or is not a class.
HIDE_UNDOC_RELATIONS = YES
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
HAVE_DOT = NO
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
# the CLASS_DIAGRAMS tag to NO.
CLASS_GRAPH = YES
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
# class references variables) of the class with other documented classes.
COLLABORATION_GRAPH = YES
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for groups, showing the direct groups dependencies
GROUP_GRAPHS = YES
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
# Language.
UML_LOOK = NO
-# If set to YES, the inheritance and collaboration graphs will show the
+# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
TEMPLATE_RELATIONS = YES
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
# other documented files.
INCLUDE_GRAPH = YES
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
# indirectly include this file.
INCLUDED_BY_GRAPH = YES
-# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
+# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
# functions only using the \callgraph command.
CALL_GRAPH = NO
-# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
-# generate a caller dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
+# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
+# generate a caller dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
# functions only using the \callergraph command.
CALLER_GRAPH = NO
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
# will graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
DIRECTORY_GRAPH = YES
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
# generated by dot. Possible values are png, jpg, or gif
# If left blank png will be used.
DOT_IMAGE_FORMAT = png
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
# \dotfile command).
-DOTFILE_DIRS =
-
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the number
-# of direct children of the root node in a graph is already larger than
-# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note
+DOTFILE_DIRS =
+
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the number
+# of direct children of the root node in a graph is already larger than
+# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
DOT_GRAPH_MAX_NODES = 50
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
MAX_DOT_GRAPH_DEPTH = 0
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, which results in a white background.
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, which results in a white background.
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
# read).
DOT_TRANSPARENT = NO
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
# support this, this feature is disabled by default.
DOT_MULTI_TARGETS = NO
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
# arrows in the dot generated graphs.
GENERATE_LEGEND = YES
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
# the various graphs.
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
# used. If set to NO the values of all tags below this one will be ignored.
SEARCHENGINE = NO
--- a/FEATURES Thu Sep 06 19:52:17 2012 +0200
+++ b/FEATURES Thu Sep 06 20:22:24 2012 +0200
@@ -65,7 +65,7 @@
and configurable with standard tools.
* Implementation of the "Vendor-specific over EtherCAT" (VoE) mailbox protocol.
- - Communication with vendor-specific mailbox protocols via the API.
+ - Communication with vendor-specific mailbox protocols via the API.
* Implementation of the "File Access over EtherCAT" (FoE) mailbox protocol.
- Loading and storing files via the command-line tool.
--- a/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/bootstrap Thu Sep 06 19:52:17 2012 +0200
+++ b/bootstrap Thu Sep 06 20:22:24 2012 +0200
@@ -2,26 +2,26 @@
#----------------------------------------------------------------------------
#
# $Id$
-#
+#
# Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
-#
+#
# This file is part of the IgH EtherCAT Master.
-#
+#
# The IgH EtherCAT Master 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.
-#
+#
# The IgH EtherCAT Master 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.
-#
+#
# You should have received a copy of the GNU General Public License along
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
+#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/devices/8139too-2.6.18-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.18-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -644,7 +644,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1068,7 +1068,7 @@
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
-
+
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
--- a/devices/8139too-2.6.19-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.19-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -644,7 +644,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1067,7 +1067,7 @@
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
-
+
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
--- a/devices/8139too-2.6.22-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.22-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -644,7 +644,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1067,7 +1067,7 @@
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
-
+
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
--- a/devices/8139too-2.6.24-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.24-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -653,7 +653,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1060,7 +1060,7 @@
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
-
+
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
--- a/devices/8139too-2.6.26-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.26-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -653,7 +653,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1060,7 +1060,7 @@
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
-
+
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
--- a/devices/8139too-2.6.27-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.27-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -653,7 +653,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1066,7 +1066,7 @@
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
-
+
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
--- a/devices/8139too-2.6.28-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.28-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -654,7 +654,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1066,7 +1066,7 @@
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
-
+
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
@@ -1811,24 +1811,24 @@
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
-
+
dev->trans_start = jiffies;
-
+
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
-
+
dev->trans_start = jiffies;
-
+
tp->cur_tx++;
-
+
if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
netif_stop_queue (dev);
spin_unlock_irqrestore(&tp->lock, flags);
-
+
if (netif_msg_tx_queued(tp))
printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",
dev->name, len, entry);
--- a/devices/8139too-2.6.29-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.29-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -654,7 +654,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1066,7 +1066,7 @@
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
-
+
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
@@ -1811,24 +1811,24 @@
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
-
+
dev->trans_start = jiffies;
-
+
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
-
+
dev->trans_start = jiffies;
-
+
tp->cur_tx++;
-
+
if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
netif_stop_queue (dev);
spin_unlock_irqrestore(&tp->lock, flags);
-
+
if (netif_msg_tx_queued(tp))
printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",
dev->name, len, entry);
--- a/devices/8139too-2.6.31-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.31-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -647,7 +647,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1799,9 +1799,9 @@
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
-
+
dev->trans_start = jiffies;
-
+
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
--- a/devices/8139too-2.6.32-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.32-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -647,7 +647,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
--- a/devices/8139too-2.6.34-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.34-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -648,7 +648,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1800,9 +1800,9 @@
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
-
+
dev->trans_start = jiffies;
-
+
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
--- a/devices/8139too-2.6.35-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/8139too-2.6.35-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -648,7 +648,7 @@
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
-
+
ec_device_t *ecdev;
};
@@ -1801,8 +1801,7 @@
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
-
-
+
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
--- a/devices/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/devices/e100-2.6.24-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e100-2.6.24-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2965,7 +2965,7 @@
/* Similar to calling e100_down(), but avoids adpater I/O. */
netdev->stop(netdev);
-
+
if (!nic->ecdev) {
/* Detach; put netif into state similar to hotplug unplug. */
napi_enable(&nic->napi);
--- a/devices/e100-2.6.29-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e100-2.6.29-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -1097,7 +1097,7 @@
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
- if (nic->ecdev ||
+ if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
@@ -2997,7 +2997,7 @@
{
printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
", master " EC_MASTER_VERSION "\n");
-
+
return pci_register_driver(&e100_driver);
}
--- a/devices/e100-2.6.31-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e100-2.6.31-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -1202,7 +1202,7 @@
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
- if (nic->ecdev ||
+ if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
@@ -3216,7 +3216,7 @@
{
printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
", master " EC_MASTER_VERSION "\n");
-
+
return pci_register_driver(&e100_driver);
}
--- a/devices/e100-2.6.32-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e100-2.6.32-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -1205,7 +1205,7 @@
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
- if (nic->ecdev ||
+ if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
@@ -3239,7 +3239,7 @@
{
printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
", master " EC_MASTER_VERSION "\n");
-
+
return pci_register_driver(&e100_driver);
}
--- a/devices/e100-2.6.33-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e100-2.6.33-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -1203,7 +1203,7 @@
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
- if (nic->ecdev ||
+ if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
@@ -3247,7 +3247,7 @@
{
printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
", master " EC_MASTER_VERSION "\n");
-
+
return pci_register_driver(&e100_driver);
}
--- a/devices/e100-2.6.35-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e100-2.6.35-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -1204,7 +1204,7 @@
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
- if (nic->ecdev ||
+ if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
--- a/devices/e100-2.6.37-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e100-2.6.37-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -1204,7 +1204,7 @@
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
- if (nic->ecdev ||
+ if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
--- a/devices/e1000/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/devices/e1000/e1000_main-2.6.18-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.18-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2178,7 +2178,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
--- a/devices/e1000/e1000_main-2.6.20-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.20-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -23,7 +23,7 @@
Linux NICS <linux.nics@intel.com>
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
+
vim: noexpandtab
*******************************************************************************/
@@ -2403,7 +2403,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
--- a/devices/e1000/e1000_main-2.6.22-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.22-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2404,7 +2404,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
--- a/devices/e1000/e1000_main-2.6.24-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.24-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2402,7 +2402,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -3849,7 +3849,7 @@
struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
int i;
-
+
if (adapter->ecdev) {
#ifdef CONFIG_E1000_NAPI
int ec_work_done = 0;
@@ -4013,7 +4013,7 @@
atomic_inc(&adapter->irq_sem);
E1000_WRITE_REG(hw, IMC, ~0);
}
-
+
adapter->total_tx_bytes = 0;
adapter->total_rx_bytes = 0;
adapter->total_tx_packets = 0;
--- a/devices/e1000/e1000_main-2.6.26-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.26-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -672,7 +672,7 @@
netdev->tx_queue_len = adapter->tx_queue_len;
adapter->link_speed = 0;
adapter->link_duplex = 0;
-
+
if (!adapter->ecdev) {
netif_carrier_off(netdev);
netif_stop_queue(netdev);
@@ -2467,7 +2467,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -3924,7 +3924,7 @@
struct net_device *netdev = data;
struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
-
+
int i;
if (adapter->ecdev) {
@@ -4103,7 +4103,7 @@
#endif
}
-
+
return IRQ_HANDLED;
}
--- a/devices/e1000/e1000_main-2.6.27-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.27-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -269,7 +269,7 @@
if (adapter->ecdev)
return 0;
-
+
if (hw->mac_type >= e1000_82571) {
adapter->have_msi = !pci_enable_msi(adapter->pdev);
if (adapter->have_msi) {
@@ -331,7 +331,7 @@
if (adapter->ecdev)
return;
-
+
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2440,7 +2440,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
--- a/devices/e1000/e1000_main-2.6.28-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.28-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -263,7 +263,7 @@
if (adapter->ecdev)
return 0;
-
+
if (hw->mac_type >= e1000_82571) {
adapter->have_msi = !pci_enable_msi(adapter->pdev);
if (adapter->have_msi) {
@@ -325,7 +325,7 @@
if (adapter->ecdev)
return;
-
+
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2320,7 +2320,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
--- a/devices/e1000/e1000_main-2.6.29-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.29-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -261,7 +261,7 @@
if (adapter->ecdev)
return 0;
-
+
if (hw->mac_type >= e1000_82571) {
adapter->have_msi = !pci_enable_msi(adapter->pdev);
if (adapter->have_msi) {
@@ -323,7 +323,7 @@
if (adapter->ecdev)
return;
-
+
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2296,7 +2296,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
--- a/devices/e1000/e1000_main-2.6.31-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.31-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -325,7 +325,7 @@
if (adapter->ecdev)
return;
-
+
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2314,7 +2314,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -2541,7 +2541,7 @@
adapter->tx_fifo_head = 0;
atomic_set(&adapter->tx_fifo_stall, 0);
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
netif_wake_queue(netdev);
} else {
if (!adapter->ecdev)
--- a/devices/e1000/e1000_main-2.6.32-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.32-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2088,7 +2088,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -2291,7 +2291,7 @@
atomic_set(&adapter->tx_fifo_stall, 0);
if (!adapter->ecdev) netif_wake_queue(netdev);
} else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
}
}
--- a/devices/e1000/e1000_main-2.6.33-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.33-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -317,7 +317,7 @@
if (adapter->ecdev)
return;
-
+
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2095,7 +2095,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -2298,7 +2298,7 @@
atomic_set(&adapter->tx_fifo_stall, 0);
if (!adapter->ecdev) netif_wake_queue(netdev);
} else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
}
}
--- a/devices/e1000/e1000_main-2.6.35-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.35-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -23,7 +23,7 @@
Linux NICS <linux.nics@intel.com>
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
+
vim: noexpandtab
*******************************************************************************/
@@ -326,7 +326,7 @@
if (adapter->ecdev)
return;
-
+
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2104,7 +2104,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -2301,7 +2301,7 @@
if (!adapter->ecdev)
netif_wake_queue(netdev);
} else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
}
}
--- a/devices/e1000/e1000_main-2.6.37-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000/e1000_main-2.6.37-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -23,7 +23,7 @@
Linux NICS <linux.nics@intel.com>
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
+
vim: noexpandtab
*******************************************************************************/
@@ -332,7 +332,7 @@
if (adapter->ecdev) {
return;
}
-
+
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2160,7 +2160,7 @@
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
- if (adapter->ecdev) {
+ if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
--- a/devices/e1000e/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000e/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/devices/e1000e/netdev-2.6.32-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000e/netdev-2.6.32-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2929,7 +2929,7 @@
clear_bit(__E1000_DOWN, &adapter->state);
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
napi_enable(&adapter->napi);
if (adapter->msix_entries)
@@ -2963,7 +2963,7 @@
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -3665,7 +3665,7 @@
e1000_update_mng_vlan(adapter);
if (link) {
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
/* update snapshot of PHY registers on LSC */
@@ -3765,7 +3765,7 @@
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
- else
+ else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -3773,7 +3773,7 @@
round_jiffies(jiffies + 2 * HZ));
}
} else {
- if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -3808,7 +3808,7 @@
e1000e_update_adaptive(&adapter->hw);
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -4857,7 +4857,7 @@
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
-
+
if (adapter->ecdev)
return;
--- a/devices/e1000e/netdev-2.6.33-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000e/netdev-2.6.33-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2913,7 +2913,7 @@
clear_bit(__E1000_DOWN, &adapter->state);
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
napi_enable(&adapter->napi);
if (adapter->msix_entries)
@@ -2947,7 +2947,7 @@
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -3654,7 +3654,7 @@
e1000_update_mng_vlan(adapter);
if (link) {
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
/* update snapshot of PHY registers on LSC */
@@ -3754,7 +3754,7 @@
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
- else
+ else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -3762,7 +3762,7 @@
round_jiffies(jiffies + 2 * HZ));
}
} else {
- if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -3797,7 +3797,7 @@
e1000e_update_adaptive(&adapter->hw);
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -4859,7 +4859,7 @@
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
-
+
if (adapter->ecdev)
return;
--- a/devices/e1000e/netdev-2.6.34-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000e/netdev-2.6.34-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2892,7 +2892,7 @@
clear_bit(__E1000_DOWN, &adapter->state);
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
napi_enable(&adapter->napi);
if (adapter->msix_entries)
@@ -2926,7 +2926,7 @@
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -3634,7 +3634,7 @@
e1000_update_mng_vlan(adapter);
if (link) {
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
/* update snapshot of PHY registers on LSC */
@@ -3728,7 +3728,7 @@
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
- else
+ else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -3736,7 +3736,7 @@
round_jiffies(jiffies + 2 * HZ));
}
} else {
- if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -3771,7 +3771,7 @@
e1000e_update_adaptive(&adapter->hw);
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -4855,7 +4855,7 @@
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
-
+
if (adapter->ecdev)
return;
--- a/devices/e1000e/netdev-2.6.35-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000e/netdev-2.6.35-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -3306,7 +3306,7 @@
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -4044,7 +4044,7 @@
e1000_update_mng_vlan(adapter);
if (link) {
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
@@ -4142,7 +4142,7 @@
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
- else
+ else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -4150,7 +4150,7 @@
round_jiffies(jiffies + 2 * HZ));
}
} else {
- if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -4188,7 +4188,7 @@
e1000e_update_adaptive(&adapter->hw);
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -5359,7 +5359,7 @@
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
-
+
if (adapter->ecdev)
return;
--- a/devices/e1000e/netdev-2.6.37-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000e/netdev-2.6.37-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -3414,7 +3414,7 @@
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -4236,7 +4236,7 @@
e1000_update_mng_vlan(adapter);
if (link) {
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
@@ -4334,7 +4334,7 @@
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
- else
+ else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -4342,7 +4342,7 @@
round_jiffies(jiffies + 2 * HZ));
}
} else {
- if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -4380,7 +4380,7 @@
e1000e_update_adaptive(&adapter->hw);
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -5564,7 +5564,7 @@
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
-
+
if (adapter->ecdev)
return;
--- a/devices/e1000e/netdev-3.2-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/e1000e/netdev-3.2-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -3575,7 +3575,7 @@
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
- if (!adapter->ecdev)
+ if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -4391,7 +4391,7 @@
e1000_update_mng_vlan(adapter);
if (link) {
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
@@ -4489,7 +4489,7 @@
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
- else
+ else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -4497,7 +4497,7 @@
round_jiffies(jiffies + 2 * HZ));
}
} else {
- if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -4537,7 +4537,7 @@
e1000e_update_adaptive(&adapter->hw);
- if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+ if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && (!netif_carrier_ok(netdev) &&
(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)))) {
/*
@@ -5767,7 +5767,7 @@
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
-
+
if (adapter->ecdev)
return;
--- a/devices/r8169-2.6.31-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/r8169-2.6.31-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -3910,7 +3910,7 @@
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
-
+
if (tp->ecdev)
return -EBUSY;
@@ -3924,7 +3924,7 @@
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
-
+
if (tp->ecdev)
return -EBUSY;
--- a/devices/r8169-2.6.32-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/r8169-2.6.32-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2704,7 +2704,7 @@
if (!tp->ecdev)
spin_lock_irq(&tp->lock);
-
+
if (tp->phy_reset_pending(ioaddr)) {
/*
* A busy loop could burn quite a few cycles on nowadays CPU.
@@ -3319,7 +3319,6 @@
goto err_release_ring_2;
napi_enable(&tp->napi);
-
}
rtl_hw_start(dev);
@@ -4765,7 +4764,6 @@
netif_stop_queue(dev);
napi_disable(&tp->napi);
-
}
core_down:
@@ -4925,7 +4923,7 @@
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
-
+
if (tp->ecdev)
return -EBUSY;
--- a/devices/r8169-2.6.33-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/r8169-2.6.33-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2709,7 +2709,7 @@
if (!tp->ecdev)
spin_lock_irq(&tp->lock);
-
+
if (tp->phy_reset_pending(ioaddr)) {
/*
* A busy loop could burn quite a few cycles on nowadays CPU.
@@ -3339,7 +3339,6 @@
goto err_release_ring_2;
napi_enable(&tp->napi);
-
}
rtl_hw_start(dev);
@@ -4943,7 +4942,7 @@
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
-
+
if (tp->ecdev)
return -EBUSY;
--- a/devices/r8169-2.6.36-ethercat.c Thu Sep 06 19:52:17 2012 +0200
+++ b/devices/r8169-2.6.36-ethercat.c Thu Sep 06 20:22:24 2012 +0200
@@ -2733,7 +2733,7 @@
if (!tp->ecdev)
spin_lock_irq(&tp->lock);
-
+
if (tp->phy_reset_pending(ioaddr)) {
/*
* A busy loop could burn quite a few cycles on nowadays CPU.
@@ -3354,7 +3354,6 @@
goto err_release_ring_2;
napi_enable(&tp->napi);
-
}
rtl_hw_start(dev);
@@ -4809,7 +4808,6 @@
netif_stop_queue(dev);
napi_disable(&tp->napi);
-
}
core_down:
@@ -4970,7 +4968,7 @@
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
-
+
if (tp->ecdev)
return -EBUSY;
--- a/documentation/ethercat_doc.tex Thu Sep 06 19:52:17 2012 +0200
+++ b/documentation/ethercat_doc.tex Thu Sep 06 20:22:24 2012 +0200
@@ -5,7 +5,7 @@
% $Id$
%
% vi: spell spelllang=en tw=78
-%
+%
%------------------------------------------------------------------------------
\documentclass[a4paper,12pt,BCOR6mm,bibtotoc,idxtotoc]{scrbook}
@@ -926,7 +926,7 @@
then calculate time delays between the slaves (using its knowledge of the bus
topology), and finally calculate the time delays from the reference clock to
each slave. These values are programmed into the slaves' transmission delay
-registers. In this way, the drift compensation can reach nanosecond synchrony.
+registers. In this way, the drift compensation can reach nanosecond synchrony.
\paragraph{Checking Synchrony} DC-capable slaves provide the 32-bit ``System
time difference'' register at address \lstinline+0x092c+, where the system
@@ -1805,7 +1805,7 @@
\item[FMMU Configuration] If there are FMMUs configurations supplied by the
application (i.\,e.\ if the application registered PDO entries), they are
-applied.
+applied.
\item[SAFEOP] The state change FSM is used to bring the slave to SAFEOP state.
If this is the requested state, the state machine is finished.
@@ -3092,7 +3092,7 @@
tool to the prefix path. The second one will install the kernel modules to the
kernel's modules directory. The final \lstinline+depmod+ call is necessary to
include the kernel modules into the \textit{modules.dep} file to make it
-available to the \lstinline+modprobe+ command, used in the init script.
+available to the \lstinline+modprobe+ command, used in the init script.
\begin{lstlisting}
# `\textbf{make install}`
--- a/documentation/graphs/fsm_master.dot Thu Sep 06 19:52:17 2012 +0200
+++ b/documentation/graphs/fsm_master.dot Thu Sep 06 20:22:24 2012 +0200
@@ -33,7 +33,7 @@
action_next_slave_state [shape=point,label=""]
action_next_slave_state -> read_state
action_next_slave_state -> action_idle [weight=10]
-
+
action_configure [shape=point,label=""]
action_configure -> configure_slave [weight=10]
action_configure -> action_next_slave_state
--- a/ethercat.spec.in Thu Sep 06 19:52:17 2012 +0200
+++ b/ethercat.spec.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/dc_rtai/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/dc_rtai/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/dc_rtai/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/dc_rtai/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/dc_rtai/dc_rtai_sample.c Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/dc_rtai/dc_rtai_sample.c Thu Sep 06 20:22:24 2012 +0200
@@ -220,7 +220,7 @@
tv.tv_sec++;
}
ecrt_master_application_time(master, EC_TIMEVAL2NANO(tv));
-
+
if (sync_ref_counter) {
sync_ref_counter--;
} else {
@@ -280,7 +280,7 @@
master = ecrt_request_master(0);
if (!master) {
- ret = -EBUSY;
+ ret = -EBUSY;
printk(KERN_ERR PFX "Requesting master 0 failed!\n");
goto out_return;
}
--- a/examples/dc_user/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/dc_user/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/dc_user/main.c Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/dc_user/main.c Thu Sep 06 20:22:24 2012 +0200
@@ -59,7 +59,7 @@
(B).tv_nsec - (A).tv_nsec)
#define TIMESPEC2NS(T) ((uint64_t) (T).tv_sec * NSEC_PER_SEC + (T).tv_nsec)
-
+
/****************************************************************************/
// EtherCAT
@@ -208,11 +208,11 @@
#ifdef MEASURE_TIMING
// output timing stats
printf("period %10u ... %10u\n",
- period_min_ns, period_max_ns);
+ period_min_ns, period_max_ns);
printf("exec %10u ... %10u\n",
- exec_min_ns, exec_max_ns);
+ exec_min_ns, exec_max_ns);
printf("latency %10u ... %10u\n",
- latency_min_ns, latency_max_ns);
+ latency_min_ns, latency_max_ns);
period_max_ns = 0;
period_min_ns = 0xffffffff;
exec_max_ns = 0;
@@ -261,7 +261,7 @@
perror("mlockall failed");
return -1;
}
-
+
master = ecrt_request_master(0);
if (!master)
return -1;
@@ -320,7 +320,7 @@
printf("Starting cyclic function.\n");
cyclic_task();
-
+
return 0;
}
--- a/examples/mini/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/mini/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/mini/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/mini/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -24,7 +24,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/mini/mini.c Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/mini/mini.c Thu Sep 06 20:22:24 2012 +0200
@@ -331,7 +331,7 @@
// check for islave configuration state(s) (optional)
check_slave_config_states();
-
+
#if SDO_ACCESS
// read process data SDO
read_sdo();
@@ -387,12 +387,12 @@
#if EXTERNAL_MEMORY
unsigned int size;
#endif
-
+
printk(KERN_INFO PFX "Starting...\n");
master = ecrt_request_master(0);
if (!master) {
- ret = -EBUSY;
+ ret = -EBUSY;
printk(KERN_ERR PFX "Requesting master 0 failed.\n");
goto out_return;
}
--- a/examples/rtai/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/rtai/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/rtai/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/rtai/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/rtai/rtai_sample.c Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/rtai/rtai_sample.c Thu Sep 06 20:22:24 2012 +0200
@@ -287,7 +287,7 @@
master = ecrt_request_master(0);
if (!master) {
- ret = -EBUSY;
+ ret = -EBUSY;
printk(KERN_ERR PFX "Requesting master 0 failed!\n");
goto out_return;
}
--- a/examples/tty/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/tty/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/tty/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/tty/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -24,7 +24,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/tty/serial.c Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/tty/serial.c Thu Sep 06 20:22:24 2012 +0200
@@ -113,7 +113,7 @@
} el6002_t;
LIST_HEAD(handlers);
-
+
/*****************************************************************************/
/* Beckhoff EL6002
@@ -300,7 +300,7 @@
rtscts = cflag & CRTSCTS;
printk(KERN_INFO PFX "%s: Requested RTS/CTS: %s.\n",
port->name, rtscts ? "yes" : "no");
-
+
cbaud = cflag & CBAUD;
for (i = 0; i < sizeof(el600x_baud_rate) / sizeof(el600x_baud_rate_t);
--- a/examples/tty/tty.c Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/tty/tty.c Thu Sep 06 20:22:24 2012 +0200
@@ -175,13 +175,13 @@
{
int ret = -1;
ec_slave_config_t *sc;
-
+
printk(KERN_INFO PFX "Starting...\n");
master = ecrt_request_master(0);
if (!master) {
printk(KERN_ERR PFX "Requesting master 0 failed.\n");
- ret = -EBUSY;
+ ret = -EBUSY;
goto out_return;
}
--- a/examples/user/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/user/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/examples/user/main.c Thu Sep 06 19:52:17 2012 +0200
+++ b/examples/user/main.c Thu Sep 06 20:22:24 2012 +0200
@@ -319,7 +319,7 @@
ec_slave_config_t *sc;
struct sigaction sa;
struct itimerval tv;
-
+
master = ecrt_request_master(0);
if (!master)
return -1;
--- a/include/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/include/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -24,7 +24,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/include/ectty.h Thu Sep 06 19:52:17 2012 +0200
+++ b/include/ectty.h Thu Sep 06 20:22:24 2012 +0200
@@ -5,7 +5,7 @@
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
@@ -45,7 +45,7 @@
#include <linux/termios.h>
/******************************************************************************
- * Data types
+ * Data types
*****************************************************************************/
struct ec_tty;
--- a/lib/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -1,25 +1,25 @@
#------------------------------------------------------------------------------
#
# $Id$
-#
+#
# Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
-#
+#
# This file is part of the IgH EtherCAT master userspace library.
-#
+#
# The IgH EtherCAT master userspace library is free software; you can
# redistribute it and/or modify it under the terms of the GNU Lesser General
# Public License as published by the Free Software Foundation; version 2.1 of
# the License.
-#
+#
# The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU Lesser General Public License
# along with the IgH EtherCAT master userspace library. If not, see
# <http://www.gnu.org/licenses/>.
-#
+#
# ---
#
# The license mentioned above concerns the source code only. Using the
--- a/lib/domain.c Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/domain.c Thu Sep 06 20:22:24 2012 +0200
@@ -1,11 +1,11 @@
/******************************************************************************
- *
+ *
* $Id$
- *
+ *
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
@@ -60,7 +60,7 @@
const ec_pdo_entry_reg_t *reg;
ec_slave_config_t *sc;
int ret;
-
+
for (reg = regs; reg->index; reg++) {
if (!(sc = ecrt_master_slave_config(domain->master, reg->alias,
reg->position, reg->vendor_id, reg->product_code)))
@@ -88,9 +88,9 @@
if (offset == -1) {
fprintf(stderr, "Failed to get domain offset: %s\n",
strerror(errno));
- return NULL;
+ return NULL;
}
-
+
domain->process_data = domain->master->process_data + offset;
}
@@ -125,7 +125,7 @@
data.domain_index = domain->index;
data.state = state;
-
+
if (ioctl(domain->master->fd, EC_IOCTL_DOMAIN_STATE, &data) == -1) {
fprintf(stderr, "Failed to get domain state: %s\n",
strerror(errno));
--- a/lib/domain.h Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/domain.h Thu Sep 06 20:22:24 2012 +0200
@@ -1,11 +1,11 @@
/******************************************************************************
- *
+ *
* $Id$
- *
+ *
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
--- a/lib/master.h Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/master.h Thu Sep 06 20:22:24 2012 +0200
@@ -1,11 +1,11 @@
/******************************************************************************
- *
+ *
* $Id$
- *
+ *
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
--- a/lib/sdo_request.c Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/sdo_request.c Thu Sep 06 20:22:24 2012 +0200
@@ -3,9 +3,9 @@
* $Id$
*
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
--- a/lib/sdo_request.h Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/sdo_request.h Thu Sep 06 20:22:24 2012 +0200
@@ -1,11 +1,11 @@
/******************************************************************************
- *
+ *
* $Id$
- *
+ *
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
--- a/lib/slave_config.c Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/slave_config.c Thu Sep 06 20:22:24 2012 +0200
@@ -1,11 +1,11 @@
/******************************************************************************
- *
+ *
* $Id$
- *
+ *
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
@@ -86,7 +86,7 @@
strerror(errno));
return -1; // FIXME
}
-
+
return 0;
}
@@ -124,7 +124,7 @@
strerror(errno));
return -1; // FIXME
}
-
+
return 0;
}
@@ -163,7 +163,7 @@
strerror(errno));
return -1; // FIXME
}
-
+
return 0;
}
@@ -428,13 +428,13 @@
data.sdo_index = index;
data.sdo_subindex = subindex;
data.size = size;
-
+
if (ioctl(sc->master->fd, EC_IOCTL_SC_SDO_REQUEST, &data) == -1) {
fprintf(stderr, "Failed to create SDO request: %s\n",
strerror(errno));
ec_sdo_request_clear(req);
free(req);
- return NULL;
+ return NULL;
}
req->next = NULL;
@@ -495,13 +495,13 @@
data.config_index = sc->index;
data.size = size;
-
+
if (ioctl(sc->master->fd, EC_IOCTL_SC_VOE, &data) == -1) {
fprintf(stderr, "Failed to create VoE handler: %s\n",
strerror(errno));
ec_voe_handler_clear(voe);
free(voe);
- return NULL;
+ return NULL;
}
voe->next = NULL;
@@ -524,7 +524,7 @@
data.config_index = sc->index;
data.state = state;
-
+
if (ioctl(sc->master->fd, EC_IOCTL_SC_STATE, &data) == -1) {
fprintf(stderr, "Failed to get slave configuration state: %s\n",
strerror(errno));
--- a/lib/slave_config.h Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/slave_config.h Thu Sep 06 20:22:24 2012 +0200
@@ -1,11 +1,11 @@
/******************************************************************************
- *
+ *
* $Id$
- *
+ *
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
--- a/lib/voe_handler.c Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/voe_handler.c Thu Sep 06 20:22:24 2012 +0200
@@ -1,11 +1,11 @@
/******************************************************************************
- *
+ *
* $Id$
- *
+ *
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
--- a/lib/voe_handler.h Thu Sep 06 19:52:17 2012 +0200
+++ b/lib/voe_handler.h Thu Sep 06 20:22:24 2012 +0200
@@ -1,11 +1,11 @@
/******************************************************************************
- *
+ *
* $Id$
- *
+ *
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
- *
+ *
* This file is part of the IgH EtherCAT master userspace library.
- *
+ *
* The IgH EtherCAT master userspace library is free software; you can
* redistribute it and/or modify it under the terms of the GNU Lesser General
* Public License as published by the Free Software Foundation; version 2.1
@@ -19,9 +19,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
- *
+ *
* ---
- *
+ *
* The license mentioned above concerns the source code only. Using the
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
--- a/m4/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/m4/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/master/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/master/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
--- a/master/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/master/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/master/cdev.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/cdev.c Thu Sep 06 20:22:24 2012 +0200
@@ -110,7 +110,7 @@
/*****************************************************************************/
/** Constructor.
- *
+ *
* \return 0 in case of success, else < 0
*/
int ec_cdev_init(
@@ -1674,12 +1674,12 @@
ec_domain_t *domain;
off_t offset;
int ret;
-
+
if (unlikely(!priv->requested))
return -EPERM;
/* Get the sum of the domains' process data sizes. */
-
+
priv->process_data_size = 0;
if (down_interruptible(&master->master_sem))
@@ -1688,7 +1688,7 @@
list_for_each_entry(domain, &master->domains, list) {
priv->process_data_size += ecrt_domain_size(domain);
}
-
+
up(&master->master_sem);
if (priv->process_data_size) {
@@ -1813,7 +1813,7 @@
)
{
ec_master_state_t data;
-
+
if (unlikely(!priv->requested))
return -EPERM;
@@ -1870,7 +1870,7 @@
)
{
ec_ioctl_app_time_t data;
-
+
if (unlikely(!priv->requested))
return -EPERM;
@@ -2458,7 +2458,7 @@
ec_ioctl_sc_state_t data;
const ec_slave_config_t *sc;
ec_slave_config_state_t state;
-
+
if (unlikely(!priv->requested))
return -EPERM;
@@ -2630,7 +2630,7 @@
ec_ioctl_domain_state_t data;
const ec_domain_t *domain;
ec_domain_state_t state;
-
+
if (unlikely(!priv->requested))
return -EPERM;
--- a/master/datagram.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/datagram.c Thu Sep 06 20:22:24 2012 +0200
@@ -80,7 +80,7 @@
"ARMW",
"FRMW"
};
-
+
/*****************************************************************************/
/** Constructor.
@@ -622,7 +622,7 @@
{
if (jiffies - datagram->stats_output_jiffies > HZ) {
datagram->stats_output_jiffies = jiffies;
-
+
if (unlikely(datagram->skip_count)) {
EC_WARN("Datagram %p (%s) was SKIPPED %u time%s.\n",
datagram, datagram->name,
--- a/master/device.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/device.c Thu Sep 06 20:22:24 2012 +0200
@@ -57,7 +57,7 @@
/*****************************************************************************/
/** Constructor.
- *
+ *
* \return 0 in case of success, else < 0
*/
int ec_device_init(
@@ -524,7 +524,7 @@
}
EC_MASTER_INFO(master, "Releasing %s device %s.\n", dev_str, mac_str);
-
+
down(&master->device_sem);
ec_device_detach(device);
up(&master->device_sem);
@@ -587,7 +587,7 @@
*
* Forwards the received data to the master. The master will analyze the frame
* and dispatch the received commands to the sending instances.
- *
+ *
* \ingroup DeviceInterface
*/
void ecdev_receive(
@@ -631,7 +631,7 @@
*
* If the device notifies the master about the link being down, the master
* will not try to send frames using this device.
- *
+ *
* \ingroup DeviceInterface
*/
void ecdev_set_link(
--- a/master/ethernet.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/ethernet.c Thu Sep 06 20:22:24 2012 +0200
@@ -509,7 +509,7 @@
#if EOE_DEBUG_LEVEL >= 2
EC_SLAVE_DBG(eoe->slave, 0, "EoE %s RX fragment %u%s, offset %u,"
" frame %u%s, %u octets\n", eoe->dev->name, fragment_number,
- last_fragment ? "" : "+", fragment_offset, frame_number,
+ last_fragment ? "" : "+", fragment_offset, frame_number,
time_appended ? ", + timestamp" : "",
time_appended ? rec_size - 8 : rec_size - 4);
#endif
--- a/master/fsm_pdo.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/fsm_pdo.c Thu Sep 06 20:22:24 2012 +0200
@@ -284,7 +284,7 @@
}
// finished reading PDO configuration
-
+
ec_pdo_list_copy(&fsm->sync->pdos, &fsm->pdos);
ec_pdo_list_clear_pdos(&fsm->pdos);
@@ -389,7 +389,7 @@
const struct list_head *list /**< current PDO list item */
)
{
- list = list->next;
+ list = list->next;
if (list == &fsm->pdos.list)
return NULL; // no next PDO
return list_entry(list, ec_pdo_t, list);
@@ -406,7 +406,7 @@
fsm->sync_index++;
for (; fsm->sync_index < EC_MAX_SYNC_MANAGERS; fsm->sync_index++) {
- if (!fsm->slave->config) {
+ if (!fsm->slave->config) {
// slave configuration removed in the meantime
fsm->state = ec_fsm_pdo_state_error;
return;
@@ -418,7 +418,7 @@
fsm->state = ec_fsm_pdo_state_error;
return;
}
-
+
if (!(fsm->sync = ec_slave_get_sync(fsm->slave, fsm->sync_index))) {
if (!list_empty(&fsm->pdos.list))
EC_SLAVE_WARN(fsm->slave, "PDOs configured for SM%u,"
@@ -464,7 +464,7 @@
if (list_empty(&fsm->slave_pdo.entries)) {
EC_SLAVE_DBG(fsm->slave, 1, "Reading mapping of PDO 0x%04X.\n",
fsm->pdo->index);
-
+
// pdo mapping is unknown; start loading it
ec_fsm_pdo_entry_start_reading(&fsm->fsm_pdo_entry, fsm->slave,
&fsm->slave_pdo);
@@ -639,7 +639,7 @@
ec_pdo_list_clear_pdos(&fsm->sync->pdos);
// assign all PDOs belonging to the current sync manager
-
+
// find first PDO
if (!(fsm->pdo = ec_fsm_pdo_conf_action_next_pdo(fsm, &fsm->pdos.list))) {
@@ -669,7 +669,7 @@
EC_SLAVE_DBG(fsm->slave, 1, "Assigning PDO 0x%04X at position %u.\n",
fsm->pdo->index, fsm->pdo_pos);
-
+
fsm->state = ec_fsm_pdo_conf_state_assign_pdo;
ec_fsm_coe_transfer(fsm->fsm_coe, fsm->slave, &fsm->request);
ec_fsm_coe_exec(fsm->fsm_coe); // execute immediately
@@ -706,7 +706,7 @@
EC_SLAVE_DBG(fsm->slave, 1,
"Setting number of assigned PDOs to %u.\n",
fsm->pdo_pos);
-
+
fsm->state = ec_fsm_pdo_conf_state_set_pdo_count;
ec_fsm_coe_transfer(fsm->fsm_coe, fsm->slave, &fsm->request);
ec_fsm_coe_exec(fsm->fsm_coe); // execute immediately
@@ -717,7 +717,7 @@
fsm->pdo_pos++;
ec_fsm_pdo_conf_action_assign_pdo(fsm);
}
-
+
/*****************************************************************************/
/** Set the number of assigned PDOs.
--- a/master/fsm_pdo_entry.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/fsm_pdo_entry.c Thu Sep 06 20:22:24 2012 +0200
@@ -111,7 +111,7 @@
fsm->target_pdo = pdo;
ec_pdo_clear_entries(fsm->target_pdo);
-
+
fsm->state = ec_fsm_pdo_entry_read_state_start;
}
@@ -355,7 +355,7 @@
const struct list_head *list /**< current entry list item */
)
{
- list = list->next;
+ list = list->next;
if (list == &fsm->source_pdo->entries)
return NULL; // no next entry
return list_entry(list, ec_pdo_entry_t, list);
@@ -382,7 +382,7 @@
// find first entry
if (!(fsm->entry = ec_fsm_pdo_entry_conf_next_entry(
fsm, &fsm->source_pdo->entries))) {
-
+
EC_SLAVE_DBG(fsm->slave, 1, "No entries to map.\n");
fsm->state = ec_fsm_pdo_entry_state_end; // finished
@@ -415,7 +415,7 @@
fsm->request.data_size = 4;
ec_sdo_request_address(&fsm->request, fsm->source_pdo->index, fsm->entry_pos);
ecrt_sdo_request_write(&fsm->request);
-
+
fsm->state = ec_fsm_pdo_entry_conf_state_map_entry;
ec_fsm_coe_transfer(fsm->fsm_coe, fsm->slave, &fsm->request);
ec_fsm_coe_exec(fsm->fsm_coe); // execute immediately
@@ -453,7 +453,7 @@
EC_SLAVE_DBG(fsm->slave, 1, "Setting number of PDO entries to %u.\n",
fsm->entry_pos);
-
+
fsm->state = ec_fsm_pdo_entry_conf_state_set_entry_count;
ec_fsm_coe_transfer(fsm->fsm_coe, fsm->slave, &fsm->request);
ec_fsm_coe_exec(fsm->fsm_coe); // execute immediately
--- a/master/ioctl.h Thu Sep 06 19:52:17 2012 +0200
+++ b/master/ioctl.h Thu Sep 06 20:22:24 2012 +0200
@@ -590,7 +590,7 @@
uint16_t entry_index;
uint8_t entry_subindex;
uint32_t domain_index;
-
+
// outputs
unsigned int bit_position;
} ec_ioctl_reg_pdo_entry_t;
--- a/master/master.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/master.c Thu Sep 06 20:22:24 2012 +0200
@@ -156,7 +156,7 @@
master->slaves = NULL;
master->slave_count = 0;
-
+
INIT_LIST_HEAD(&master->configs);
INIT_LIST_HEAD(&master->domains);
@@ -172,7 +172,7 @@
master->config_busy = 0;
sema_init(&master->config_sem, 1);
init_waitqueue_head(&master->config_queue);
-
+
INIT_LIST_HEAD(&master->datagram_queue);
master->datagram_index = 0;
@@ -180,7 +180,7 @@
sema_init(&master->ext_queue_sem, 1);
INIT_LIST_HEAD(&master->external_datagram_queue);
-
+
// send interval in IDLE phase
ec_master_set_send_interval(master, 1000000 / HZ);
@@ -274,7 +274,7 @@
ret = ec_cdev_init(&master->cdev, master, device_number);
if (ret)
goto out_clear_sync_mon;
-
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
master->class_device = device_create(class, NULL,
MKDEV(MAJOR(device_number), master->index), NULL,
@@ -334,7 +334,7 @@
#endif
ec_cdev_clear(&master->cdev);
-
+
#ifdef EC_EOE
ec_master_clear_eoe_handlers(master);
#endif
@@ -512,7 +512,7 @@
master->thread = NULL;
return err;
}
-
+
return 0;
}
@@ -525,7 +525,7 @@
)
{
unsigned long sleep_jiffies;
-
+
if (!master->thread) {
EC_MASTER_WARN(master, "%s(): Already finished!\n", __func__);
return;
@@ -539,7 +539,7 @@
if (master->fsm_datagram.state != EC_DATAGRAM_SENT)
return;
-
+
// wait for FSM datagram
sleep_jiffies = max(HZ / 100, 1); // 10 ms, at least 1 jiffy
schedule_timeout(sleep_jiffies);
@@ -586,7 +586,7 @@
EC_MASTER_DBG(master, 1, "IDLE -> ORPHANED.\n");
master->phase = EC_ORPHANED;
-
+
#ifdef EC_EOE
ec_master_eoe_stop(master);
#endif
@@ -647,7 +647,7 @@
" interrupted by signal.\n");
goto out_allow;
}
-
+
EC_MASTER_DBG(master, 1, "Waiting for pending"
" slave scan returned.\n");
}
@@ -672,7 +672,7 @@
master->app_receive_cb = NULL;
master->app_cb_data = NULL;
return ret;
-
+
out_allow:
master->allow_scan = 1;
out_return:
@@ -1035,7 +1035,7 @@
/** Processes a received frame.
*
* This function is called by the network driver for every received frame.
- *
+ *
* \return 0 in case of success, else < 0
*/
void ec_master_receive_datagrams(ec_master_t *master, /**< EtherCAT master */
@@ -1357,7 +1357,7 @@
#endif
// send interval in IDLE phase
- ec_master_set_send_interval(master, 1000000 / HZ);
+ ec_master_set_send_interval(master, 1000000 / HZ);
EC_MASTER_DBG(master, 1, "Idle thread running with send interval = %u us,"
" max data size=%zu\n", master->send_interval,
@@ -1410,7 +1410,7 @@
#endif
}
}
-
+
EC_MASTER_DBG(master, 1, "Master IDLE thread exiting...\n");
return 0;
@@ -1468,7 +1468,7 @@
}
#endif
}
-
+
EC_MASTER_DBG(master, 1, "Master OP thread exiting...\n");
return 0;
}
@@ -1584,7 +1584,7 @@
schedule();
}
}
-
+
EC_MASTER_DBG(master, 1, "EoE thread exiting...\n");
return 0;
}
@@ -1601,7 +1601,7 @@
ec_slave_config_t *sc;
list_for_each_entry(sc, &master->configs, list) {
- ec_slave_config_detach(sc);
+ ec_slave_config_detach(sc);
}
}
@@ -1892,7 +1892,7 @@
}
master->dc_ref_clock = ref;
-
+
// This call always succeeds, because the datagram has been pre-allocated.
ec_datagram_frmw(&master->sync_datagram,
ref ? ref->station_address : 0xffff, 0x0910, 4);
@@ -2110,7 +2110,7 @@
}
domain_offset += domain->data_size;
}
-
+
up(&master->master_sem);
// restart EoE process and master thread with new locking
@@ -2129,7 +2129,7 @@
master->send_cb = master->app_send_cb;
master->receive_cb = master->app_receive_cb;
master->cb_data = master->app_cb_data;
-
+
#ifdef EC_EOE
if (eoe_was_running) {
ec_master_eoe_start(master);
@@ -2175,11 +2175,11 @@
eoe_was_running = master->eoe_thread != NULL;
ec_master_eoe_stop(master);
#endif
-
+
master->send_cb = ec_master_internal_send_cb;
master->receive_cb = ec_master_internal_receive_cb;
master->cb_data = master;
-
+
ec_master_clear_config(master);
for (slave = master->slaves;
--- a/master/master.h Thu Sep 06 19:52:17 2012 +0200
+++ b/master/master.h Thu Sep 06 20:22:24 2012 +0200
@@ -206,7 +206,7 @@
/* Configuration applied by the application. */
struct list_head configs; /**< List of slave configurations. */
struct list_head domains; /**< List of domains. */
-
+
u64 app_time; /**< Time of the last ecrt_master_sync() call. */
u64 app_start_time; /**< Application start time. */
u8 has_app_time; /**< Application time is valid. */
@@ -217,7 +217,7 @@
ec_datagram_t sync_mon_datagram; /**< Datagram used for DC synchronisation
monitoring. */
ec_slave_t *dc_ref_clock; /**< DC reference clock slave. */
-
+
unsigned int scan_busy; /**< Current scan state. */
unsigned int allow_scan; /**< \a True, if slave scanning is allowed. */
struct semaphore scan_sem; /**< Semaphore protecting the \a scan_busy
--- a/master/pdo.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/pdo.c Thu Sep 06 20:22:24 2012 +0200
@@ -47,7 +47,7 @@
ec_pdo_t *pdo /**< EtherCAT PDO */
)
{
- pdo->sync_index = -1; // not assigned
+ pdo->sync_index = -1; // not assigned
pdo->name = NULL;
INIT_LIST_HEAD(&pdo->entries);
}
@@ -131,7 +131,7 @@
if (pdo->name && name && !strcmp(pdo->name, name))
return 0;
-
+
if (pdo->name)
kfree(pdo->name);
--- a/master/pdo_entry.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/pdo_entry.c Thu Sep 06 20:22:24 2012 +0200
@@ -95,7 +95,7 @@
if (entry->name && name && !strcmp(entry->name, name))
return 0;
-
+
if (entry->name)
kfree(entry->name);
--- a/master/pdo_list.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/pdo_list.c Thu Sep 06 20:22:24 2012 +0200
@@ -152,7 +152,7 @@
EC_ERR("PDO 0x%04X is already mapped!\n", pdo->index);
return -EEXIST;
}
-
+
if (!(mapped_pdo = kmalloc(sizeof(ec_pdo_t), GFP_KERNEL))) {
EC_ERR("Failed to allocate PDO memory.\n");
return -ENOMEM;
@@ -190,7 +190,7 @@
if (ret)
return ret;
}
-
+
return 0;
}
--- a/master/sdo.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/sdo.c Thu Sep 06 20:22:24 2012 +0200
@@ -84,7 +84,7 @@
/*****************************************************************************/
/** Get an SDO entry from an SDO via its subindex.
- *
+ *
* \retval >0 Pointer to the requested SDO entry.
* \retval NULL SDO entry not found.
*/
@@ -109,7 +109,7 @@
/** Get an SDO entry from an SDO via its subindex.
*
* const version.
- *
+ *
* \retval >0 Pointer to the requested SDO entry.
* \retval NULL SDO entry not found.
*/
--- a/master/slave.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/slave.c Thu Sep 06 20:22:24 2012 +0200
@@ -259,7 +259,7 @@
/*****************************************************************************/
-/** Clear the sync manager array.
+/** Clear the sync manager array.
*/
void ec_slave_clear_sync_managers(ec_slave_t *slave /**< EtherCAT slave. */)
{
@@ -579,7 +579,7 @@
unsigned int index /**< string index */
)
{
- if (!index--)
+ if (!index--)
return NULL;
if (index >= slave->sii.string_count) {
@@ -794,7 +794,7 @@
unsigned int i;
ec_sync_t *sync;
ec_pdo_t *pdo;
-
+
for (i = 0; i < slave->sii.sync_count; i++) {
sync = slave->sii.syncs + i;
list_for_each_entry(pdo, &sync->pdos.list, list) {
--- a/master/slave.h Thu Sep 06 19:52:17 2012 +0200
+++ b/master/slave.h Thu Sep 06 20:22:24 2012 +0200
@@ -128,7 +128,7 @@
/** Slave information interface data.
*/
typedef struct {
- // Non-category data
+ // Non-category data
uint16_t alias; /**< Configured station alias. */
uint32_t vendor_id; /**< Vendor ID. */
uint32_t product_code; /**< Vendor-specific product code. */
@@ -257,7 +257,7 @@
ec_direction_t);
// misc.
-ec_sync_t *ec_slave_get_sync(ec_slave_t *, uint8_t);
+ec_sync_t *ec_slave_get_sync(ec_slave_t *, uint8_t);
void ec_slave_sdo_dict_info(const ec_slave_t *,
unsigned int *, unsigned int *);
--- a/master/slave_config.c Thu Sep 06 19:52:17 2012 +0200
+++ b/master/slave_config.c Thu Sep 06 20:22:24 2012 +0200
@@ -272,7 +272,7 @@
if (!sc->slave)
return;
-
+
for (sync_index = 0; sync_index < EC_MAX_SYNC_MANAGERS; sync_index++) {
sync_config = &sc->sync_configs[sync_index];
if ((sync = ec_slave_get_sync(sc->slave, sync_index))) {
@@ -471,7 +471,7 @@
ec_direction_t dir, ec_watchdog_mode_t watchdog_mode)
{
ec_sync_config_t *sync_config;
-
+
EC_CONFIG_DBG(sc, 1, "ecrt_slave_config_sync_manager(sc = 0x%p,"
" sync_index = %u, dir = %i, watchdog_mode = %i)\n",
sc, sync_index, dir, watchdog_mode);
@@ -562,7 +562,7 @@
ec_pdo_t *pdo = NULL;
ec_pdo_entry_t *entry;
int retval = 0;
-
+
EC_CONFIG_DBG(sc, 1, "%s(sc = 0x%p, "
"pdo_index = 0x%04X, entry_index = 0x%04X, "
"entry_subindex = 0x%02X, entry_bit_length = %u)\n",
@@ -583,7 +583,7 @@
retval = PTR_ERR(entry);
} else {
EC_CONFIG_ERR(sc, "PDO 0x%04X is not assigned.\n", pdo_index);
- retval = -ENOENT;
+ retval = -ENOENT;
}
return retval;
@@ -596,7 +596,7 @@
{
uint8_t sync_index;
ec_pdo_t *pdo = NULL;
-
+
EC_CONFIG_DBG(sc, 1, "%s(sc = 0x%p, pdo_index = 0x%04X)\n",
__func__, sc, pdo_index);
@@ -787,7 +787,7 @@
kfree(req);
return ret;
}
-
+
down(&sc->master->master_sem);
list_add_tail(&req->list, &sc->sdo_configs);
up(&sc->master->master_sem);
@@ -872,7 +872,7 @@
kfree(req);
return ret;
}
-
+
down(&sc->master->master_sem);
list_add_tail(&req->list, &sc->sdo_configs);
up(&sc->master->master_sem);
@@ -913,12 +913,12 @@
// prepare data for optional writing
memset(req->data, 0x00, size);
req->data_size = size;
-
+
down(&sc->master->master_sem);
list_add_tail(&req->list, &sc->sdo_requests);
up(&sc->master->master_sem);
- return req;
+ return req;
}
/*****************************************************************************/
@@ -960,7 +960,7 @@
list_add_tail(&voe->list, &sc->voe_handlers);
up(&sc->master->master_sem);
- return voe;
+ return voe;
}
/*****************************************************************************/
@@ -992,7 +992,7 @@
/*****************************************************************************/
-int ecrt_slave_config_idn(ec_slave_config_t *sc, uint8_t drive_no,
+int ecrt_slave_config_idn(ec_slave_config_t *sc, uint8_t drive_no,
uint16_t idn, ec_al_state_t state, const uint8_t *data,
size_t size)
{
@@ -1038,7 +1038,7 @@
kfree(req);
return ret;
}
-
+
down(&sc->master->master_sem);
list_add_tail(&req->list, &sc->soe_configs);
up(&sc->master->master_sem);
--- a/script/ifup-eoe.sh Thu Sep 06 19:52:17 2012 +0200
+++ b/script/ifup-eoe.sh Thu Sep 06 20:22:24 2012 +0200
@@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
--- a/script/init.d/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/script/init.d/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
--- a/script/init.d/ethercat.in Thu Sep 06 19:52:17 2012 +0200
+++ b/script/init.d/ethercat.in Thu Sep 06 20:22:24 2012 +0200
@@ -24,7 +24,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
@@ -126,7 +126,7 @@
else
echo Invalid MAC address \"${1}\" in ${ETHERCAT_CONFIG}
exit_fail
- fi
+ fi
}
#------------------------------------------------------------------------------
@@ -157,7 +157,7 @@
parse_mac_address ${DEVICE}
DEVICES=${DEVICES}${MAC}
-
+
parse_mac_address ${BACKUP}
BACKUPS=${BACKUPS}${MAC}
@@ -243,7 +243,7 @@
for i in `seq 0 $(expr ${MASTER_COUNT} - 1)`; do
echo -n "Master${i} "
-
+
# Check if the master is in idle or operation phase
${ETHERCAT} master --master ${i} 2>/dev/null | \
grep -qE 'Phase:[[:space:]]*Idle|Phase:[[:space:]]*Operation'
--- a/script/sysconfig/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/script/sysconfig/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
--- a/script/sysconfig/ethercat Thu Sep 06 19:52:17 2012 +0200
+++ b/script/sysconfig/ethercat Thu Sep 06 20:22:24 2012 +0200
@@ -52,7 +52,7 @@
#
# Note: The e100, e1000, e1000e and r8169 drivers are not built by default.
# Enable them with the --enable-<driver> configure switches.
-#
+#
DEVICE_MODULES=""
#
@@ -60,7 +60,7 @@
#
# This can usually be left empty. Adjust this variable, if you have problems
# with module loading.
-#
+#
#MODPROBE_FLAGS="-b"
#------------------------------------------------------------------------------
--- a/tool/Command.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/Command.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -222,7 +222,7 @@
{
return name.substr(0, cmd.length()) == cmd;
}
-
+
/****************************************************************************/
bool Command::matchesAbbrev(const string &abb) const
@@ -238,7 +238,7 @@
return true;
}
-
+
/*****************************************************************************/
string Command::numericInfo()
@@ -497,7 +497,7 @@
default: ret = "???";
}
- if (state & EC_SLAVE_STATE_ACK_ERR) {
+ if (state & EC_SLAVE_STATE_ACK_ERR) {
ret += "+ERROR";
}
--- a/tool/CommandAlias.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandAlias.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -102,7 +102,7 @@
MasterDevice m(getSingleMasterIndex());
m.open(MasterDevice::ReadWrite);
slaves = selectedSlaves(m);
-
+
if (slaves.size() > 1 && !getForce()) {
err << "This will write the alias addresses of "
<< slaves.size() << " slaves to " << alias
--- a/tool/CommandCStruct.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandCStruct.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -180,7 +180,7 @@
<< " * Product code: 0x" << hex << setfill('0')
<< setw(8) << slave.product_code << endl
<< " * Revision number: 0x" << hex << setfill('0')
- << setw(8) << slave.revision_number << endl
+ << setw(8) << slave.revision_number << endl
<< " */" << endl
<< endl;
--- a/tool/CommandConfig.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandConfig.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -170,7 +170,7 @@
<< "Product code: 0x"
<< setw(8) << configIter->product_code << endl << indent
<< "Attached slave: ";
-
+
if (configIter->slave_position != -1) {
m.getSlave(&slave, configIter->slave_position);
cout << dec << configIter->slave_position
--- a/tool/CommandData.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandData.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -102,7 +102,7 @@
ec_ioctl_domain_data_t data;
unsigned char *processData;
unsigned int i;
-
+
if (!domain.data_size)
return;
--- a/tool/CommandDebug.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandDebug.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -73,7 +73,7 @@
MasterIndexList masterIndices;
stringstream str;
int debugLevel;
-
+
if (args.size() != 1) {
stringstream err;
err << "'" << getName() << "' takes exactly one argument!";
--- a/tool/CommandEoe.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandEoe.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -69,7 +69,7 @@
ec_ioctl_eoe_handler_t eoe;
bool doIndent;
string indent;
-
+
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
--- a/tool/CommandGraph.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandGraph.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -83,7 +83,7 @@
portMedia[EC_PORT_EBUS] = "EBUS";
mediaWeights[EC_PORT_EBUS] = 5;
-
+
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
@@ -111,7 +111,7 @@
<< " master [label=\"EtherCAT\\nMaster\"]" << endl;
if (slaves.size()) {
- cout << " master -- slave0";
+ cout << " master -- slave0";
mi = portMedia.find(slaves.front().ports[0].desc);
if (mi != portMedia.end())
cout << "[label=\"" << mi->second << "\"]";
@@ -176,14 +176,14 @@
/* Try medium of next-hop slave. */
mi = portMedia.find(next->ports[0].desc);
}
-
+
if (mi != portMedia.end())
cout << ",label=\"" << mi->second << "\"";
wi = mediaWeights.find(si->ports[i].desc);
if (wi != mediaWeights.end())
cout << ",weight=\"" << wi->second << "\"";
-
+
cout << "]" << endl;
}
--- a/tool/CommandMaster.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandMaster.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -74,7 +74,7 @@
time_t epoch;
char time_str[MAX_TIME_STR_SIZE + 1];
size_t time_str_size;
-
+
if (args.size()) {
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
--- a/tool/CommandPdos.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandPdos.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -95,7 +95,7 @@
SlaveList slaves;
SlaveList::const_iterator si;
bool showHeader, multiMaster;
-
+
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
@@ -130,7 +130,7 @@
ec_ioctl_slave_sync_pdo_t pdo;
ec_ioctl_slave_sync_pdo_entry_t entry;
unsigned int i, j, k;
-
+
if (showHeader && slave.sync_count)
cout << "=== Master " << m.getIndex()
<< ", Slave " << slave.position << " ===" << endl;
--- a/tool/CommandRegRead.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandRegRead.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -140,7 +140,7 @@
err << "Offset and length exceeding 64k!";
throwInvalidUsageException(err);
}
-
+
MasterDevice m(getSingleMasterIndex());
m.open(MasterDevice::Read);
slaves = selectedSlaves(m);
--- a/tool/CommandRegWrite.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandRegWrite.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -51,7 +51,7 @@
str << binaryBaseName << " " << getName()
<< " [OPTIONS] <OFFSET> <DATA>" << endl
- << endl
+ << endl
<< getBriefDescription() << endl
<< endl
<< "This command requires a single slave to be selected." << endl
@@ -91,7 +91,7 @@
err << "'" << getName() << "' takes exactly two arguments!";
throwInvalidUsageException(err);
}
-
+
strOffset << args[0];
strOffset
>> resetiosflags(ios::basefield) // guess base from prefix
@@ -100,7 +100,7 @@
err << "Invalid offset '" << args[0] << "'!";
throwInvalidUsageException(err);
}
-
+
if (getDataType().empty()) {
if (args[1] == "-") {
loadRegData(&data, cin);
--- a/tool/CommandRescan.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandRescan.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -65,7 +65,7 @@
void CommandRescan::execute(const StringVector &args)
{
MasterIndexList masterIndices;
-
+
if (args.size() != 0) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
--- a/tool/CommandSdos.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandSdos.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -128,7 +128,7 @@
ec_ioctl_slave_sdo_entry_t entry;
unsigned int i, j;
const DataType *d;
-
+
if (showHeader && slave.sdo_count)
cout << "=== Master " << m.getIndex()
<< ", Slave " << slave.position << " ===" << endl;
--- a/tool/CommandSiiRead.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandSiiRead.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -161,7 +161,7 @@
if (categoryHeader + 2 + categorySize + 1
> data.words + data.nwords) {
- err << "SII data seem to be corrupted!";
+ err << "SII data seem to be corrupted!";
throwCommandException(err);
}
categoryHeader += 2 + categorySize;
--- a/tool/CommandSiiWrite.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandSiiWrite.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -51,7 +51,7 @@
str << binaryBaseName << " " << getName()
<< " [OPTIONS] <FILENAME>" << endl
- << endl
+ << endl
<< getBriefDescription() << endl
<< endl
<< "This command requires a single slave to be selected." << endl
--- a/tool/CommandSlaves.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandSlaves.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -111,7 +111,7 @@
MasterIndexList masterIndices;
SlaveList slaves;
bool doIndent;
-
+
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
@@ -155,14 +155,14 @@
unsigned int maxPosWidth = 0, maxAliasWidth = 0,
maxRelPosWidth = 0, maxStateWidth = 0;
string indent(doIndent ? " " : "");
-
+
m.getMaster(&master);
lastAlias = 0;
aliasIndex = 0;
for (i = 0; i < master.slave_count; i++) {
m.getSlave(&slave, i);
-
+
if (slave.alias) {
lastAlias = slave.alias;
aliasIndex = 0;
@@ -296,7 +296,7 @@
if (si->dc_supported)
cout << " RxTime [ns] Diff [ns] NextDc [ns]";
cout << endl;
-
+
for (i = 0; i < EC_MAX_PORTS; i++) {
cout << " " << i << " " << setfill(' ') << left << setw(4);
switch (si->ports[i].desc) {
@@ -329,7 +329,7 @@
} else {
cout << "-";
}
-
+
if (si->dc_supported) {
cout << " " << setw(11) << right;
if (!si->ports[i].link.loop_closed) {
--- a/tool/CommandSlaves.h Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandSlaves.h Thu Sep 06 20:22:24 2012 +0200
@@ -56,7 +56,7 @@
void listSlaves(MasterDevice &, const SlaveList &, bool);
void showSlaves(MasterDevice &, const SlaveList &);
-
+
static bool slaveInList( const ec_ioctl_slave_t &, const SlaveList &);
};
--- a/tool/CommandStates.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandStates.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -74,7 +74,7 @@
stringstream err;
string stateStr;
uint8_t state = 0x00;
-
+
if (args.size() != 1) {
err << "'" << getName() << "' takes exactly one argument!";
throwInvalidUsageException(err);
--- a/tool/CommandXml.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/CommandXml.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -115,7 +115,7 @@
for (i = 0; i < indent; i++) {
in += " ";
}
-
+
cout
<< in << "<EtherCATInfo>" << endl
<< in << " <!-- Slave " << slave.position << " -->" << endl
@@ -178,7 +178,7 @@
<< in << " <SubIndex>"
<< dec << (unsigned int) entry.subindex
<< "</SubIndex>" << endl;
-
+
cout
<< in << " <BitLen>"
<< dec << (unsigned int) entry.bit_length
--- a/tool/DataTypeHandler.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/DataTypeHandler.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -102,7 +102,7 @@
void *target,
size_t targetSize
)
-{
+{
stringstream str;
size_t dataSize = type->byteSize;
@@ -269,7 +269,7 @@
void *data,
size_t dataSize
)
-{
+{
uint16_t typeCode;
if (type) {
--- a/tool/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/tool/MasterDevice.cpp Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/MasterDevice.cpp Thu Sep 06 20:22:24 2012 +0200
@@ -523,7 +523,7 @@
data.slave_position = slavePosition;
data.al_state = state;
-
+
if (ioctl(fd, EC_IOCTL_SLAVE_STATE, &data)) {
stringstream err;
err << "Failed to request slave state: ";
--- a/tool/MasterDevice.h Thu Sep 06 19:52:17 2012 +0200
+++ b/tool/MasterDevice.h Thu Sep 06 20:22:24 2012 +0200
@@ -43,7 +43,7 @@
public runtime_error
{
friend class MasterDevice;
-
+
protected:
/** Constructor with string parameter. */
MasterDeviceException(
@@ -59,13 +59,13 @@
/****************************************************************************/
class MasterDeviceSdoAbortException:
- public MasterDeviceException
+ public MasterDeviceException
{
friend class MasterDevice;
public:
uint32_t abortCode;
-
+
protected:
/** Constructor with abort code parameter. */
MasterDeviceSdoAbortException(uint32_t code):
@@ -77,13 +77,13 @@
/****************************************************************************/
class MasterDeviceSoeException:
- public MasterDeviceException
+ public MasterDeviceException
{
friend class MasterDevice;
public:
uint16_t errorCode;
-
+
protected:
/** Constructor with error code parameter. */
MasterDeviceSoeException(uint16_t code):
--- a/tty/Kbuild.in Thu Sep 06 19:52:17 2012 +0200
+++ b/tty/Kbuild.in Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
--- a/tty/Makefile.am Thu Sep 06 19:52:17 2012 +0200
+++ b/tty/Makefile.am Thu Sep 06 20:22:24 2012 +0200
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
-#
+#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
--- a/tty/module.c Thu Sep 06 19:52:17 2012 +0200
+++ b/tty/module.c Thu Sep 06 20:22:24 2012 +0200
@@ -482,7 +482,7 @@
{
ec_tty_t *t = (ec_tty_t *) tty->driver_data;
int ret = ec_tty_tx_space(t);
-
+
#if EC_TTY_DEBUG >= 2
printk(KERN_INFO PFX "%s() = %i.\n", __func__, ret);
#endif
@@ -496,7 +496,7 @@
{
ec_tty_t *t = (ec_tty_t *) tty->driver_data;
int ret;
-
+
#if EC_TTY_DEBUG >= 2
printk(KERN_INFO PFX "%s().\n", __func__);
#endif
@@ -506,7 +506,7 @@
#if EC_TTY_DEBUG >= 2
printk(KERN_INFO PFX "%s() = %i.\n", __func__, ret);
#endif
-
+
return ret;
}
@@ -528,7 +528,7 @@
{
ec_tty_t *t = (ec_tty_t *) tty->driver_data;
int ret = -ENOTTY;
-
+
#if EC_TTY_DEBUG >= 2
printk(KERN_INFO PFX "%s(tty=%p, file=%p, cmd=%08x, arg=%08lx).\n",
__func__, tty, file, cmd, arg);