Commit Graph

314 Commits

Author SHA1 Message Date
Martin Troxler 82ea99132c Merged 2010-04-29 14:05:15 +02:00
Florian Pose 02b27f9fbc Fixed possible bug in EoE code: Only restart EoE process, when it was running
before (not while scanning).
2010-04-27 13:40:44 +02:00
Florian Pose 6373e38ca3 Introduced effective_alias variable to separate reg12 alias from SII alias. 2010-04-23 16:42:27 +02:00
Florian Pose 351e1a681a Renamed sdo_injecton_timeout to ext_injection_timeout. 2010-04-19 21:54:54 +02:00
Florian Pose bf2bffdcf5 Added missing queue_external_datagram(); removed tabs. 2010-03-19 10:48:16 +01:00
Martin Troxler 20d8691f5f added API ecrt_master_configured_slaves_state
use this function instead of ecrt_master_state() if there are unused slaves on the bus
2010-03-14 20:47:10 +01:00
Florian Pose 79e2df1245 Fixed clearing frame statistics on link down. 2010-03-09 09:59:32 +01:00
Florian Pose 1cea08c920 Removed unused variable frames_timed_out. 2010-03-07 21:20:40 +01:00
Florian Pose 3850763eca Implemented reading Sercos-over-EtherCAT services. To be continued... 2010-03-01 18:33:42 +01:00
Florian Pose a144042657 Removed tabulators. 2010-02-05 10:29:47 +01:00
Florian Pose 1753d24369 Fixed name of byte transmission time define; changed coding style. 2010-01-19 17:57:46 +01:00
Florian Pose 4f347b6da8 Disable use of hrtimer for scheduling by default. Does not work on some PPC targets. 2010-01-19 15:15:57 +01:00
Florian Pose 91e5c0d860 Merged Komax changes. 2010-01-08 11:26:07 +01:00
Florian Pose a163d3f1bd Implemented ecrt_master() and ecrt_master_get_slave() in kernel space. 2010-01-07 17:26:39 +01:00
Martin Troxler 5d6ce8b992 Merged 2009-12-27 16:58:19 +01:00
Martin Troxler 49fc79081f merged 2009-12-18 11:09:07 +01:00
Matthias Luescher df099a1998 fix build for recent kernel versions (tested with 2.6.31) 2009-12-17 17:21:03 +01:00
Martin Troxler 8d4a5ed16a removed busy loop in idle thread 2009-12-17 10:54:59 +01:00
Martin Troxler 94fec37d0f use given send interval to limit SDO/FOE traffic 2009-12-15 10:55:36 +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 cb33213076 ecrt_master_set_max_cycle_size: limit SDO traffic 2009-11-30 12:26:56 +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 bf63d965d8 Merge 2009-11-19 14:44:57 +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 21dacadf01 Merge x86_64 fixes. 2009-10-19 13:13:55 +02:00
Florian Pose 7ac08b531f Avoid warnings on x86_64 platform. Thanks to Thomas Elste. 2009-10-19 13:12:40 +02:00
Florian Pose e3b459e060 Fixed clearing slaves: Also clear external requests before. Thanks to Martin
Troxler.
2009-10-06 13:50:30 +02:00
Florian Pose 700226ac83 DC synchrony monitoring methods. 2009-08-21 12:15:16 +02:00
Florian Pose 103eb7139c Added ecrt_master_deactivate() to remove the bus configuration. 2009-08-20 14:27:35 +02:00
Florian Pose 694838c9f6 Fixed compiler error on --disable-eoe. 2009-08-04 07:54:16 +00:00
Florian Pose f411a51ca6 Re-added callback data pointer, because it is necessary for some applications. 2009-07-29 09:19:53 +00:00
Florian Pose 735f1efbc1 Removed unwanted tabulators. 2009-07-27 10:37:47 +00:00
Florian Pose a3c32e8b67 Improved the callback mechanism. 2009-07-13 15:18:28 +00:00
Florian Pose f7e14d2915 EoE processing with kthread. 2009-06-30 11:11:56 +00:00
Florian Pose 1baa06d05b ethercat eoe command. 2009-06-26 09:46:57 +00:00
Florian Pose 2a7052264b Minor: vendor/product with 8 hex digits. 2009-06-26 07:44:50 +00:00
Florian Pose ceec75bf50 Always set DC reference clock to OP. 2009-05-06 15:06:46 +00:00
Florian Pose 6935cbb247 Use application start time as a common reference for cyclic generation
start times.
2009-05-04 12:11:00 +00:00
Florian Pose a34809e18d Separated application time from synchronizing reference clock. 2009-05-04 10:05:55 +00:00
Florian Pose f057a0f968 Transition->Transmission. 2009-04-30 14:37:02 +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 69da9e5524 Determine type of DC implementation (full or delay meas. only); update scan FSM graph. 2009-04-27 11:38:03 +00:00
Florian Pose d3303e0fa4 Replaced timeval by 64-bit EtherCAT time. 2009-04-24 10:24:53 +00:00
Florian Pose 40bb1edaec Output reference clock and application time in 'ethercat Master'. 2009-04-24 08:39:20 +00:00
Florian Pose fe56cc111c Separated sync_reference_clock() and sync_slave_clocks(). 2009-04-23 12:02:26 +00:00
Florian Pose 5e79dc8c06 Find DC reference clock. 2009-04-20 14:33:47 +00:00