Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Removed ecdb.h
authorFlorian Pose <fp@igh-essen.com>
Fri, 25 Apr 2008 14:38:11 +0000
changeset 909 3b3087d4cdc5
parent 908 386b908033be
child 910 9fd31755f576
Removed ecdb.h
NEWS file | annotate | diff | comparison | revisions
TODO file | annotate | diff | comparison | revisions
examples/mini/mini.c file | annotate | diff | comparison | revisions
include/Makefile.am file | annotate | diff | comparison | revisions
include/ecdb.h file | annotate | diff | comparison | revisions 
--- a/NEWS	Fri Apr 25 14:32:56 2008 +0000
+++ b/NEWS	Fri Apr 25 14:38:11 2008 +0000
@@ -49,6 +49,7 @@
     - Exported ecrt_slave_config_sdo(), the generic Sdo configuration
       function.
     - Removed the bus_state and bus_tainted flags from ec_master_state_t.
+* Removed include/ecdb.h.
 * Mapping of Pdo entries is now supported.
 * Current Pdo assignment/mapping is now read via CoE during bus scan, using
   direct Sdo access, independent of the dictionary.
--- a/TODO	Fri Apr 25 14:32:56 2008 +0000
+++ b/TODO	Fri Apr 25 14:38:11 2008 +0000
@@ -16,8 +16,6 @@
 * Mailbox protocol handlers.
 * Remove get_cycles() calls and references to cpu_khz to increase
   portability.
-* Remove ecdb.h and let lsec output PDO information 'cut-and-pastable' for
-  applications.
 * Scanning of Sdo dictionary / writing EEPROM in OPERATION state.
 * Remove the end state of the master state machine.
 * SDO write access in sysfs.
--- a/examples/mini/mini.c	Fri Apr 25 14:32:56 2008 +0000
+++ b/examples/mini/mini.c	Fri Apr 25 14:38:11 2008 +0000
@@ -37,7 +37,6 @@
 #include <linux/interrupt.h>
 
 #include "../../include/ecrt.h" // EtherCAT realtime interface
-#include "../../include/ecdb.h" // EtherCAT slave database
 
 /*****************************************************************************/
 
@@ -74,6 +73,9 @@
 
 static unsigned int blink = 0;
 
