author | Florian Pose <fp@igh-essen.com> |
Thu, 03 Aug 2006 13:05:52 +0000 | |
branch | stable-1.0 |
changeset 1626 | d849e3b7b202 |
parent 1624 | 9dc190591c0f |
permissions | -rw-r--r-- |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1 |
/****************************************************************************** |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2 |
* |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3 |
* $Id$ |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4 |
* |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
5 |
* Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
6 |
* |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
7 |
* This file is part of the IgH EtherCAT Master. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
8 |
* |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
9 |
* The IgH EtherCAT Master is free software; you can redistribute it |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
10 |
* and/or modify it under the terms of the GNU General Public License |
1619
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
11 |
* as published by the Free Software Foundation; either version 2 of the |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
12 |
* License, or (at your option) any later version. |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
13 |
* |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
14 |
* The IgH EtherCAT Master is distributed in the hope that it will be |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
15 |
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
16 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
17 |
* GNU General Public License for more details. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
18 |
* |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
19 |
* You should have received a copy of the GNU General Public License |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
20 |
* along with the IgH EtherCAT Master; if not, write to the Free Software |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
21 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
22 |
* |
1619
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
23 |
* The right to use EtherCAT Technology is granted and comes free of |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
24 |
* charge under condition of compatibility of product made by |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
25 |
* Licensee. People intending to distribute/sell products based on the |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
26 |
* code, have to sign an agreement to guarantee that products using |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
27 |
* software based on IgH EtherCAT master stay compatible with the actual |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
28 |
* EtherCAT specification (which are released themselves as an open |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
29 |
* standard) as the (only) precondition to have the right to use EtherCAT |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
30 |
* Technology, IP and trade marks. |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
31 |
* |
39
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
32 |
*****************************************************************************/ |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
33 |
|
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
34 |
/** |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
35 |
\file |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
36 |
EtherCAT master driver module. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
37 |
*/ |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
38 |
|
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
39 |
/*****************************************************************************/ |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
40 |
|
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
41 |
#include <linux/module.h> |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
42 |
#include <linux/kernel.h> |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
43 |
#include <linux/init.h> |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
44 |
|
184
2fc86cec12df
Macro for SysFS attribute definition
Florian Pose <fp@igh-essen.com>
parents:
178
diff
changeset
|
45 |
#include "globals.h" |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
46 |
#include "master.h" |
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
47 |
#include "device.h" |
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
48 |
|
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
49 |
/*****************************************************************************/ |
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
50 |
|
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
51 |
int __init ec_init_module(void); |
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
52 |
void __exit ec_cleanup_module(void); |
52 | 53 |
|
39
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
54 |
/*****************************************************************************/ |
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
55 |
|
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
56 |
/** |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
57 |
Compile version info. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
58 |
*/ |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
59 |
|
1617
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
60 |
#define COMPILE_INFO EC_STR(EC_MASTER_VERSION_MAIN) \ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
61 |
"." EC_STR(EC_MASTER_VERSION_SUB) \ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
62 |
" (" EC_MASTER_VERSION_EXTRA ")" \ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
63 |
" - rev. " EC_STR(SVNREV) \ |
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
64 |
", compiled by " EC_STR(USER) \ |
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
65 |
" at " __DATE__ " " __TIME__ |
39
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
66 |
|
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
67 |
/*****************************************************************************/ |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
68 |
|
1623
05622513f627
MERGE trunk -r450:451 -> branches/stable-1.0 (docs)
Florian Pose <fp@igh-essen.com>
parents:
1619
diff
changeset
|
69 |
static int ec_master_count = 1; /**< parameter value, number of masters */ |
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
70 |
static int ec_eoeif_count = 0; /**< parameter value, number of EoE interf. */ |
1623
05622513f627
MERGE trunk -r450:451 -> branches/stable-1.0 (docs)
Florian Pose <fp@igh-essen.com>
parents:
1619
diff
changeset
|
71 |
static struct list_head ec_masters; /**< list of masters */ |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
72 |
|
39
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
73 |
/*****************************************************************************/ |
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
74 |
|
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
75 |
/** \cond */ |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
76 |
|
1619
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
77 |
module_param(ec_master_count, int, S_IRUGO); |
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
78 |
module_param(ec_eoeif_count, int, S_IRUGO); |
1619
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
79 |
|
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
80 |
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>"); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
81 |
MODULE_DESCRIPTION("EtherCAT master driver module"); |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
82 |
MODULE_LICENSE("GPL"); |
34
c1e8d61fa395
Compile-Informationen hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
33
diff
changeset
|
83 |
MODULE_VERSION(COMPILE_INFO); |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
84 |
MODULE_PARM_DESC(ec_master_count, "number of EtherCAT masters to initialize"); |
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
85 |
MODULE_PARM_DESC(ec_eoeif_count, "number of EoE interfaces per master"); |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
86 |
|
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
87 |
/** \endcond */ |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
88 |
|
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
89 |
/*****************************************************************************/ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
90 |
|
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
91 |
/** |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
92 |
Module initialization. |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
93 |
Initializes \a ec_master_count masters. |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
94 |
\return 0 on success, else < 0 |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
95 |
*/ |
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
96 |
|
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
97 |
int __init ec_init_module(void) |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
98 |
{ |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
99 |
unsigned int i; |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
100 |
ec_master_t *master, *next; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
101 |
|
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
102 |
EC_INFO("Master driver, %s\n", COMPILE_INFO); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
103 |
|
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
104 |
if (ec_master_count < 1) { |
111
9963537ec776
Bugfix: SDO download. SDO abort codes ausgeben.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
105 |
EC_ERR("Error - Invalid ec_master_count: %i\n", ec_master_count); |
127
e67c80a76de4
Code aufger?umt und kleines Speicherleck entdeckt.
Florian Pose <fp@igh-essen.com>
parents:
111
diff
changeset
|
106 |
goto out_return; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
107 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
108 |
|
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
109 |
EC_INFO("Initializing %i EtherCAT master(s)...\n", ec_master_count); |
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
110 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
111 |
INIT_LIST_HEAD(&ec_masters); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
112 |
|
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
113 |
for (i = 0; i < ec_master_count; i++) { |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
114 |
if (!(master = |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
115 |
(ec_master_t *) kmalloc(sizeof(ec_master_t), GFP_KERNEL))) { |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
116 |
EC_ERR("Failed to allocate memory for EtherCAT master %i.\n", i); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
117 |
goto out_free; |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
118 |
} |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
119 |
|
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
120 |
if (ec_master_init(master, i, ec_eoeif_count)) |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
121 |
goto out_free; |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
122 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
123 |
if (kobject_add(&master->kobj)) { |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
124 |
EC_ERR("Failed to add kobj.\n"); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
125 |
kobject_put(&master->kobj); // free master |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
126 |
goto out_free; |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
127 |
} |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
128 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
129 |
list_add_tail(&master->list, &ec_masters); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
130 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
131 |
|
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
132 |
EC_INFO("Master driver initialized.\n"); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
133 |
return 0; |
127
e67c80a76de4
Code aufger?umt und kleines Speicherleck entdeckt.
Florian Pose <fp@igh-essen.com>
parents:
111
diff
changeset
|
134 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
135 |
out_free: |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
136 |
list_for_each_entry_safe(master, next, &ec_masters, list) { |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
137 |
list_del(&master->list); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
138 |
kobject_del(&master->kobj); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
139 |
kobject_put(&master->kobj); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
140 |
} |
127
e67c80a76de4
Code aufger?umt und kleines Speicherleck entdeckt.
Florian Pose <fp@igh-essen.com>
parents:
111
diff
changeset
|
141 |
out_return: |
e67c80a76de4
Code aufger?umt und kleines Speicherleck entdeckt.
Florian Pose <fp@igh-essen.com>
parents:
111
diff
changeset
|
142 |
return -1; |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
143 |
} |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
144 |
|
39
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
145 |
/*****************************************************************************/ |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
146 |
|
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
147 |
/** |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
148 |
Module cleanup. |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
149 |
Clears all master instances. |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
150 |
*/ |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
151 |
|
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
152 |
void __exit ec_cleanup_module(void) |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
153 |
{ |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
154 |
ec_master_t *master, *next; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
155 |
|
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
156 |
EC_INFO("Cleaning up master driver...\n"); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
157 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
158 |
list_for_each_entry_safe(master, next, &ec_masters, list) { |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
159 |
list_del(&master->list); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
160 |
kobject_del(&master->kobj); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
161 |
kobject_put(&master->kobj); // free master |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
162 |
} |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
163 |
|
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
164 |
EC_INFO("Master driver cleaned up.\n"); |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
165 |
} |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
166 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
167 |
/*****************************************************************************/ |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
168 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
169 |
/** |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
170 |
Gets a handle to a certain master. |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
171 |
\returns pointer to master |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
172 |
*/ |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
173 |
|
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
174 |
ec_master_t *ec_find_master(unsigned int master_index /**< master index */) |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
175 |
{ |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
176 |
ec_master_t *master; |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
177 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
178 |
list_for_each_entry(master, &ec_masters, list) { |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
179 |
if (master->index == master_index) return master; |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
180 |
} |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
181 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
182 |
EC_ERR("Master %i does not exist!\n", master_index); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
183 |
return NULL; |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
184 |
} |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
185 |
|
1617
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
186 |
/*****************************************************************************/ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
187 |
|
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
188 |
/** |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
189 |
Outputs frame contents for debugging purposes. |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
190 |
*/ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
191 |
|
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
192 |
void ec_print_data(const uint8_t *data, /**< pointer to data */ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
193 |
size_t size /**< number of bytes to output */ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
194 |
) |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
195 |
{ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
196 |
unsigned int i; |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
197 |
|
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
198 |
EC_DBG(""); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
199 |
for (i = 0; i < size; i++) { |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
200 |
printk("%02X ", data[i]); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
201 |
if ((i + 1) % 16 == 0) { |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
202 |
printk("\n"); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
203 |
EC_DBG(""); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
204 |
} |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
205 |
} |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
206 |
printk("\n"); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
207 |
} |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
208 |
|
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
209 |
/*****************************************************************************/ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
210 |
|
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
211 |
/** |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
212 |
Outputs frame contents and differences for debugging purposes. |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
213 |
*/ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
214 |
|
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
215 |
void ec_print_data_diff(const uint8_t *d1, /**< first data */ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
216 |
const uint8_t *d2, /**< second data */ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
217 |
size_t size /** number of bytes to output */ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
218 |
) |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
219 |
{ |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
220 |
unsigned int i; |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
221 |
|
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
222 |
EC_DBG(""); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
223 |
for (i = 0; i < size; i++) { |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
224 |
if (d1[i] == d2[i]) printk(".. "); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
225 |
else printk("%02X ", d2[i]); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
226 |
if ((i + 1) % 16 == 0) { |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
227 |
printk("\n"); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
228 |
EC_DBG(""); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
229 |
} |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
230 |
} |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
231 |
printk("\n"); |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
232 |
} |
9f83a343ae75
MERGE trunk -r354:355 -> branches/stable-1.0 (version numbers)
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
233 |
|
1619
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
234 |
/*****************************************************************************/ |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
235 |
|
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
236 |
/** |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
237 |
Prints slave states in clear text. |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
238 |
*/ |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
239 |
|
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
240 |
void ec_print_states(const uint8_t states /**< slave states */) |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
241 |
{ |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
242 |
unsigned int first = 1; |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
243 |
|
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
244 |
if (!states) { |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
245 |
printk("(unknown)"); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
246 |
return; |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
247 |
} |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
248 |
|
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
249 |
if (states & EC_SLAVE_STATE_INIT) { |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
250 |
printk("INIT"); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
251 |
first = 0; |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
252 |
} |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
253 |
if (states & EC_SLAVE_STATE_PREOP) { |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
254 |
if (!first) printk(", "); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
255 |
printk("PREOP"); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
256 |
first = 0; |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
257 |
} |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
258 |
if (states & EC_SLAVE_STATE_SAVEOP) { |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
259 |
if (!first) printk(", "); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
260 |
printk("SAVEOP"); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
261 |
first = 0; |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
262 |
} |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
263 |
if (states & EC_SLAVE_STATE_OP) { |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
264 |
if (!first) printk(", "); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
265 |
printk("OP"); |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
266 |
} |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
267 |
} |
0d4119024f55
MERGE -r361:425 trunk -> branches/stable-1.0: EoE, License, State machines.
Florian Pose <fp@igh-essen.com>
parents:
1618
diff
changeset
|
268 |
|
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
269 |
/****************************************************************************** |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
270 |
* Device interface |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
271 |
*****************************************************************************/ |
33
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
272 |
|
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
273 |
/** |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
274 |
Connects an EtherCAT device to a certain master. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
275 |
The master will use the device for sending and receiving frames. It is |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
276 |
required that no other instance (for example the kernel IP stack) uses |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
277 |
the device. |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
278 |
\return 0 on success, else < 0 |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
279 |
\ingroup DeviceInterface |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
280 |
*/ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
281 |
|
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
282 |
ec_device_t *ecdev_register(unsigned int master_index, /**< master index */ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
283 |
struct net_device *net_dev, /**< net_device of |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
284 |
the device */ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
285 |
ec_isr_t isr, /**< interrupt service routine */ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
286 |
struct module *module /**< pointer to the module */ |
104
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
287 |
) |
91
0120d6214948
Code-Dokumentation angepasst.
Florian Pose <fp@igh-essen.com>
parents:
88
diff
changeset
|
288 |
{ |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
289 |
ec_master_t *master; |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
290 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
291 |
if (!(master = ec_find_master(master_index))) return NULL; |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
292 |
|
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
293 |
if (master->device) { |
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
294 |
EC_ERR("Master %i already has a device!\n", master_index); |
191 | 295 |
goto out_return; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
296 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
297 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
298 |
if (!(master->device = |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
299 |
(ec_device_t *) kmalloc(sizeof(ec_device_t), GFP_KERNEL))) { |
161
ddb7266d1c56
Bugfix: Discovered memory leak.
Florian Pose <fp@igh-essen.com>
parents:
152
diff
changeset
|
300 |
EC_ERR("Failed to allocate device!\n"); |
191 | 301 |
goto out_return; |
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
302 |
} |
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
303 |
|
127
e67c80a76de4
Code aufger?umt und kleines Speicherleck entdeckt.
Florian Pose <fp@igh-essen.com>
parents:
111
diff
changeset
|
304 |
if (ec_device_init(master->device, master, net_dev, isr, module)) { |
191 | 305 |
EC_ERR("Failed to init device!\n"); |
306 |
goto out_free; |
|
127
e67c80a76de4
Code aufger?umt und kleines Speicherleck entdeckt.
Florian Pose <fp@igh-essen.com>
parents:
111
diff
changeset
|
307 |
} |
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
308 |
|
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
309 |
return master->device; |
191 | 310 |
|
311 |
out_free: |
|
312 |
kfree(master->device); |
|
313 |
master->device = NULL; |
|
314 |
out_return: |
|
315 |
return NULL; |
|
91
0120d6214948
Code-Dokumentation angepasst.
Florian Pose <fp@igh-essen.com>
parents:
88
diff
changeset
|
316 |
} |
0120d6214948
Code-Dokumentation angepasst.
Florian Pose <fp@igh-essen.com>
parents:
88
diff
changeset
|
317 |
|
0120d6214948
Code-Dokumentation angepasst.
Florian Pose <fp@igh-essen.com>
parents:
88
diff
changeset
|
318 |
/*****************************************************************************/ |
0120d6214948
Code-Dokumentation angepasst.
Florian Pose <fp@igh-essen.com>
parents:
88
diff
changeset
|
319 |
|
0120d6214948
Code-Dokumentation angepasst.
Florian Pose <fp@igh-essen.com>
parents:
88
diff
changeset
|
320 |
/** |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
321 |
Disconnect an EtherCAT device from the master. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
322 |
The device is disconnected from the master and all device ressources |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
323 |
are freed. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
324 |
\attention Before calling this function, the ecdev_stop() function has |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
325 |
to be called, to be sure that the master does not use the device any more. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
326 |
\ingroup DeviceInterface |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
327 |
*/ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
328 |
|
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
329 |
void ecdev_unregister(unsigned int master_index, /**< master index */ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
330 |
ec_device_t *device /**< EtherCAT device */ |
104
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
331 |
) |
55
059a9e712aa7
Mit neuer Schnittstelle wieder lauff?hig.
Florian Pose <fp@igh-essen.com>
parents:
54
diff
changeset
|
332 |
{ |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
333 |
ec_master_t *master; |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
334 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
335 |
if (!(master = ec_find_master(master_index))) return; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
336 |
|
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
337 |
if (!master->device || master->device != device) { |
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
338 |
EC_WARN("Unable to unregister device!\n"); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
339 |
return; |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
340 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
341 |
|
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
342 |
ec_device_clear(master->device); |
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
343 |
kfree(master->device); |
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
344 |
master->device = NULL; |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
345 |
} |
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
346 |
|
191 | 347 |
/*****************************************************************************/ |
348 |
||
349 |
/** |
|
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
350 |
Starts the master associated with the device. |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
351 |
This function has to be called by the network device driver to tell the |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
352 |
master that the device is ready to send and receive data. The master |
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
353 |
will enter the idle mode then. |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
354 |
\ingroup DeviceInterface |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
355 |
*/ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
356 |
|
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
357 |
int ecdev_start(unsigned int master_index /**< master index */) |
191 | 358 |
{ |
359 |
ec_master_t *master; |
|
360 |
if (!(master = ec_find_master(master_index))) return -1; |
|
361 |
||
362 |
if (ec_device_open(master->device)) { |
|
363 |
EC_ERR("Failed to open device!\n"); |
|
364 |
return -1; |
|
365 |
} |
|
366 |
||
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
367 |
ec_master_idle_start(master); |
191 | 368 |
return 0; |
369 |
} |
|
370 |
||
371 |
/*****************************************************************************/ |
|
372 |
||
373 |
/** |
|
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
374 |
Stops the master associated with the device. |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
375 |
Tells the master to stop using the device for frame IO. Has to be called |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
376 |
before unregistering the device. |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
377 |
\ingroup DeviceInterface |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
378 |
*/ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
379 |
|
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
380 |
void ecdev_stop(unsigned int master_index /**< master index */) |
191 | 381 |
{ |
382 |
ec_master_t *master; |
|
383 |
if (!(master = ec_find_master(master_index))) return; |
|
384 |
||
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
385 |
ec_master_idle_stop(master); |
191 | 386 |
|
387 |
if (ec_device_close(master->device)) |
|
388 |
EC_WARN("Failed to close device!\n"); |
|
389 |
} |
|
390 |
||
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
391 |
/****************************************************************************** |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
392 |
* Realtime interface |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
393 |
*****************************************************************************/ |
33
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
394 |
|
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
395 |
/** |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
396 |
Reserves an EtherCAT master for realtime operation. |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
397 |
\return pointer to reserved master, or NULL on error |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
398 |
\ingroup RealtimeInterface |
91
0120d6214948
Code-Dokumentation angepasst.
Florian Pose <fp@igh-essen.com>
parents:
88
diff
changeset
|
399 |
*/ |
0120d6214948
Code-Dokumentation angepasst.
Florian Pose <fp@igh-essen.com>
parents:
88
diff
changeset
|
400 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
401 |
ec_master_t *ecrt_request_master(unsigned int master_index |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
402 |
/**< master index */ |
104
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
403 |
) |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
404 |
{ |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
405 |
ec_master_t *master; |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
406 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
407 |
EC_INFO("Requesting master %i...\n", master_index); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
408 |
|
191 | 409 |
if (!(master = ec_find_master(master_index))) goto out_return; |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
410 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
411 |
if (master->reserved) { |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
412 |
EC_ERR("Master %i is already in use!\n", master_index); |
191 | 413 |
goto out_return; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
414 |
} |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
415 |
master->reserved = 1; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
416 |
|
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
417 |
if (!master->device) { |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
418 |
EC_ERR("Master %i has no assigned device!\n", master_index); |
191 | 419 |
goto out_release; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
420 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
421 |
|
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
422 |
if (!try_module_get(master->device->module)) { |
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
423 |
EC_ERR("Failed to reserve device module!\n"); |
191 | 424 |
goto out_release; |
425 |
} |
|
426 |
||
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
427 |
ec_master_idle_stop(master); |
191 | 428 |
ec_master_reset(master); |
429 |
master->mode = EC_MASTER_MODE_RUNNING; |
|
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
430 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
431 |
if (!master->device->link_state) EC_WARN("Link is DOWN.\n"); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
432 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
433 |
if (ec_master_bus_scan(master)) { |
84
b4ae98855cea
printk durch Makros ersetzt.
Florian Pose <fp@igh-essen.com>
parents:
79
diff
changeset
|
434 |
EC_ERR("Bus scan failed!\n"); |
191 | 435 |
goto out_module_put; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
436 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
437 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
438 |
EC_INFO("Master %i is ready.\n", master_index); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
439 |
return master; |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
440 |
|
191 | 441 |
out_module_put: |
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
442 |
module_put(master->device->module); |
85
eb24637883ef
Master wird nach nicht erfolgreichem Request resettet.
Florian Pose <fp@igh-essen.com>
parents:
84
diff
changeset
|
443 |
ec_master_reset(master); |
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
444 |
ec_master_idle_start(master); |
191 | 445 |
out_release: |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
446 |
master->reserved = 0; |
191 | 447 |
out_return: |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
448 |
EC_ERR("Failed requesting master %i.\n", master_index); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
64
diff
changeset
|
449 |
return NULL; |
27
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
450 |
} |
d75ef6b46e33
EtherCAT-Master in eigenes Modul ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
451 |
|
39
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
452 |
/*****************************************************************************/ |
33
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
453 |
|
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
454 |
/** |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
455 |
Releases a reserved EtherCAT master. |
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
456 |
\ingroup RealtimeInterface |
195
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
457 |
*/ |
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
458 |
|
674071846ee3
Translated all comments and documentation to english language.
Florian Pose <fp@igh-essen.com>
parents:
191
diff
changeset
|
459 |
void ecrt_release_master(ec_master_t *master /**< EtherCAT master */) |
33
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
460 |
{ |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
461 |
EC_INFO("Releasing master %i...\n", master->index); |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
462 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
463 |
if (!master->reserved) { |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
464 |
EC_ERR("Master %i was never requested!\n", master->index); |
88
98335157e54e
Bessere Ausgaben beim Starten und beenden.
Florian Pose <fp@igh-essen.com>
parents:
85
diff
changeset
|
465 |
return; |
98335157e54e
Bessere Ausgaben beim Starten und beenden.
Florian Pose <fp@igh-essen.com>
parents:
85
diff
changeset
|
466 |
} |
98335157e54e
Bessere Ausgaben beim Starten und beenden.
Florian Pose <fp@igh-essen.com>
parents:
85
diff
changeset
|
467 |
|
98335157e54e
Bessere Ausgaben beim Starten und beenden.
Florian Pose <fp@igh-essen.com>
parents:
85
diff
changeset
|
468 |
ec_master_reset(master); |
1624
9dc190591c0f
MERGE trunk -r452:489 -> stable-1.0 (datagrams, bugfixes, EEPROM info, idle mode)
Florian Pose <fp@igh-essen.com>
parents:
1623
diff
changeset
|
469 |
ec_master_idle_start(master); |
151
1961b674466c
Plugfest: master_open()/close() ausgelagert.
Florian Pose <fp@igh-essen.com>
parents:
127
diff
changeset
|
470 |
|
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
91
diff
changeset
|
471 |
module_put(master->device->module); |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
472 |
master->reserved = 0; |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
473 |
|
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
161
diff
changeset
|
474 |
EC_INFO("Released master %i.\n", master->index); |
88
98335157e54e
Bessere Ausgaben beim Starten und beenden.
Florian Pose <fp@igh-essen.com>
parents:
85
diff
changeset
|
475 |
return; |
33
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
476 |
} |
f4171b8aadf8
Master-Reservierung und Use-Count f?r NIC-Treiber.
Florian Pose <fp@igh-essen.com>
parents:
27
diff
changeset
|
477 |
|
39
6965c23a6826
likely/unlikely, Fehlermeldungen in zyklischem Code begrenzt und Kommentare ge??ndert.
Florian Pose <fp@igh-essen.com>
parents:
34
diff
changeset
|
478 |
/*****************************************************************************/ |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
479 |
|
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
480 |
/** \cond */ |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
481 |
|
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
482 |
module_init(ec_init_module); |
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
483 |
module_exit(ec_cleanup_module); |
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
484 |
|
104
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
485 |
EXPORT_SYMBOL(ecdev_register); |
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
486 |
EXPORT_SYMBOL(ecdev_unregister); |
191 | 487 |
EXPORT_SYMBOL(ecdev_start); |
488 |
EXPORT_SYMBOL(ecdev_stop); |
|
104
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
489 |
EXPORT_SYMBOL(ecrt_request_master); |
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
490 |
EXPORT_SYMBOL(ecrt_release_master); |
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
491 |
|
1618
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
492 |
/** \endcond */ |
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
493 |
|
5cff10efb927
MERGE trunk -r355:360 -> branches/stable-1.0 (Doxygen, INSTALL, and GPLv2)
Florian Pose <fp@igh-essen.com>
parents:
1617
diff
changeset
|
494 |
/*****************************************************************************/ |