# HG changeset patch # User Florian Pose # Date 1225882306 0 # Node ID a211bcf100301f2b4790b1bb827c2cd687c0f142 # Parent 3861554f3c9d4470b63827955302b51e57720368 merge -c1544 trunk: Fixed missing paren. diff -r 3861554f3c9d -r a211bcf10030 documentation/ethercat_doc.tex --- a/documentation/ethercat_doc.tex Wed Nov 05 10:50:50 2008 +0000 +++ b/documentation/ethercat_doc.tex Wed Nov 05 10:51:46 2008 +0000 @@ -556,13 +556,11 @@ % Interface version % Master Requesting and Releasing % Master Locking -% Slave configuration % Configuring Pdo assignment and mapping % Domains (memory) % Pdo entry registration % Sdo configuration % Sdo access -% Cyclic operation The application interface provides functions and data structures for applications to access an EtherCAT master. The complete documentation of the @@ -699,7 +697,7 @@ %------------------------------------------------------------------------------ -\section{Concurrent Master Access} % FIXME +\section{Concurrent Master Access} \label{sec:concurr} \index{Concurrency} @@ -732,8 +730,8 @@ the master-internal EoE process uses it to communicate with EoE-capable slaves. Both have to acquire the master lock before access: The application task can access the lock natively, while the EoE process has to use the -callbacks. See the application interface documentation (chap.~\ref{chap:api} -of how to use the locking callbacks. +callbacks. See the application interface documentation (chap.~\ref{chap:api}) +for how to use the locking callbacks. %------------------------------------------------------------------------------