Martin Troxler
|
5d6ce8b992
|
Merged
|
2009-12-27 16:58:19 +01:00 |
|
Martin Troxler
|
926685db26
|
master FSM enables slave FSM
slave FSM should not be active when master is scanning or configuring the slaves
|
2009-12-15 10:59:07 +01:00 |
Florian Pose
|
344ec90545
|
Merged changes by Martin Troxler.
|
2009-12-14 13:25:50 +01:00 |
|
Florian Pose
|
699b184f6f
|
Merged changes from Martin Troxler.
|
2009-12-14 13:11:36 +01:00 |
|
Martin Troxler
|
d823576945
|
Moved FOE request queue and fsm into slaves
|
2009-12-01 16:00:22 +01:00 |
|
Martin Troxler
|
abb3588747
|
Moved sdo request queue to slaves
|
2009-12-01 14:24:57 +01:00 |
|
Martin Troxler
|
0d17968348
|
Each slave got its own SDO state machine (faster handling of external SDO requests)
|
2009-11-26 15:33:48 +01:00 |
|
Martin Troxler
|
dfeb99b1cb
|
applied komax patch to version r1822
- adapted to 2.6.31 (-rt): init_MUTEX -> sema_init, net_device_ops (Matthias Lüscher)
- 8139too eth driver for 2.6.31 (Matthias Lüscher)
- scan_busy queryable in user mode (ec_master_info_t) (Martin Troxler)
- read alias from register 0x0012 (TODO: reread alias after sii write) (Martin Troxler)
- cancel external SDO/FOE,Reg&SII requests (Martin Troxler)
|
2009-11-19 14:39:10 +01:00 |
|
Florian Pose
|
7ac08b531f
|
Avoid warnings on x86_64 platform. Thanks to Thomas Elste.
|
2009-10-19 13:12:40 +02:00 |
|
Florian Pose
|
735f1efbc1
|
Removed unwanted tabulators.
|
2009-07-27 10:37:47 +00:00 |
|
Florian Pose
|
d8177f03ee
|
Unset idle flag while processing FoE requests.
|
2009-05-05 09:45:31 +00:00 |
|
Florian Pose
|
29eb2d7d06
|
Transition delay calculation. TBC...
|
2009-04-30 14:12:47 +00:00 |
|
Florian Pose
|
f4b6807cc9
|
Bus topology calculation.
|
2009-04-29 09:43:04 +00:00 |
|
Florian Pose
|
d427828ecc
|
Measure port receive times.
|
2009-04-27 15:20:14 +00:00 |
|
Florian Pose
|
5e79dc8c06
|
Find DC reference clock.
|
2009-04-20 14:33:47 +00:00 |
|
Florian Pose
|
9f54862108
|
Tested clearing slave list after link down; minor changes.
|
2009-04-20 09:17:39 +00:00 |
|
Florian Pose
|
515a66aa8e
|
Clear slave list on link down.
|
2009-04-17 12:41:57 +00:00 |
|
Florian Pose
|
7f97ba66a2
|
Renamed phy_ commands to reg_.
|
2009-04-08 12:48:59 +00:00 |
|
Florian Pose
|
9483b8e1ae
|
Check phy_request length for read operations, too!
|
2009-04-08 11:48:00 +00:00 |
|
Florian Pose
|
0bedfe5ef8
|
Process working counter of phy_* commands.
|
2009-04-08 10:27:48 +00:00 |
|
Florian Pose
|
01aeadbc73
|
Improved phy debugging.
|
2009-04-07 09:37:07 +00:00 |
|
Florian Pose
|
12c12b1bab
|
Improved and added license headers.
|
2009-02-24 12:51:39 +00:00 |
|
Florian Pose
|
5ea60780a0
|
Fixed FoE request states.
|
2009-01-30 10:56:06 +00:00 |
|
Florian Pose
|
5d4b915317
|
merge -c1619 branches/1.4-foe: Implemented going to bootstrap state BOOT.
|
2009-01-26 13:22:05 +00:00 |
|
Florian Pose
|
8d45915fc4
|
merge -c1618 branches/1.4-foe: Improved FoE.
|
2009-01-26 13:09:27 +00:00 |
|
Florian Pose
|
7a703ecb05
|
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
|
2009-01-26 13:01:58 +00:00 |
|
Florian Pose
|
826ae37b26
|
merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
|
2009-01-26 11:45:30 +00:00 |
|
Florian Pose
|
5ca3d24337
|
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
|
2009-01-26 11:16:10 +00:00 |
|
Florian Pose
|
b8f4c144de
|
merge -c1521 branches/stable-1.4: Fixed race concerning ec_slave_config_state->operational.
|
2008-10-17 13:30:55 +00:00 |
|
Florian Pose
|
64e1d6f678
|
Introduced ec_datagram_zero().
|
2008-09-30 07:34:55 +00:00 |
|
Florian Pose
|
86956a05c8
|
Only query Sdo information service, if slave supports it.
|
2008-09-24 08:32:55 +00:00 |
|
Florian Pose
|
12d30c487a
|
Added VoE handler.
|
2008-09-01 14:17:18 +00:00 |
|
Florian Pose
|
d975aafa18
|
Added phy commands.
|
2008-08-13 13:23:52 +00:00 |
|
Florian Pose
|
e647297b12
|
Attach Pdo names from dictionary.
|
2008-08-01 12:28:18 +00:00 |
|
Florian Pose
|
d24c3cbbf7
|
Minor change.
|
2008-08-01 07:22:13 +00:00 |
|
Florian Pose
|
5317b27ff9
|
Major Pdo configuration change: Read mapping of unknown Pdos during
configuration.
|
2008-07-31 16:13:29 +00:00 |
|
Florian Pose
|
8265fb115f
|
Improved locking between ioctl()s and master state machine; separate
functions for ioctls(); removed master's sii_sem and sdo_sem.
|
2008-07-02 11:26:51 +00:00 |
|
Florian Pose
|
be9e9fd07d
|
Avoid duplicate reconfiguration.
|
2008-06-27 07:22:02 +00:00 |
|
Florian Pose
|
f03af4c38b
|
Removed 'end' and 'error' states from master state machine.
|
2008-06-18 13:53:31 +00:00 |
|
Florian Pose
|
0ef150c812
|
Renamed master 'mode' to 'phase'.
|
2008-06-18 13:33:50 +00:00 |
|
Florian Pose
|
d91aa97487
|
Removed configs_attached flag; changed return value of
ec_master_attach_slave_configs() to void.
|
2008-06-18 12:49:11 +00:00 |
|
Florian Pose
|
af2c4efc0e
|
Set slave_states to 0x00 when no slaves are present.
|
2008-06-18 09:27:04 +00:00 |
|
Florian Pose
|
e581c899f6
|
Minor change.
|
2008-06-12 13:03:50 +00:00 |
|
Florian Pose
|
a2dc5419b7
|
Minor change.
|
2008-06-12 11:53:06 +00:00 |
|
Florian Pose
|
2f836e6e32
|
Fixed bug in slave scanning, causing a segmentation fault.
|
2008-06-12 09:49:35 +00:00 |
|
Florian Pose
|
e4c9a82a56
|
Store slaves in an array instead of a list.
|
2008-06-12 09:32:25 +00:00 |
|
Florian Pose
|
b54bc11567
|
Replaced a few GFP_ATOMIC allocations with GFP_KERNEL ones.
|
2008-06-12 08:31:06 +00:00 |
|
Florian Pose
|
22fe4a1841
|
Removed kobjects from sdo and slave.
|
2008-06-12 07:15:54 +00:00 |
|
Florian Pose
|
d28bf7ecbe
|
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
removed action_acknowledge.
|
2008-06-10 12:05:25 +00:00 |
|
Florian Pose
|
2a7a7e2e5c
|
Replaced misleading %i by %u.
|
2008-06-10 11:54:39 +00:00 |