- restored examples/user/ stable-1.5
authorPatrick Bruenn <p.bruenn@beckhoff.com>
Tue, 06 May 2014 17:23:33 +0200
branchstable-1.5
changeset 2565 f7b06b264646
parent 2561 4839e81d2bdd
child 2566 0f39e1e7b288
- restored examples/user/
- removed /devices/ccat/COPYING
- replaced DRV_NAME with KBUILD_MODNAME
devices/ccat/COPYING
devices/ccat/Makefile.am
devices/ccat/module.c
devices/ccat/module.h
devices/ccat/netdev.c
devices/ccat/update.c
examples/user/main.c
--- a/devices/ccat/COPYING	Fri Apr 25 17:32:49 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
--- a/devices/ccat/Makefile.am	Fri Apr 25 17:32:49 2014 +0200
+++ b/devices/ccat/Makefile.am	Tue May 06 17:23:33 2014 +0200
@@ -28,7 +28,6 @@
 #------------------------------------------------------------------------------
 
 EXTRA_DIST = \
-	COPYING \
 	Kbuild.in \
 	module.h \
 	netdev.h \
--- a/devices/ccat/module.c	Fri Apr 25 17:32:49 2014 +0200
+++ b/devices/ccat/module.c	Tue May 06 17:23:33 2014 +0200
@@ -66,7 +66,7 @@
 		return -EIO;
 	}
 
-	res = request_mem_region(bar->start, bar->len, DRV_NAME);
+	res = request_mem_region(bar->start, bar->len, KBUILD_MODNAME);
 	if (!res) {
 		pr_info("allocate mem_region failed.\n");
 		return -EIO;
@@ -127,7 +127,7 @@
 		return -1;
 	}
 
-	if (request_dma(channel, DRV_NAME)) {
+	if (request_dma(channel, KBUILD_MODNAME)) {
 		pr_info("request dma channel %llu failed\n",
 			(uint64_t) channel);
 		ccat_dma_free(dma);
@@ -283,7 +283,7 @@
 MODULE_DEVICE_TABLE(pci, pci_ids);
 
 static struct pci_driver pci_driver = {
-	.name = DRV_NAME,
+	.name = KBUILD_MODNAME,
 	.id_table = pci_ids,
 	.probe = ccat_probe,
 	.remove = ccat_remove,
--- a/devices/ccat/module.h	Fri Apr 25 17:32:49 2014 +0200
+++ b/devices/ccat/module.h	Tue May 06 17:23:33 2014 +0200
@@ -27,9 +27,8 @@
 #include "CCatDefinitions.h"
 #include "../ecdev.h"
 
-#define DRV_NAME         "ec_ccat"
 #define DRV_EXTRAVERSION "-ec"
-#define DRV_VERSION      "0.8" DRV_EXTRAVERSION
+#define DRV_VERSION      "0.9" DRV_EXTRAVERSION
 #define DRV_DESCRIPTION  "Beckhoff CCAT Ethernet/EtherCAT Network Driver"
 
 #undef pr_fmt
--- a/devices/ccat/netdev.c	Fri Apr 25 17:32:49 2014 +0200
+++ b/devices/ccat/netdev.c	Tue May 06 17:23:33 2014 +0200
@@ -344,8 +344,8 @@
 		return NULL;
 	}
 	pr_info("registered %s as network device.\n", netdev->name);
-	priv->rx_thread = kthread_run(run_rx_thread, netdev, "%s_rx", DRV_NAME);
-	priv->tx_thread = kthread_run(run_tx_thread, netdev, "%s_tx", DRV_NAME);
+	priv->rx_thread = kthread_run(run_rx_thread, netdev, "%s_rx", KBUILD_MODNAME);
+	priv->tx_thread = kthread_run(run_tx_thread, netdev, "%s_tx", KBUILD_MODNAME);
 	return priv;
 }
 
@@ -368,7 +368,7 @@
 	struct ccat_eth_priv *const priv = netdev_priv(dev);
 	priv->carrier_off(dev);
 	priv->poll_thread =
-	    kthread_run(run_poll_thread, dev, "%s_poll", DRV_NAME);
+	    kthread_run(run_poll_thread, dev, "%s_poll", KBUILD_MODNAME);
 
 	//TODO
 	return 0;
--- a/devices/ccat/update.c	Fri Apr 25 17:32:49 2014 +0200
+++ b/devices/ccat/update.c	Tue May 06 17:23:33 2014 +0200
@@ -402,7 +402,7 @@
 		goto cleanup;
 	}
 
