bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up EoE frame type definitions.

This commit is contained in:
Florian Pose 2014-11-06 08:53:11 +01:00 committed by Bjarne von Horn
parent 60ebe661a6
commit d1df6520ba
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
master/ethernet.c
View File

@ -320,7 +320,7 @@ int ec_eoe_send(ec_eoe_t *eoe /**< EoE handler */)
if (IS_ERR(data))
return PTR_ERR(data);
EC_WRITE_U8 (data, EC_EOE_FRAMETYPE_FRAG_REQ);
EC_WRITE_U8 (data, EC_EOE_FRAMETYPE_INIT_REQ); // Initiate EoE Request
EC_WRITE_U8 (data + 1, last_fragment);
EC_WRITE_U16(data + 2, ((eoe->tx_fragment_number & 0x3F) |
(complete_offset & 0x3F) << 6 |
@ -507,7 +507,7 @@ void ec_eoe_state_rx_fetch(ec_eoe_t *eoe /**< EoE handler */)
frame_type = EC_READ_U16(data) & 0x000F;
if (frame_type != EC_EOE_FRAMETYPE_FRAG_REQ) {
if (frame_type != EC_EOE_FRAMETYPE_INIT_REQ) { // EoE Fragment Data
#if EOE_DEBUG_LEVEL >= 1
EC_SLAVE_WARN(eoe->slave, "%s: Other frame received."
" Dropping.\n", eoe->dev->name);

10
master/ethernet.h
View File

@ -55,11 +55,11 @@
/** EoE frame types.
*/
enum {
EC_EOE_FRAMETYPE_FRAG_REQ = 0x00, /** EoE Fragment Request. */
EC_EOE_FRAMETYPE_INIT_REQ = 0x02, /** Initiate EoE Request. */
EC_EOE_FRAMETYPE_INIT_RES = 0x03, /** Initiate EoE Response. */
EC_EOE_FRAMETYPE_FILT_REQ = 0x04, /** Set Address Filter Request. */
EC_EOE_FRAMETYPE_FILT_RES = 0x05, /** Set Address Filter Response. */
EC_EOE_FRAMETYPE_INIT_REQ = 0x00, /** Initiate EoE Request. */
EC_EOE_FRAMETYPE_SET_IP_REQ = 0x02, /** Set IP Parameter Request. */
EC_EOE_FRAMETYPE_SET_IP_RES = 0x03, /** Set IP Parameter Response. */
EC_EOE_FRAMETYPE_FILT_REQ = 0x04, /** Set Address Filter Request. */
EC_EOE_FRAMETYPE_FILT_RES = 0x05, /** Set Address Filter Response. */
};
/*****************************************************************************/