libs
/
SOEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Typos. 

allways -> always
recieved -> received
resend -> resent
stuct -> struct
etries -> entries
broaddcast -> broadcast
timouts -> timeouts
optimalisation -> optimisation
mulitple -> multiple
This commit is contained in:
strongly-typed 2015-04-16 12:00:00 +02:00 committed by Hans-Erik Floryd
parent 755e700a2f
commit 7cf93a6efb
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oshw/intime/nicdrv.c
View File

@ -45,11 +45,11 @@
* *
* Low level interface functions to send and receive EtherCAT packets. * Low level interface functions to send and receive EtherCAT packets.
* EtherCAT has the property that packets are only send by the master, * EtherCAT has the property that packets are only send by the master,
* and the send packets allways return in the receive buffer. * and the send packets always return in the receive buffer.
* There can be multiple packets "on the wire" before they return. * There can be multiple packets "on the wire" before they return.
* To combine the received packets with the original send packets a buffer * To combine the received packets with the original send packets a buffer
* system is installed. The identifier is put in the index item of the * system is installed. The identifier is put in the index item of the
* EtherCAT header. The index is stored and compared when a frame is recieved. * EtherCAT header. The index is stored and compared when a frame is received.
* If there is a match the packet can be combined with the transmit packet * If there is a match the packet can be combined with the transmit packet
* and returned to the higher level function. * and returned to the higher level function.
* *
@ -62,7 +62,7 @@
* OUT port. Packets are send via both interfaces. Any one of the connections * OUT port. Packets are send via both interfaces. Any one of the connections
* (also an interconnect) can be removed and the slaves are still serviced with * (also an interconnect) can be removed and the slaves are still serviced with
* packets. The software layer will detect the possible failure modes and * packets. The software layer will detect the possible failure modes and
* compensate. If needed the packets from interface A are resend through interface B. * compensate. If needed the packets from interface A are resent through interface B.
* This layer if fully transparent for the higher layers. * This layer if fully transparent for the higher layers.
*/ */
@ -210,7 +210,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
if (secondary) if (secondary)
{ {
/* secondary port stuct available? */ /* secondary port struct available? */
if (port->redport) if (port->redport)
{ {
/* when using secondary socket it is automatically a redundant setup */ /* when using secondary socket it is automatically a redundant setup */
@ -283,8 +283,8 @@ int ecx_closenic(ecx_portt *port)
} }
/** Fill buffer with ethernet header structure. /** Fill buffer with ethernet header structure.
* Destination MAC is allways broadcast. * Destination MAC is always broadcast.
* Ethertype is allways ETH_P_ECAT. * Ethertype is always ETH_P_ECAT.
* @param[out] p = buffer * @param[out] p = buffer
*/ */
void ec_setupheader(void *p) void ec_setupheader(void *p)

12
oshw/linux/nicdrv.c
View File

@ -45,11 +45,11 @@
* *
* Low level interface functions to send and receive EtherCAT packets. * Low level interface functions to send and receive EtherCAT packets.
* EtherCAT has the property that packets are only send by the master, * EtherCAT has the property that packets are only send by the master,
* and the send packets allways return in the receive buffer. * and the send packets always return in the receive buffer.
* There can be multiple packets "on the wire" before they return. * There can be multiple packets "on the wire" before they return.
* To combine the received packets with the original send packets a buffer * To combine the received packets with the original send packets a buffer
* system is installed. The identifier is put in the index item of the * system is installed. The identifier is put in the index item of the
* EtherCAT header. The index is stored and compared when a frame is recieved. * EtherCAT header. The index is stored and compared when a frame is received.
* If there is a match the packet can be combined with the transmit packet * If there is a match the packet can be combined with the transmit packet
* and returned to the higher level function. * and returned to the higher level function.
* *
@ -62,7 +62,7 @@
* OUT port. Packets are send via both interfaces. Any one of the connections * OUT port. Packets are send via both interfaces. Any one of the connections
* (also an interconnect) can be removed and the slaves are still serviced with * (also an interconnect) can be removed and the slaves are still serviced with
* packets. The software layer will detect the possible failure modes and * packets. The software layer will detect the possible failure modes and
* compensate. If needed the packets from interface A are resend through interface B. * compensate. If needed the packets from interface A are resent through interface B.
* This layer if fully transparent for the higher layers. * This layer if fully transparent for the higher layers.
*/ */
@ -135,7 +135,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
rval = 0; rval = 0;
if (secondary) if (secondary)
{ {
/* secondary port stuct available? */ /* secondary port struct available? */
if (port->redport) if (port->redport)
{ {
/* when using secondary socket it is automatically a redundant setup */ /* when using secondary socket it is automatically a redundant setup */
@ -227,8 +227,8 @@ int ecx_closenic(ecx_portt *port)
} }
/** Fill buffer with ethernet header structure. /** Fill buffer with ethernet header structure.
* Destination MAC is allways broadcast. * Destination MAC is always broadcast.
* Ethertype is allways ETH_P_ECAT. * Ethertype is always ETH_P_ECAT.
* @param[out] p = buffer * @param[out] p = buffer
*/ */
void ec_setupheader(void *p) void ec_setupheader(void *p)

12
oshw/rtk/nicdrv.c
View File

@ -45,11 +45,11 @@
* *
* Low level interface functions to send and receive EtherCAT packets. * Low level interface functions to send and receive EtherCAT packets.
* EtherCAT has the property that packets are only send by the master, * EtherCAT has the property that packets are only send by the master,
* and the send packets allways return in the receive buffer. * and the send packets always return in the receive buffer.
* There can be multiple packets "on the wire" before they return. * There can be multiple packets "on the wire" before they return.
* To combine the received packets with the original send packets a buffer * To combine the received packets with the original send packets a buffer
* system is installed. The identifier is put in the index item of the * system is installed. The identifier is put in the index item of the
* EtherCAT header. The index is stored and compared when a frame is recieved. * EtherCAT header. The index is stored and compared when a frame is received.
* If there is a match the packet can be combined with the transmit packet * If there is a match the packet can be combined with the transmit packet
* and returned to the higher level function. * and returned to the higher level function.
* *
@ -62,7 +62,7 @@
* OUT port. Packets are send via both interfaces. Any one of the connections * OUT port. Packets are send via both interfaces. Any one of the connections
* (also an interconnect) can be removed and the slaves are still serviced with * (also an interconnect) can be removed and the slaves are still serviced with
* packets. The software layer will detect the possible failure modes and * packets. The software layer will detect the possible failure modes and
* compensate. If needed the packets from interface A are resend through interface B. * compensate. If needed the packets from interface A are resent through interface B.
* This layer is fully transparent for the higher layers. * This layer is fully transparent for the higher layers.
*/ */
@ -137,7 +137,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
if (secondary) if (secondary)
{ {
/* secondary port stuct available? */ /* secondary port struct available? */
if (port->redport) if (port->redport)
{ {
/* when using secondary socket it is automatically a redundant setup */ /* when using secondary socket it is automatically a redundant setup */
@ -207,8 +207,8 @@ int ecx_closenic(ecx_portt *port)
} }
/** Fill buffer with ethernet header structure. /** Fill buffer with ethernet header structure.
* Destination MAC is allways broadcast. * Destination MAC is always broadcast.
* Ethertype is allways ETH_P_ECAT. * Ethertype is always ETH_P_ECAT.
* @param[out] p = buffer * @param[out] p = buffer
*/ */
void ec_setupheader(void *p) void ec_setupheader(void *p)

12
oshw/win32/nicdrv.c
View File

@ -45,11 +45,11 @@
* *
* Low level interface functions to send and receive EtherCAT packets. * Low level interface functions to send and receive EtherCAT packets.
* EtherCAT has the property that packets are only send by the master, * EtherCAT has the property that packets are only send by the master,
* and the send packets allways return in the receive buffer. * and the send packets always return in the receive buffer.
* There can be multiple packets "on the wire" before they return. * There can be multiple packets "on the wire" before they return.
* To combine the received packets with the original send packets a buffer * To combine the received packets with the original send packets a buffer
* system is installed. The identifier is put in the index item of the * system is installed. The identifier is put in the index item of the
* EtherCAT header. The index is stored and compared when a frame is recieved. * EtherCAT header. The index is stored and compared when a frame is received.
* If there is a match the packet can be combined with the transmit packet * If there is a match the packet can be combined with the transmit packet
* and returned to the higher level function. * and returned to the higher level function.
* *
@ -62,7 +62,7 @@
* OUT port. Packets are send via both interfaces. Any one of the connections * OUT port. Packets are send via both interfaces. Any one of the connections
* (also an interconnect) can be removed and the slaves are still serviced with * (also an interconnect) can be removed and the slaves are still serviced with
* packets. The software layer will detect the possible failure modes and * packets. The software layer will detect the possible failure modes and
* compensate. If needed the packets from interface A are resend through interface B. * compensate. If needed the packets from interface A are resent through interface B.
* This layer is fully transparent for the higher layers. * This layer is fully transparent for the higher layers.
*/ */
@ -131,7 +131,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
rval = 0; rval = 0;
if (secondary) if (secondary)
{ {
/* secondary port stuct available? */ /* secondary port struct available? */
if (port->redport) if (port->redport)
{ {
/* when using secondary socket it is automatically a redundant setup */ /* when using secondary socket it is automatically a redundant setup */
@ -217,8 +217,8 @@ int ecx_closenic(ecx_portt *port)
} }
/** Fill buffer with ethernet header structure. /** Fill buffer with ethernet header structure.
* Destination MAC is allways broadcast. * Destination MAC is always broadcast.
* Ethertype is allways ETH_P_ECAT. * Ethertype is always ETH_P_ECAT.
* @param[out] p = buffer * @param[out] p = buffer
*/ */
void ec_setupheader(void *p) void ec_setupheader(void *p)

4
soem/ethercatmain.h
View File

@ -53,7 +53,7 @@ extern "C"
{ {
#endif #endif
/** max. etries in EtherCAT error list */ /** max. entries in EtherCAT error list */
#define EC_MAXELIST 64 #define EC_MAXELIST 64
/** max. length of readable name in slavelist and Object Description List */ /** max. length of readable name in slavelist and Object Description List */
#define EC_MAXNAME 40 #define EC_MAXNAME 40
@ -197,7 +197,7 @@ typedef struct
uint16 mbx_proto; uint16 mbx_proto;
/** Counter value of mailbox link layer protocol 1..7 */ /** Counter value of mailbox link layer protocol 1..7 */
uint8 mbx_cnt; uint8 mbx_cnt;
/** has DC capabillity */ /** has DC capability */
boolean hasdc; boolean hasdc;
/** Physical type; Ebus, EtherNet combinations */ /** Physical type; Ebus, EtherNet combinations */
uint8 ptype; uint8 ptype;

12
soem/ethercattype.h
View File

@ -43,10 +43,10 @@
* \brief * \brief
* General typedefs and defines for EtherCAT. * General typedefs and defines for EtherCAT.
* *
* Defines that could need optimalisation for specific applications * Defines that could need optimisation for specific applications
* are the EC_TIMEOUTxxx. Assumptions for the standard settings are a * are the EC_TIMEOUTxxx. Assumptions for the standard settings are a
* standard linux PC or laptop and a wired connection to maximal 100 slaves. * standard linux PC or laptop and a wired connection to maximal 100 slaves.
* For use with wireless connections or lots of slaves the timouts need * For use with wireless connections or lots of slaves the timeouts need
* increasing. For fast systems running Xenomai and RT-net or alike the * increasing. For fast systems running Xenomai and RT-net or alike the
* timeouts need to be shorter. * timeouts need to be shorter.
*/ */
@ -168,7 +168,7 @@ typedef enum
EC_ERR_ALREADY_INITIALIZED, EC_ERR_ALREADY_INITIALIZED,
/** Library not initialized. */ /** Library not initialized. */
EC_ERR_NOT_INITIALIZED, EC_ERR_NOT_INITIALIZED,
/** Timeout occured during execution of the function. */ /** Timeout occurred during execution of the function. */
EC_ERR_TIMEOUT, EC_ERR_TIMEOUT,
/** No slaves were found. */ /** No slaves were found. */
EC_ERR_NO_SLAVES, EC_ERR_NO_SLAVES,
@ -260,7 +260,7 @@ typedef enum
EC_CMD_FPRW, EC_CMD_FPRW,
/** Broadcast Read */ /** Broadcast Read */
EC_CMD_BRD, EC_CMD_BRD,
/** Broaddcast Write */ /** Broadcast Write */
EC_CMD_BWR, EC_CMD_BWR,
/** Broadcast Read Write */ /** Broadcast Read Write */
EC_CMD_BRW, EC_CMD_BRW,
@ -270,9 +270,9 @@ typedef enum
EC_CMD_LWR, EC_CMD_LWR,
/** Logical Memory Read Write */ /** Logical Memory Read Write */
EC_CMD_LRW, EC_CMD_LRW,
/** Auto Increment Read Mulitple Write */ /** Auto Increment Read Multiple Write */
EC_CMD_ARMW, EC_CMD_ARMW,
/** Configured Read Mulitple Write */ /** Configured Read Multiple Write */
EC_CMD_FRMW EC_CMD_FRMW
/** Reserved */ /** Reserved */
} ec_cmdtype; } ec_cmdtype;