Commit Graph

996 Commits

Author SHA1 Message Date
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
Martin Troxler 94fec37d0f use given send interval to limit SDO/FOE traffic 2009-12-15 10:55:36 +01:00
Martin Troxler 8c486431ce removed obsolete datagram reinit in fsm_sii 2009-12-15 10:53:28 +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 e23af9cfdb Postpone SDO request when slave is in INIT 2009-12-10 13:19:21 +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 a864fc8396 ec_print_data: show only the first 128 and the last 128 bytes of a data block 2009-11-30 12:26:24 +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 286a65516b Fixed SDO up/download kernel oops bug 2009-11-23 14:22:48 +01:00
Florian Pose 8e2d564639 Introduced mailbox/CoE defines; avoided duplicate code in CoE segmented
download.
2009-11-21 21:46:52 +01:00
Florian Pose 2ee30ffbd8 SDO segmented download. 2009-11-20 19:01:38 +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 bd90926ab3 Use net_device_ops also for EoE devices from 2.6.29 on. 2009-11-19 13:53:33 +01:00
Florian Pose 3a757b8dcc Print complete Ethernet frame during debug. 2009-11-05 09:25:25 +01:00
Florian Pose 49c2f676d5 Bugfix: Unqueue datagram before destroying. 2009-10-29 17:28:49 +01:00
Florian Pose fa26232937 Later freeing of netdev. 2009-10-28 14:59:34 +01:00
Florian Pose fce4304366 Added missing newline. 2009-10-28 14:01:23 +01:00
Florian Pose 98132eff81 Avoid zeroing mailbox datagram because of VoE handlers. 2009-10-28 13:47:39 +01:00
Florian Pose ed57943fd4 Using snprintf for interface name. 2009-10-28 13:17:08 +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 5bc430d1a7 Removed unused sysfs macros. 2009-10-13 16:52:56 +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 da10aa7043 Merge 2009-08-21 09:46:29 +02:00
Florian Pose 1aa450c318 Fixed SDO upload segment response for 10 bytes mailbox length (thanks to Joerg
Mohre).
2009-08-21 09:45:53 +02:00
Florian Pose 1ccd59402e Implemented ecrt_master_deactivate() in userspace. 2009-08-20 14:43:55 +02:00
Florian Pose 103eb7139c Added ecrt_master_deactivate() to remove the bus configuration. 2009-08-20 14:27:35 +02:00
Florian Pose 6161473018 Switched from Subversion to Mercurial. 2009-08-13 15:18:53 +02:00
Florian Pose 10c7501851 Implemented CompleteAccess for SDO downloads. 2009-08-13 13:53:56 +02:00
Florian Pose 4099c6905b Check for NULL pointer in ecdev_receive(). 2009-08-11 12:15:20 +00:00
Florian Pose c2cf92f9ec Fixed setting watchdog intervals. 2009-08-06 12:52:53 +00:00
Florian Pose 0663090dcc Output watchdog configuration in ethercat config. 2009-08-04 12:52:12 +00: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 4f4ac6e4fa Added watchdog configuration via application interface (thanks to J. Mohre). 2009-07-27 10:48:52 +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 5ac0980aba Fixed SDO upload segment response (thanks to Christoph Peter). 2009-07-10 10:37:14 +00:00
Florian Pose 87bd9ded3e Reverted accidential checkin. 2009-07-10 09:38:07 +00:00
Florian Pose 36ff1cb8fa TODO. 2009-07-10 09:36:50 +00:00
Florian Pose 1694ef18d7 Zero mailbox datagram before sending. 2009-07-09 14:05:36 +00:00
Florian Pose 18d3eb982e Configure PDO sync managers even if no configuration has been applied. 2009-07-09 12:54:49 +00:00
Florian Pose f7e14d2915 EoE processing with kthread. 2009-06-30 11:11:56 +00:00
Florian Pose e9b881e6db Output device opened/closed only on debug level 2. 2009-06-29 14:27:06 +00:00
Florian Pose 70d8767f7c Minor: Changed comment style. 2009-06-29 14:25:31 +00:00
Florian Pose 5176ca3cf3 EoE transmit retry; EoE warnings. 2009-06-26 12:21:56 +00:00
Florian Pose 1baa06d05b ethercat eoe command. 2009-06-26 09:46:57 +00:00
Florian Pose 2bb56b4f15 Debug statements with EC_DBG() in EoE code. 2009-06-26 08:00:47 +00:00
Florian Pose 2a7052264b Minor: vendor/product with 8 hex digits. 2009-06-26 07:44:50 +00:00
Florian Pose 41dec510d5 merge -c1788 branches/stable-1.4: ec_master.symvers installation. 2009-06-19 14:41:06 +00:00
Florian Pose a30c09c05b Implemented new network device operations for kernel 2.6.29, thanks to M. Goetze. 2009-06-16 08:30:49 +00:00
Florian Pose d1ef052122 Continue with next sync manager if reading the PDOs failed. 2009-06-15 15:58:09 +00:00
Florian Pose 534c605e4f Fixed mailbox usage for slaves that do not provide sync manager
configurations.
2009-06-15 15:46:04 +00:00
Florian Pose aad3434dd3 Minor. 2009-06-15 15:39:26 +00:00
Florian Pose acd5a56616 Improved newlines in debug data output. 2009-06-15 15:29:24 +00:00
Florian Pose cd480be3a1 Improved error checking on SDO upload. 2009-06-15 12:33:48 +00:00
Florian Pose ee89b28e5a Added documentation. 2009-05-15 09:05:27 +00:00
Florian Pose 8e9761b1e2 Debugging output. 2009-05-07 12:25:10 +00:00
Florian Pose 2550b77338 Slightly improved CoE download expedited request. 2009-05-07 11:41:45 +00:00
Florian Pose a1def17259 Output DC config in 'ethercat config'. 2009-05-07 10:33:26 +00:00
Florian Pose 2002b73569 Added EC_IOCTL_APP_TIME. 2009-05-07 10:11:21 +00:00
Florian Pose cc6e9a7c79 Symbol versions; Makefile improvements. 2009-05-07 08:44:00 +00:00
Florian Pose ceec75bf50 Always set DC reference clock to OP. 2009-05-06 15:06:46 +00:00
Florian Pose 7e600a6301 Merged ecrt_slave_config_dc_assign_activate() and
ecrt_slave_config_dc_sync_signals() to ecrt_slave_config_dc().
2009-05-05 15:03:59 +00:00
Florian Pose d7a38aaf29 Added scan_busy flag to ioctl(). 2009-05-05 10:01:55 +00:00
Florian Pose af712c4a43 Fixed usage of IS_ERR() in FoE state machine. 2009-05-05 09:57:42 +00:00
Florian Pose 959c19fefd Introduced EC_AL_STATE_CHANGE_TIMEOUT and set it to 2 s. 2009-05-05 09:50:04 +00:00
Florian Pose d8177f03ee Unset idle flag while processing FoE requests. 2009-05-05 09:45:31 +00:00
Florian Pose ef854c1c93 Changed EC_MAX_SII_SIZE to 4096. 2009-05-05 09:43:32 +00:00
Florian Pose c39919e6cc Replaced ecrt_slave_config_dc_cycle_times() and ecrt_slave_config_dc_shift_times() by ecrt_slave_config_dc_sync_signals(). 2009-05-04 12:46:30 +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 4c1c3fe289 Take ref clock address from dc_ref_clock pointer. 2009-05-04 12:10:11 +00:00
Florian Pose a34809e18d Separated application time from synchronizing reference clock. 2009-05-04 10:05:55 +00:00
Florian Pose 5401cb1a6d Set system time transmission delay during config. 2009-04-30 16:04:44 +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 d427828ecc Measure port receive times. 2009-04-27 15:20:14 +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 b106be8342 Added missing doc. 2009-04-24 09:51:11 +00:00
Florian Pose 40bb1edaec Output reference clock and application time in 'ethercat Master'. 2009-04-24 08:39:20 +00:00
Florian Pose ddd707d8be Userspace library implementation of DC functions. 2009-04-23 14:45:07 +00:00
Florian Pose 4b4dc8a5b5 DC shift time working. 2009-04-23 12:25:09 +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
Florian Pose 59a9094b2a Improved DC configuration. 2009-04-20 13:43:57 +00:00
Florian Pose 2395d3a876 Clear DC assignment after going to INIT. 2009-04-20 11:53:17 +00:00
Florian Pose 5ed436bb6a Minor changes. 2009-04-20 10:27:36 +00:00
Florian Pose 9f54862108 Tested clearing slave list after link down; minor changes. 2009-04-20 09:17:39 +00:00
Florian Pose b7e06d12f4 Output link state in 'ethercat master'. 2009-04-17 12:55:55 +00:00
Florian Pose 515a66aa8e Clear slave list on link down. 2009-04-17 12:41:57 +00:00
Florian Pose 4694cde027 Added debug_level module parameter. debug_level is now unsigned int. 2009-04-17 12:03:12 +00:00
Florian Pose 2c81e5b9b4 Removed unused variable. 2009-04-17 11:07:27 +00:00
Florian Pose 47abdd4a41 Introduced DEBUG_IOCTL. 2009-04-17 10:39:19 +00:00
Florian Pose 0dd5ec3567 DC sync reference clock to application time. TBC... 2009-04-09 18:21:18 +00:00
Florian Pose de1a332eee Introduced ecrt_master_sync() for synchronizing slave clocks to reference clock. 2009-04-09 10:21:47 +00:00
Florian Pose e3b1d8e573 DC cyclic operation and slave configuration. TBC... 2009-04-09 09:17:41 +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 da1c5588de Read SDO entry access rights. 2009-04-08 08:13:33 +00:00
Florian Pose 19d7da4ad3 Fixed VoE ioctl(). 2009-04-07 12:53:37 +00:00
Florian Pose 01aeadbc73 Improved phy debugging. 2009-04-07 09:37:07 +00:00
Florian Pose 205891e412 Reading more base information (incl. whether DC supported). 2009-04-07 09:00:20 +00:00
Florian Pose 478a0f2a69 Warn if going to SAFEOP without configuration. 2009-03-19 08:44:48 +00:00
Florian Pose a5752e0123 Preparations to compile against 2.6.27. 2009-03-09 09:08:09 +00:00
Florian Pose 12c12b1bab Improved and added license headers. 2009-02-24 12:51:39 +00:00
Florian Pose 07fffd62f9 Fixed SDO upload via library. 2009-02-24 10:16:24 +00:00
Florian Pose f73cdc7a6b Fixed SDO download via library. 2009-02-24 10:03:53 +00:00
Florian Pose e745837fed Implemented SDO requests in userspace library. 2009-02-02 13:37:00 +00:00
Florian Pose fe10563a36 Added ec_slave_config_find_sdo_request(). 2009-02-02 13:34:01 +00:00
Florian Pose e60948f4e1 Minor fix in VoE handler. 2009-02-02 13:32:48 +00:00
Florian Pose 5ea60780a0 Fixed FoE request states. 2009-01-30 10:56:06 +00:00
Florian Pose 96ea8a76b8 Fixed usage of internal request states. 2009-01-30 10:50:21 +00:00
Florian Pose 6a5e90c4b1 Allow the slave to not respond to the mailbox sync manager configuration
datagram for a certain time.
2009-01-27 14:14:37 +00:00
Florian Pose 682735201c Added missing files to dist. 2009-01-27 09:40:05 +00:00
Florian Pose d137632ae4 TODO. 2009-01-26 16:38:39 +00:00
Florian Pose 50abafdb1f Debug message. 2009-01-26 16:35:50 +00:00
Florian Pose c94059e5fb Fixed spacing and comments. 2009-01-26 16:23:09 +00:00
Florian Pose fa17bbb5a8 Clear sync managers before configuration. 2009-01-26 16:01:13 +00:00
Florian Pose 8c76942245 merge -c1635 branches/1.4-foe: Removed todo line. 2009-01-26 14:14:17 +00:00
Florian Pose 75992b9aa4 merge -c1622 branches/1.4-foe: Fixed seg_size parameter when processing an CoE Upload Segment Response. 2009-01-26 14:13:50 +00:00
Florian Pose 40ee89a77f merge -c1621 branches/1.4-foe: Introduced configured_[tr]x_mailbox(size|offset) members of slave. 2009-01-26 13:28:19 +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 7e69daf7dd merge -c1614 branches/stable-1.4: Fixed datagram cleaning. 2009-01-26 11:59:07 +00:00
Florian Pose 723a9d66f4 merge -c1610 branches/stable-1.4: Added missing doxygen docs. 2009-01-26 11:58:35 +00:00
Florian Pose 121cfd7098 merge -c1606 branches/stable-1.4: Output vendor Id in hex. 2009-01-26 11:46:38 +00:00
Florian Pose 7b4542ac81 merge -c1605 branches/stable-1.4: Output ioctl() debugging in hex. 2009-01-26 11:46:02 +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 c66d1cc62a merge -r1583:1593 branches/stable-1.4: Fixed detaching oops. 2008-11-25 14:07:19 +00:00
Florian Pose e643a71543 Output debug message only on debug level > 0. 2008-11-18 11:20:30 +00:00
Florian Pose fae8df09b0 Included ecrt_voe_handler_read_nosync()-Patch by Mathias Weber. 2008-11-18 11:13:49 +00:00
Florian Pose 8d46a283f6 Improved error case return codes of many functions. 2008-11-17 17:18:02 +00:00
Florian Pose bdbaf5d078 Created backend versions of all API functions returing a pointer; using
the PTR_ERR()... macros.
2008-11-17 15:04:28 +00:00
Florian Pose f552f81763 merge -c1582 branches/stable-1.4: Typo. 2008-11-06 15:46:40 +00:00
Florian Pose 8e7a370756 Create debug interface with address of physical device on attachment. 2008-11-05 15:05:40 +00:00
Florian Pose 72381046c2 merge -c1554 branches/stable-1.4: Fixed WC calculation for multiple datagrams. 2008-11-05 10:16:11 +00:00
Florian Pose 7fca697c8d Output corrupted frame reasons. 2008-11-05 09:59:20 +00:00
Florian Pose aca58d41d2 Build examples by default. 2008-10-21 09:58:19 +00:00
Florian Pose 59f197a6f0 Fixed page fault handler. 2008-10-21 09:26:19 +00:00
Florian Pose f8bff8668f merge -c1522 branches/stable-1.4: Fixed jace in jiffies timeout calculation. 2008-10-17 13:36:43 +00:00