+#define Beckhoff_EL2004 0x00000002, 0x07D43052
+#define Beckhoff_EL3162 0x00000002, 0x0C5A3052
+
 const static ec_pdo_entry_reg_t domain1_regs[] = {
     {0, 1, Beckhoff_EL3162, 0x3101, 2, &off_ana_in},
     {0, 3, Beckhoff_EL2004, 0x3001, 1, &off_dig_out},
@@ -148,13 +150,6 @@
     ecrt_master_state(master, &ms);
     spin_unlock(&master_lock);
 
-    if (ms.bus_state != master_state.bus_state) {
-        printk(KERN_INFO PFX "bus state changed to %i.\n", ms.bus_state);
-    }
-    if (ms.bus_tainted != master_state.bus_tainted) {
-        printk(KERN_INFO PFX "tainted flag changed to %u.\n",
-                ms.bus_tainted);
-    }
     if (ms.slaves_responding != master_state.slaves_responding) {
         printk(KERN_INFO PFX "slaves_responding changed to %u.\n",
                 ms.slaves_responding);
--- a/include/Makefile.am	Fri Apr 25 14:32:56 2008 +0000
+++ b/include/Makefile.am	Fri Apr 25 14:38:11 2008 +0000
@@ -35,6 +35,6 @@
 #
 #------------------------------------------------------------------------------
 
-include_HEADERS = ecdb.h ecrt.h
+include_HEADERS = ecrt.h
 
 #------------------------------------------------------------------------------
--- a/include/ecdb.h	Fri Apr 25 14:32:56 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/******************************************************************************
- *
- *  $Id$
- *
- *  Copyright (C) 2006  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
- *  as published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  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 right to use EtherCAT Technology is granted and comes free of
- *  charge under condition of compatibility of product made by
- *  Licensee. People intending to distribute/sell products based on the
- *  code, have to sign an agreement to guarantee that products using
- *  software based on IgH EtherCAT master stay compatible with the actual
- *  EtherCAT specification (which are released themselves as an open
- *  standard) as the (only) precondition to have the right to use EtherCAT
- *  Technology, IP and trade marks.
- *
- *****************************************************************************/
-
-/**
-   \file
-   EtherCAT Slave Database.
-
-   \attention Please do not create any dependencies to this file! It may be
-   changed between releases. Provide a copy, if you want to use it in foreign
-   projects.
-*/
-
-/*****************************************************************************/
-
-#ifndef __ECDB_H__
-#define __ECDB_H__
-
-/*****************************************************************************/
-
-/** \cond */
-
-#define Beckhoff_EK1100 0x00000002, 0x044C2C52
-
-#define Beckhoff_BK1120 0x00000002, 0x04602C22
-
-#define Beckhoff_EL1004 0x00000002, 0x03EC3052
-#define Beckhoff_EL1004_PDO_Inputs 0x3101, 1
-#define Beckhoff_EL1004_Inputs Beckhoff_EL1004, Beckhoff_EL1004_PDO_Inputs
-
-#define Beckhoff_EL1004v2_PDO_Inputs 0x6000, 1
-#define Beckhoff_EL1004v2_Inputs Beckhoff_EL1004, Beckhoff_EL1004v2_PDO_Inputs
-
-#define Beckhoff_EL1014 0x00000002, 0x03F63052
-#define Beckhoff_EL1014_PDO_Inputs 0x3101, 1
-#define Beckhoff_EL1014_Inputs Beckhoff_EL1014, Beckhoff_EL1014_PDO_Inputs 
-
-#define Beckhoff_EL1014v2_PDO_Inputs 0x6000, 1
-#define Beckhoff_EL1014v2_Inputs Beckhoff_EL1014, Beckhoff_EL1014v2_PDO_Inputs
-
-#define Beckhoff_EL2004 0x00000002, 0x07D43052
-#define Beckhoff_EL2004_PDO_Outputs 0x3001, 1
-#define Beckhoff_EL2004_Outputs Beckhoff_EL2004, Beckhoff_EL2004_PDO_Outputs 
-
-#define Beckhoff_EL2032 0x00000002, 0x07F03052
-#define Beckhoff_EL2032_PDO_Outputs 0x3001, 1
-#define Beckhoff_EL2032_Outputs Beckhoff_EL2032, Beckhoff_EL2032_PDO_Outputs
-
-#define Beckhoff_EL3102 0x00000002, 0x0C1E3052
-#define Beckhoff_EL3102_PDO_Status1 0x3101, 1
-#define Beckhoff_EL3102_PDO_Input1  0x3101, 2
-#define Beckhoff_EL3102_PDO_Status2 0x3102, 1
-#define Beckhoff_EL3102_PDO_Input2  0x3102, 2
-#define Beckhoff_EL3102_Status1 Beckhoff_EL3102, Beckhoff_EL3102_PDO_Status1
-#define Beckhoff_EL3102_Input1  Beckhoff_EL3102, Beckhoff_EL3102_PDO_Input1 
-#define Beckhoff_EL3102_Status2 Beckhoff_EL3102, Beckhoff_EL3102_PDO_Status2
-#define Beckhoff_EL3102_Input2  Beckhoff_EL3102, Beckhoff_EL3102_PDO_Input2
-
-#define Beckhoff_EL3152 0x00000002, 0x0C503052
-#define Beckhoff_EL3152_PDO_Status1 0x3101, 1
-#define Beckhoff_EL3152_PDO_Input1  0x3101, 2
-#define Beckhoff_EL3152_PDO_Status2 0x3102, 1
-#define Beckhoff_EL3152_PDO_Input2  0x3102, 2
-#define Beckhoff_EL3152_Status1 Beckhoff_EL3152, Beckhoff_EL3152_PDO_Status1
-#define Beckhoff_EL3152_Input1  Beckhoff_EL3152, Beckhoff_EL3152_PDO_Input1
-#define Beckhoff_EL3152_Status2 Beckhoff_EL3152, Beckhoff_EL3152_PDO_Status2
-#define Beckhoff_EL3152_Input2  Beckhoff_EL3152, Beckhoff_EL3152_PDO_Input2
-
-#define Beckhoff_EL3162 0x00000002, 0x0C5A3052
-#define Beckhoff_EL3162_PDO_Status1 0x3101, 1
-#define Beckhoff_EL3162_PDO_Input1  0x3101, 2
-#define Beckhoff_EL3162_PDO_Status2 0x3102, 1
-#define Beckhoff_EL3162_PDO_Input2  0x3102, 2
-#define Beckhoff_EL3162_Status1 Beckhoff_EL3162, Beckhoff_EL3162_PDO_Status1
-#define Beckhoff_EL3162_Input1  Beckhoff_EL3162, Beckhoff_EL3162_PDO_Input1
-#define Beckhoff_EL3162_Status2 Beckhoff_EL3162, Beckhoff_EL3162_PDO_Status2
-#define Beckhoff_EL3162_Input2  Beckhoff_EL3162, Beckhoff_EL3162_PDO_Input2
-
-#define Beckhoff_EL4102 0x00000002, 0x10063052
-#define Beckhoff_EL4102_PDO_Output1 0x6411, 1
-#define Beckhoff_EL4102_PDO_Output2 0x6411, 2
-#define Beckhoff_EL4102_Output1 Beckhoff_EL4102, Beckhoff_EL4102_PDO_Output1
-#define Beckhoff_EL4102_Output2 Beckhoff_EL4102, Beckhoff_EL4102_PDO_Output2
-
-#define Beckhoff_EL4132 0x00000002, 0x10243052
-#define Beckhoff_EL4132_PDO_Output1 0x6411, 1
-#define Beckhoff_EL4132_PDO_Output2 0x6411, 2
-#define Beckhoff_EL4132_Output1 Beckhoff_EL4132, Beckhoff_EL4132_PDO_Output1
-#define Beckhoff_EL4132_Output2 Beckhoff_EL4132, Beckhoff_EL4132_PDO_Output2
-
-#define Beckhoff_EL5001 0x00000002, 0x13893052
-#define Beckhoff_EL5001_PDO_Status 0x3101, 1
-#define Beckhoff_EL5001_PDO_Value  0x3101, 2
-#define Beckhoff_EL5001_Status Beckhoff_EL5001, Beckhoff_EL5001_PDO_Status
-#define Beckhoff_EL5001_Value  Beckhoff_EL5001, Beckhoff_EL5001_PDO_Value
-
-#define Beckhoff_EL5101 0x00000002, 0x13ED3052
-#define Beckhoff_EL5101_PDO_Status      0x6000, 1
-#define Beckhoff_EL5101_PDO_Value       0x6000, 2
-#define Beckhoff_EL5101_PDO_Latch       0x6000, 3
-#define Beckhoff_EL5101_PDO_Frequency   0x6000, 4
-#define Beckhoff_EL5101_PDO_Period      0x6000, 5
-#define Beckhoff_EL5101_PDO_Window      0x6000, 6
-#define Beckhoff_EL5101_PDO_Ctrl        0x7000, 1
-#define Beckhoff_EL5101_PDO_OutputValue 0x7000, 2
-#define Beckhoff_EL5101_Status      Beckhoff_EL5101, Beckhoff_EL5101_PDO_Status      
-#define Beckhoff_EL5101_Value       Beckhoff_EL5101, Beckhoff_EL5101_PDO_Value       
-#define Beckhoff_EL5101_Latch       Beckhoff_EL5101, Beckhoff_EL5101_PDO_Latch       
-#define Beckhoff_EL5101_Frequency   Beckhoff_EL5101, Beckhoff_EL5101_PDO_Frequency   
-#define Beckhoff_EL5101_Period      Beckhoff_EL5101, Beckhoff_EL5101_PDO_Period      
-#define Beckhoff_EL5101_Window      Beckhoff_EL5101, Beckhoff_EL5101_PDO_Window      
-#define Beckhoff_EL5101_Ctrl        Beckhoff_EL5101, Beckhoff_EL5101_PDO_Ctrl        
-#define Beckhoff_EL5101_OutputValue Beckhoff_EL5101, Beckhoff_EL5101_PDO_OutputValue 
-
-/** \endcond */
-
-/*****************************************************************************/
-
-#endif
etherlabmaster