Commit Graph

149 Commits

Author SHA1 Message Date
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
Florian Pose ee57578c05 Renamed some fields in ec_sii_request_t to word addressing. 2008-06-09 14:32:16 +00:00
Florian Pose 5160d6be02 process Sdo requests even with error_flag set. 2008-06-06 15:16:37 +00:00
Florian Pose 02079391de configs_attached = 0. 2008-05-30 14:50:57 +00:00
Florian Pose 24ac60fdcc Fetch Sdo dictionaries and process SII requests in operation mode. 2008-04-25 14:58:33 +00:00
Florian Pose 00d78d2566 Replaced self_configured flag with force_config flag. 2008-04-25 14:32:56 +00:00
Florian Pose ff5dd7fe1c Improved master state machine. 2008-04-25 14:07:38 +00:00
Florian Pose 0b9015848b Removed slave online flag. 2008-04-25 12:45:44 +00:00
Florian Pose ec02b717fa Renamed state sdodict to sdo_dictionary. 2008-04-25 12:23:52 +00:00
Florian Pose f28ee06308 Removed some debugging. 2008-04-25 12:18:46 +00:00
Florian Pose 80c1bf823d Removed bus validation; slave configuration during realtime operation;
improved scan/config busy flags.
2008-04-25 12:04:23 +00:00
Florian Pose fc60cae9c7 Implemented Sdo timeout. 2008-04-03 14:08:08 +00:00
Florian Pose f69b21af02 Renamed EEPROM to SII. 2008-03-17 09:38:48 +00:00
Florian Pose f28f42ceb1 Introduced ec_sdo_request_state_t, making ec_request_t private again;
therefore added EC_REQUEST_INIT and renamed EC_REQUEST_IN_PROGRESS to
EC_REQUEST_BUSY and EC_REQUEST_COMPLETE to EC_REQUEST_SUCCESS.
2008-03-04 11:37:51 +00:00
Florian Pose 57094eaf48 Replaced ec_fsm_coe_\(upload\|download\)() with ec_fsm_coe_transfer();
reading and writing access possible.
2008-03-04 10:18:02 +00:00
Florian Pose e90dab2a4e Basic reading realtime Sdo access working. 2008-03-04 09:57:36 +00:00
Florian Pose 17069bcb70 Fixed bug if scanning is not allowed when link goes up. 2008-03-03 16:17:23 +00:00
Florian Pose 0b5b3b9e9b Removed slave pointer from ec_sdo_request_t class. 2008-02-29 16:20:12 +00:00
Florian Pose a4095b4201 Separated SII data from slave. 2008-02-27 15:24:00 +00:00
Florian Pose 397b5bf0cc Reading of Pdo mapping via CoE during scan. 2008-02-26 16:58:20 +00:00
Florian Pose 5e22bcec73 Separated slave state machines. 2008-02-26 13:20:32 +00:00
Florian Pose 39f4da4d4f Implemented missing datagram types. 2008-02-22 15:35:39 +00:00
Florian Pose 350c159a9d Renamed [PS]DO to [PS]do. 2008-02-22 12:29:30 +00:00
Florian Pose 3a50cd0ff1 Allow bus configuration when link is down. 2008-02-19 09:58:48 +00:00
Florian Pose 6189092aed Implemented most realtime interface changes for version 1.4, improved
ec_pdo_t and ec_pdo_entry_t classes, added fmmu_config_t, adjusted
minimal example, etc...
2008-02-19 08:22:20 +00:00
Florian Pose c5b3ade0c0 Updated Doxygen documentation. 2007-09-24 12:12:11 +00:00
Florian Pose 59d245a367 Changed unit of ec_eeprom_write_request_t from word to byte. 2007-09-24 07:54:51 +00:00
Florian Pose 8ee649a8c6 Minor debugging output changes. 2007-09-20 09:43:59 +00:00
Florian Pose d7c42088c2 Read PDO mapping from SDO dictionary (working, not finished yet). 2007-09-19 17:44:28 +00:00
Florian Pose 0fe3931b47 Removed 'sdo' field from ec_sdo_request_t; Exported
ec_sdo_request_\(init_read|clear\)().
2007-09-19 17:25:48 +00:00
Florian Pose 56949fa400 Allow EEPROM writing when slave has error flag set. 2007-09-18 14:17:49 +00:00
Florian Pose af076a36bc Clear station addresses with broadcast before setting them. 2007-09-12 13:20:29 +00:00
Florian Pose 08c67e8f2e Minor fix. 2007-09-12 13:12:38 +00:00
Florian Pose c4b87f7317 Added --enable-eoe conditional. 2007-09-12 13:10:15 +00:00
Florian Pose 5bcf9d740f Better handling of unexpected working counters; introduced
ec_datagram_print_wc_error().
2007-09-12 10:07:55 +00:00
Florian Pose 9466d51185 Dynamic creation of EoE handlers. 2007-03-16 14:00:12 +00:00
Florian Pose f5a7e78786 Slave configuration exclusively from master thread; removed
ec_master_sync_io(); introduced events in the master state machine;
locking of slave scanning and slave configuration through allow_scan
and allow_config flags.
2007-03-12 18:21:42 +00:00
Florian Pose d813370220 Added scan time output. 2007-03-12 13:59:23 +00:00
Florian Pose 571917dd1a Introduced idle flag in master state machine. 2007-03-12 12:11:43 +00:00
Florian Pose 467dfa260e Renamed names of enum type ec_request_state_t. 2007-03-12 11:02:05 +00:00
Florian Pose 2907aebfdf Implemented SDO reading with wait queues. 2007-03-09 15:11:29 +00:00
Florian Pose 8c9fec5ce0 Renamed ec_eeprom_request_state_t enum to ec_request_state_t and made it
global.
2007-03-09 14:00:32 +00:00
Florian Pose b0c1fbaeb0 Removed X:Y addressing scheme, ec_slave_is_coupler(),
ec_master_calc_addressing(), coupler_index and coupler_subindex variables.
Adapted lsec script and examples.
2007-03-09 13:24:15 +00:00
Florian Pose 81524176a8 Correctted resetting topology_change_pending and tainted flags. 2007-03-09 13:16:12 +00:00
Florian Pose 37baf012fb Removed ecrt_master_run(), removed datagram queueing from state
machines, added datagram injection, two different master thread
functions.
2007-03-08 13:02:42 +00:00
Florian Pose b4bfda2e62 Introduced master status, ecrt_master_get_status(), tainted flag,
pdos_registered flags and pdo_slaves_offline counter.
2007-03-05 10:35:50 +00:00
Florian Pose b0285d88a9 Introduced ec_slave_online_state_t, ec_slave_set_online_state(), renamed
slave->online to ec_online_state and introduced
ec_slave_set_app_state().
2007-03-05 09:55:39 +00:00
Florian Pose d8d30c4a1f Implemented alias reading/writing via sysfs. 2007-03-02 15:43:45 +00:00
Florian Pose 65572b43d7 Fixed signal issue in EEPROM writing code. 2007-03-02 14:35:49 +00:00
Florian Pose 6ad6b0cb0b Fixed possible race with next request pointer again. 2007-03-02 08:45:21 +00:00
Florian Pose d2094a18e5 Fixed possible bug in master FSM concerning unqueueing of EEPROM write
requests.
2007-03-02 07:45:00 +00:00
Florian Pose 2ec4d25fce Introduced EEPROM write requests: EEPROM write operations from user
space are now queued and block until completion. Also, appropriate error
codes are returned.
2007-03-01 21:34:10 +00:00
Florian Pose 53c66dad4f Added datagram state to "Failed to receive..." messages. 2007-02-22 13:39:19 +00:00
Florian Pose 8e2a5258cc Introduced topology_change_pending to delay bus scanning until IDLE mode
has been reached.
2007-02-13 10:51:40 +00:00
Florian Pose f2c447a006 Fixed bug that caused the last slave not to be scanned. 2007-02-06 15:13:51 +00:00
Florian Pose cde396cdc2 Fixed bug in master state machine that came up in r745. 2007-01-12 12:09:38 +00:00
Florian Pose df1cc1d939 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch] 2007-01-10 16:32:06 +00:00