From 7cf93a6efbeb394a332269e28a22c8254c3590d3 Mon Sep 17 00:00:00 2001 From: strongly-typed Date: Thu, 16 Apr 2015 12:00:00 +0200 Subject: [PATCH] Typos. allways -> always recieved -> received resend -> resent stuct -> struct etries -> entries broaddcast -> broadcast timouts -> timeouts optimalisation -> optimisation mulitple -> multiple --- oshw/intime/nicdrv.c | 12 ++++++------ oshw/linux/nicdrv.c | 12 ++++++------ oshw/rtk/nicdrv.c | 12 ++++++------ oshw/win32/nicdrv.c | 12 ++++++------ soem/ethercatmain.h | 4 ++-- soem/ethercattype.h | 12 ++++++------ 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/oshw/intime/nicdrv.c b/oshw/intime/nicdrv.c index 94b3a1e..f0d8276 100644 --- a/oshw/intime/nicdrv.c +++ b/oshw/intime/nicdrv.c @@ -45,11 +45,11 @@ * * Low level interface functions to send and receive EtherCAT packets. * 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. * 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 - * 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 * and returned to the higher level function. * @@ -62,7 +62,7 @@ * 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 * 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. */ @@ -210,7 +210,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary) if (secondary) { - /* secondary port stuct available? */ + /* secondary port struct available? */ if (port->redport) { /* 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. - * Destination MAC is allways broadcast. - * Ethertype is allways ETH_P_ECAT. + * Destination MAC is always broadcast. + * Ethertype is always ETH_P_ECAT. * @param[out] p = buffer */ void ec_setupheader(void *p) diff --git a/oshw/linux/nicdrv.c b/oshw/linux/nicdrv.c index 0d2d72f..8f403d9 100644 --- a/oshw/linux/nicdrv.c +++ b/oshw/linux/nicdrv.c @@ -45,11 +45,11 @@ * * Low level interface functions to send and receive EtherCAT packets. * 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. * 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 - * 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 * and returned to the higher level function. * @@ -62,7 +62,7 @@ * 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 * 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. */ @@ -135,7 +135,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary) rval = 0; if (secondary) { - /* secondary port stuct available? */ + /* secondary port struct available? */ if (port->redport) { /* 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. - * Destination MAC is allways broadcast. - * Ethertype is allways ETH_P_ECAT. + * Destination MAC is always broadcast. + * Ethertype is always ETH_P_ECAT. * @param[out] p = buffer */ void ec_setupheader(void *p) diff --git a/oshw/rtk/nicdrv.c b/oshw/rtk/nicdrv.c index 7077294..3ca76bb 100644 --- a/oshw/rtk/nicdrv.c +++ b/oshw/rtk/nicdrv.c @@ -45,11 +45,11 @@ * * Low level interface functions to send and receive EtherCAT packets. * 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. * 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 - * 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 * and returned to the higher level function. * @@ -62,7 +62,7 @@ * 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 * 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. */ @@ -137,7 +137,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary) if (secondary) { - /* secondary port stuct available? */ + /* secondary port struct available? */ if (port->redport) { /* 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. - * Destination MAC is allways broadcast. - * Ethertype is allways ETH_P_ECAT. + * Destination MAC is always broadcast. + * Ethertype is always ETH_P_ECAT. * @param[out] p = buffer */ void ec_setupheader(void *p) diff --git a/oshw/win32/nicdrv.c b/oshw/win32/nicdrv.c index 46a07b8..583f0e1 100644 --- a/oshw/win32/nicdrv.c +++ b/oshw/win32/nicdrv.c @@ -45,11 +45,11 @@ * * Low level interface functions to send and receive EtherCAT packets. * 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. * 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 - * 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 * and returned to the higher level function. * @@ -62,7 +62,7 @@ * 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 * 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. */ @@ -131,7 +131,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary) rval = 0; if (secondary) { - /* secondary port stuct available? */ + /* secondary port struct available? */ if (port->redport) { /* 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. - * Destination MAC is allways broadcast. - * Ethertype is allways ETH_P_ECAT. + * Destination MAC is always broadcast. + * Ethertype is always ETH_P_ECAT. * @param[out] p = buffer */ void ec_setupheader(void *p) diff --git a/soem/ethercatmain.h b/soem/ethercatmain.h index 766bc60..91b52d1 100644 --- a/soem/ethercatmain.h +++ b/soem/ethercatmain.h @@ -53,7 +53,7 @@ extern "C" { #endif -/** max. etries in EtherCAT error list */ +/** max. entries in EtherCAT error list */ #define EC_MAXELIST 64 /** max. length of readable name in slavelist and Object Description List */ #define EC_MAXNAME 40 @@ -197,7 +197,7 @@ typedef struct uint16 mbx_proto; /** Counter value of mailbox link layer protocol 1..7 */ uint8 mbx_cnt; - /** has DC capabillity */ + /** has DC capability */ boolean hasdc; /** Physical type; Ebus, EtherNet combinations */ uint8 ptype; diff --git a/soem/ethercattype.h b/soem/ethercattype.h index 8fed22f..6203715 100644 --- a/soem/ethercattype.h +++ b/soem/ethercattype.h @@ -43,10 +43,10 @@ * \brief * 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 * 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 * timeouts need to be shorter. */ @@ -168,7 +168,7 @@ typedef enum EC_ERR_ALREADY_INITIALIZED, /** Library not initialized. */ EC_ERR_NOT_INITIALIZED, - /** Timeout occured during execution of the function. */ + /** Timeout occurred during execution of the function. */ EC_ERR_TIMEOUT, /** No slaves were found. */ EC_ERR_NO_SLAVES, @@ -260,7 +260,7 @@ typedef enum EC_CMD_FPRW, /** Broadcast Read */ EC_CMD_BRD, - /** Broaddcast Write */ + /** Broadcast Write */ EC_CMD_BWR, /** Broadcast Read Write */ EC_CMD_BRW, @@ -270,9 +270,9 @@ typedef enum EC_CMD_LWR, /** Logical Memory Read Write */ EC_CMD_LRW, - /** Auto Increment Read Mulitple Write */ + /** Auto Increment Read Multiple Write */ EC_CMD_ARMW, - /** Configured Read Mulitple Write */ + /** Configured Read Multiple Write */ EC_CMD_FRMW /** Reserved */ } ec_cmdtype;