# HG changeset patch # User Florian Pose # Date 1415260391 -3600 # Node ID e2388daebfbc00346bc0d95714eaf80276d270e6 # Parent c075dd6b7eef4a8960b3c8805563e6e0d338cda7 Cleaned up EoE frame type definitions. diff -r c075dd6b7eef -r e2388daebfbc master/ethernet.c --- a/master/ethernet.c Wed Nov 05 19:04:36 2014 +0100 +++ b/master/ethernet.c Thu Nov 06 08:53:11 2014 +0100 @@ -303,7 +303,7 @@ 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 | @@ -490,7 +490,7 @@ 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); diff -r c075dd6b7eef -r e2388daebfbc master/ethernet.h --- a/master/ethernet.h Wed Nov 05 19:04:36 2014 +0100 +++ b/master/ethernet.h Thu Nov 06 08:53:11 2014 +0100 @@ -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. */ }; /*****************************************************************************/