-	if (alloc_chrdev_region(&update->dev, 0, 1, DRV_NAME)) {
+	if (alloc_chrdev_region(&update->dev, 0, 1, KBUILD_MODNAME)) {
 		pr_warn("alloc_chrdev_region() failed\n");
 		goto cleanup;
 	}
--- a/examples/user/main.c	Fri Apr 25 17:32:49 2014 +0200
+++ b/examples/user/main.c	Tue May 06 17:23:33 2014 +0200
@@ -44,7 +44,11 @@
 
 // Application parameters
 #define FREQUENCY 100
-#define PRIORITY 0
+#define PRIORITY 1
+
+// Optional features
+#define CONFIGURE_PDOS  1
+#define SDO_ACCESS      0
 
 /****************************************************************************/
 
@@ -67,82 +71,107 @@
 // process data
 static uint8_t *domain1_pd = NULL;
 
-#define BusCouplerPos  0, 3
-#define DigOutSlavePos 0, 0
-
-//#define Beckhoff_EK1100 0x00000002, 0x044c2c52
-#define Beckhoff_EK1100 0x00000002, 0x04562c52
-#define Beckhoff_EL1008 0x00000002, 0x03f03052
+#define BusCouplerPos  0, 0
+#define DigOutSlavePos 0, 2
+#define AnaInSlavePos  0, 3
+#define AnaOutSlavePos 0, 4
+
+#define Beckhoff_EK1100 0x00000002, 0x044c2c52
 #define Beckhoff_EL2004 0x00000002, 0x07d43052
-#define Beckhoff_EL2008 0x00000002, 0x07d83052
 #define Beckhoff_EL2032 0x00000002, 0x07f03052
 #define Beckhoff_EL3152 0x00000002, 0x0c503052
 #define Beckhoff_EL3102 0x00000002, 0x0c1e3052
 #define Beckhoff_EL4102 0x00000002, 0x10063052
 
 // offsets for PDO entries
-static unsigned int off_dig_in[1];
-static unsigned int off_dig_out[2];
-
-
-/*****************************************************************************/
-// Digital in ------------------------
-static ec_pdo_entry_info_t el1008_channels[] = {
-    {0x6000, 1, 1},
-    {0x6010, 1, 1},
-    {0x6020, 1, 1},
-    {0x6030, 1, 1},
-    {0x6040, 1, 1},
-    {0x6050, 1, 1},
-    {0x6060, 1, 1},
-    {0x6070, 1, 1},
-};
-
-static ec_pdo_info_t el1008_pdos[] = {
-    {0x1a00, 1, &el1008_channels[0]},
-    {0x1a01, 1, &el1008_channels[1]},
-    {0x1a02, 1, &el1008_channels[2]},
-    {0x1a03, 1, &el1008_channels[3]},
-    {0x1a04, 1, &el1008_channels[4]},
-    {0x1a05, 1, &el1008_channels[5]},
-    {0x1a06, 1, &el1008_channels[6]},
-    {0x1a07, 1, &el1008_channels[7]}
-};
-
-static ec_sync_info_t el1008_syncs[] = {
+static unsigned int off_ana_in_status;
+static unsigned int off_ana_in_value;
+static unsigned int off_ana_out;
+static unsigned int off_dig_out;
+
+const static ec_pdo_entry_reg_t domain1_regs[] = {
+    {AnaInSlavePos,  Beckhoff_EL3102, 0x3101, 1, &off_ana_in_status},
+    {AnaInSlavePos,  Beckhoff_EL3102, 0x3101, 2, &off_ana_in_value},
+    {AnaOutSlavePos, Beckhoff_EL4102, 0x3001, 1, &off_ana_out},
+    {DigOutSlavePos, Beckhoff_EL2032, 0x3001, 1, &off_dig_out},
+    {}
+};
+
+static unsigned int counter = 0;
+static unsigned int blink = 0;
+
+/*****************************************************************************/
+
+#if CONFIGURE_PDOS
+
+// Analog in --------------------------
+
+static ec_pdo_entry_info_t el3102_pdo_entries[] = {
+    {0x3101, 1,  8}, // channel 1 status
+    {0x3101, 2, 16}, // channel 1 value
+    {0x3102, 1,  8}, // channel 2 status
+    {0x3102, 2, 16}, // channel 2 value
+    {0x6401, 1, 16}, // channel 1 value (alt.)
+    {0x6401, 2, 16}  // channel 2 value (alt.)
+};
+
+static ec_pdo_info_t el3102_pdos[] = {
+    {0x1A00, 2, el3102_pdo_entries},
+    {0x1A01, 2, el3102_pdo_entries + 2}
+};
+
+static ec_sync_info_t el3102_syncs[] = {
     {2, EC_DIR_OUTPUT},
-    {3, EC_DIR_INPUT, 8, el1008_pdos},
+    {3, EC_DIR_INPUT, 2, el3102_pdos},
     {0xff}
 };
 
+// Analog out -------------------------
+
+static ec_pdo_entry_info_t el4102_pdo_entries[] = {
+    {0x3001, 1, 16}, // channel 1 value
+    {0x3002, 1, 16}, // channel 2 value
+};
+
+static ec_pdo_info_t el4102_pdos[] = {
+    {0x1600, 1, el4102_pdo_entries},
+    {0x1601, 1, el4102_pdo_entries + 1}
+};
+
+static ec_sync_info_t el4102_syncs[] = {
+    {2, EC_DIR_OUTPUT, 2, el4102_pdos},
+    {3, EC_DIR_INPUT},
+    {0xff}
+};
+
 // Digital out ------------------------
-static ec_pdo_entry_info_t el2008_channels[] = {
-    {0x7000, 1, 1},
-    {0x7010, 1, 1},
-    {0x7020, 1, 1},
-    {0x7030, 1, 1},
-    {0x7040, 1, 1},
-    {0x7050, 1, 1},
-    {0x7060, 1, 1},
-    {0x7070, 1, 1},
-};
-
-static ec_pdo_info_t el2008_pdos[] = {
-    {0x1600, 1, &el2008_channels[0]},
-    {0x1601, 1, &el2008_channels[1]},
-    {0x1602, 1, &el2008_channels[2]},
-    {0x1603, 1, &el2008_channels[3]},
-    {0x1604, 1, &el2008_channels[4]},
-    {0x1605, 1, &el2008_channels[5]},
-    {0x1606, 1, &el2008_channels[6]},
-    {0x1607, 1, &el2008_channels[7]}
-};
-
-static ec_sync_info_t el2008_syncs[] = {
-    {0, EC_DIR_OUTPUT, 8, el2008_pdos},
+
+static ec_pdo_entry_info_t el2004_channels[] = {
+    {0x3001, 1, 1}, // Value 1
+    {0x3001, 2, 1}, // Value 2
+    {0x3001, 3, 1}, // Value 3
+    {0x3001, 4, 1}  // Value 4
+};
+
+static ec_pdo_info_t el2004_pdos[] = {
+    {0x1600, 1, &el2004_channels[0]},
+    {0x1601, 1, &el2004_channels[1]},
+    {0x1602, 1, &el2004_channels[2]},
+    {0x1603, 1, &el2004_channels[3]}
+};
+
+static ec_sync_info_t el2004_syncs[] = {
+    {0, EC_DIR_OUTPUT, 4, el2004_pdos},
     {1, EC_DIR_INPUT},
     {0xff}
 };
+#endif
+
+/*****************************************************************************/
+
+#if SDO_ACCESS
+static ec_sdo_request_t *sdo;
+#endif
 
 /*****************************************************************************/
 
@@ -197,59 +226,74 @@
     sc_ana_in_state = s;
 }
 
+/*****************************************************************************/
+
+#if SDO_ACCESS
+void read_sdo(void)
+{
+    switch (ecrt_sdo_request_state(sdo)) {
+        case EC_REQUEST_UNUSED: // request was not used yet
+            ecrt_sdo_request_read(sdo); // trigger first read
+            break;
+        case EC_REQUEST_BUSY:
+            fprintf(stderr, "Still busy...\n");
+            break;
+        case EC_REQUEST_SUCCESS:
+            fprintf(stderr, "SDO value: 0x%04X\n",
+                    EC_READ_U16(ecrt_sdo_request_data(sdo)));
+            ecrt_sdo_request_read(sdo); // trigger next read
+            break;
+        case EC_REQUEST_ERROR:
+            fprintf(stderr, "Failed to read SDO!\n");
+            ecrt_sdo_request_read(sdo); // retry reading
+            break;
+    }
+}
+#endif
+
 /****************************************************************************/
 
 void cyclic_task()
 {
-    static unsigned int counter = 10;
-    static uint8_t outputValue = 0;
-    static int numAsyncCycles = 0;
-    uint8_t inputValue = 0;
-    static uint8_t error = 0;
-
     // receive process data
     ecrt_master_receive(master);
     ecrt_domain_process(domain1);
 
     // check process data state (optional)
     check_domain1_state();
-    
-
-	inputValue = EC_READ_U8(domain1_pd + off_dig_in[0]);
-	
-	if(inputValue != outputValue) {
-		numAsyncCycles++;
-	} else {
-		numAsyncCycles = 0;
-	}
-	
-	if(numAsyncCycles > 2) {
-		if(error != 0xff) {
-			error++;
-		}
-	}
-	
-	
+
     if (counter) {
         counter--;
-    } else {
-        counter = 5; //update delay
-        
-        
+    } else { // do this at 1 Hz
+        counter = FREQUENCY;
 
         // calculate new process data
-        outputValue++;
+        blink = !blink;
 
         // check for master state (optional)
         check_master_state();
 
         // check for islave configuration state(s) (optional)
         check_slave_config_states();
-    }
-
+
+#if SDO_ACCESS
+        // read process data SDO
+        read_sdo();
+#endif
+
+    }
+
+#if 0
+    // read process data
+    printf("AnaIn: state %u value %u\n",
+            EC_READ_U8(domain1_pd + off_ana_in_status),
+            EC_READ_U16(domain1_pd + off_ana_in_value));
+#endif
+
+#if 1
     // write process data
-    EC_WRITE_U8(domain1_pd + off_dig_out[1], outputValue);
-    EC_WRITE_U8(domain1_pd + off_dig_out[0], error);
+    EC_WRITE_U8(domain1_pd + off_dig_out, blink ? 0x06 : 0x09);
+#endif
 
     // send process data
     ecrt_domain_queue(domain1);
@@ -268,31 +312,11 @@
 
 /****************************************************************************/
 
-int Init_EL2008(uint16_t position)
-{
-    ec_slave_config_t *sc;
-    if (!(sc = ecrt_master_slave_config(master, 0, position, Beckhoff_EL2008))) {
-        fprintf(stderr, "Failed to get EL2008 configuration #%u.\n", position);
-        return -1;
-    }
-    if (ecrt_slave_config_pdos(sc, EC_END, el2008_syncs)) {
-        fprintf(stderr, "Failed to configure PDOs #%u.\n", position);
-        return -1;
-    }
-    if (0 > (off_dig_out[position] = ecrt_slave_config_reg_pdo_entry(sc, 0x7000, 1, domain1, NULL))) {
-		fprintf(stderr, "Failed to configure reg PDOs #%u.\n", position);
-		return -1;
-	}
-    fprintf(stderr, "EL2008 #%u configured offset: %d.\n", position, off_dig_out[position]);
-    return 0;
-}
-
 int main(int argc, char **argv)
 {
     ec_slave_config_t *sc;
     struct sigaction sa;
     struct itimerval tv;
-    uint16_t i;
 
     master = ecrt_request_master(0);
     if (!master)
@@ -302,33 +326,60 @@
     if (!domain1)
         return -1;
 
+    if (!(sc_ana_in = ecrt_master_slave_config(
+                    master, AnaInSlavePos, Beckhoff_EL3102))) {
+        fprintf(stderr, "Failed to get slave configuration.\n");
+        return -1;
+    }
+
+#if SDO_ACCESS
+    fprintf(stderr, "Creating SDO requests...\n");
+    if (!(sdo = ecrt_slave_config_create_sdo_request(sc_ana_in, 0x3102, 2, 2))) {
+        fprintf(stderr, "Failed to create SDO request.\n");
+        return -1;
+    }
+    ecrt_sdo_request_timeout(sdo, 500); // ms
+#endif
+
+#if CONFIGURE_PDOS
     printf("Configuring PDOs...\n");
-    if (!(sc_ana_in = ecrt_master_slave_config(master, 0, 2, Beckhoff_EL1008))) {
-        fprintf(stderr, "Failed to get digital in configuration.\n");
-        return -1;
-    }
-    if (ecrt_slave_config_pdos(sc_ana_in, EC_END, el1008_syncs)) {
+    if (ecrt_slave_config_pdos(sc_ana_in, EC_END, el3102_syncs)) {
         fprintf(stderr, "Failed to configure PDOs.\n");
         return -1;
     }
-    if (0 > (off_dig_in[0] = ecrt_slave_config_reg_pdo_entry(sc_ana_in, 0x6000, 1, domain1, NULL))) {
-		fprintf(stderr, "Failed to configure reg PDOs.\n");
-		return -1;
-	}
-    printf("EL1008 configured.\n");
-
-    for(i = 0; i < 2; ++i) {
-        if(Init_EL2008(i)) {
-            fprintf(stderr, "Failed to initialize EL2008 #%u.\n", i);
-            return -1;
-        }
-    }
+
+    if (!(sc = ecrt_master_slave_config(
+                    master, AnaOutSlavePos, Beckhoff_EL4102))) {
+        fprintf(stderr, "Failed to get slave configuration.\n");
+        return -1;
+    }
+
+    if (ecrt_slave_config_pdos(sc, EC_END, el4102_syncs)) {
+        fprintf(stderr, "Failed to configure PDOs.\n");
+        return -1;
+    }
+
+    if (!(sc = ecrt_master_slave_config(
+                    master, DigOutSlavePos, Beckhoff_EL2032))) {
+        fprintf(stderr, "Failed to get slave configuration.\n");
+        return -1;
+    }
+
+    if (ecrt_slave_config_pdos(sc, EC_END, el2004_syncs)) {
+        fprintf(stderr, "Failed to configure PDOs.\n");
+        return -1;
+    }
+#endif
 
     // Create configuration for bus coupler
     sc = ecrt_master_slave_config(master, BusCouplerPos, Beckhoff_EK1100);
     if (!sc)
         return -1;
-    fprintf(stderr, "EK1100 configured.\n");
+
+    if (ecrt_domain_reg_pdo_entry_list(domain1, domain1_regs)) {
+        fprintf(stderr, "PDO entry registration failed!\n");
+        return -1;
+    }
 
     printf("Activating master...\n");
     if (ecrt_master_activate(master))