--- a/master/ethernet.h Wed May 03 08:01:20 2006 +0000
+++ b/master/ethernet.h Fri May 05 07:20:10 2006 +0000
@@ -44,9 +44,13 @@
typedef enum
{
- EC_EOE_IDLE, /**< Idle. The next step ist to check for data. */
- EC_EOE_CHECKING, /**< Checking frame was sent. */
- EC_EOE_FETCHING /**< There is new data. Fetching frame was sent. */
+ EC_EOE_RX_START, /**< start receiving and check for data. */
+ EC_EOE_RX_CHECK, /**< checking frame was sent. */
+ EC_EOE_RX_FETCH, /**< there is new data; fetching frame was sent. */
+ EC_EOE_TX_START, /**< start sending a queued frame. */
+ EC_EOE_TX_SENT, /**< queued frame was sent; start checking. */
+ EC_EOE_TX_CHECK, /**< check mailbox for acknowledgement. */
+ EC_EOE_TX_FETCH, /**< receive mailbox response */
}
ec_eoe_state_t;
@@ -62,14 +66,20 @@
{
struct list_head list; /**< list item */
ec_slave_t *slave; /**< pointer to the corresponding slave */
- ec_eoe_state_t rx_state; /**< state of the state machine */
+ ec_eoe_state_t state; /**< state of the state machine */
struct net_device *dev; /**< net_device for virtual ethernet device */
uint8_t opened; /**< net_device is opened */
struct sk_buff *skb; /**< current rx socket buffer */
+ off_t skb_offset; /**< current write pointer in the socket buffer */
+ size_t skb_size; /**< size of the allocated socket buffer memory */
+ uint8_t expected_fragment; /**< expected fragment */
struct net_device_stats stats; /**< device statistics */
struct list_head tx_queue; /**< queue for frames to send */
+ unsigned int tx_queue_active; /**< kernel netif queue started */
unsigned int queued_frames; /**< number of frames in the queue */
spinlock_t tx_queue_lock; /**< spinlock for the send queue */
+ uint8_t tx_frame_number; /**< Number of the transmitted frame */
+ size_t last_tx_bytes; /**< number of bytes currently transmitted */
}
ec_eoe_t;