etherlabmaster: comparison master/ethernet.c

equal deleted inserted replaced

-:440ae5f6d2c3
+:c1d0b63a9302
 /*****************************************************************************/
 /**
 EoE constructor.
-Initializes the EoE object, creates a net_device and registeres it.
+Initializes the EoE handler, creates a net_device and registeres it.
 */
-int ec_eoe_init(ec_eoe_t *eoe, /**< EoE object */
+int ec_eoe_init(ec_eoe_t *eoe /**< EoE handler */)
-ec_slave_t *slave /**< assigned slave */
-)
 {
 ec_eoe_t **priv;
 int result, i;
-eoe->slave = slave;
+eoe->slave = NULL;
 eoe->state = ec_eoe_state_rx_start;
 eoe->opened = 0;
 eoe->rx_skb = NULL;
 eoe->rx_expected_fragment = 0;
 INIT_LIST_HEAD(&eoe->tx_queue);
 eoe->tx_frame_number = 0xFF;
 memset(&eoe->stats, 0, sizeof(struct net_device_stats));
 if (!(eoe->dev =
 alloc_netdev(sizeof(ec_eoe_t *), "eoe%d", ether_setup))) {
-EC_ERR("Unable to allocate net_device for EoE object!\n");
+EC_ERR("Unable to allocate net_device for EoE handler!\n");
 goto out_return;
 }
 // initialize net_device
 eoe->dev->open = ec_eoedev_open;
 /**
 EoE destructor.
 Unregisteres the net_device and frees allocated memory.
 */
-void ec_eoe_clear(ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_clear(ec_eoe_t *eoe /**< EoE handler */)
 {
 if (eoe->dev) {
 unregister_netdev(eoe->dev);
 free_netdev(eoe->dev);
 }
 /**
 Empties the transmit queue.
 */
-void ec_eoe_flush(ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_flush(ec_eoe_t *eoe /**< EoE handler */)
 {
 ec_eoe_frame_t *frame, *next;
 spin_lock_bh(&eoe->tx_queue_lock);
 /**
 Sends a frame or the next fragment.
 */
-int ec_eoe_send(ec_eoe_t *eoe /**< EoE object */)
+int ec_eoe_send(ec_eoe_t *eoe /**< EoE handler */)
 {
 size_t remaining_size, current_size, complete_offset;
 unsigned int last_fragment;
 uint8_t *data;
 #if EOE_DEBUG_LEVEL > 1
 /**
 Runs the EoE state machine.
 */
-void ec_eoe_run(ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_run(ec_eoe_t *eoe /**< EoE handler */)
 {
 if (!eoe->opened) return;
 // call state function
 eoe->state(eoe);
 /**
 Returns the state of the device.
 \return 1 if the device is "up", 0 if it is "down"
 */
-unsigned int ec_eoe_active(const ec_eoe_t *eoe /**< EoE object */)
+unsigned int ec_eoe_active(const ec_eoe_t *eoe /**< EoE handler */)
 {
-return eoe->opened;
+return eoe->slave && eoe->opened;
 }
 /*****************************************************************************/
 /**
-Prints EoE object information.
+Prints EoE handler information.
 */
-void ec_eoe_print(const ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_print(const ec_eoe_t *eoe /**< EoE handler */)
 {
-EC_INFO("  EoE slave %i\n", eoe->slave->ring_position);
+EC_INFO("  EoE handler %s\n", eoe->dev->name);
-EC_INFO("    Assigned device: %s (%s)\n", eoe->dev->name,
+EC_INFO("    State: %s\n", eoe->opened ? "opened" : "closed");
-eoe->opened ? "opened" : "closed");
+if (eoe->slave)
+EC_INFO("    Coupled to slave %i.\n", eoe->slave->ring_position);
+else
+EC_INFO("    Not coupled.\n");
 }
 /******************************************************************************
 *  STATE PROCESSING FUNCTIONS
 *****************************************************************************/
 State: RX_START.
 Starts a new receiving sequence by queuing a command that checks the
 slave's mailbox for a new command.
 */
-void ec_eoe_state_rx_start(ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_state_rx_start(ec_eoe_t *eoe /**< EoE handler */)
 {
 ec_slave_mbox_prepare_check(eoe->slave);
 ec_master_queue_command(eoe->slave->master, &eoe->slave->mbox_command);
 eoe->state = ec_eoe_state_rx_check;
 }
 State: RX_CHECK.
 Processes the checking command sent in RX_START and issues a receive
 command, if new data is available.
 */
-void ec_eoe_state_rx_check(ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_state_rx_check(ec_eoe_t *eoe /**< EoE handler */)
 {
 if (eoe->slave->mbox_command.state != EC_CMD_RECEIVED) {
 eoe->stats.rx_errors++;
 eoe->state = ec_eoe_state_tx_start;
 return;
 State: RX_FETCH.
 Checks if the requested data of RX_CHECK was received and processes the
 EoE command.
 */
-void ec_eoe_state_rx_fetch(ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_state_rx_fetch(ec_eoe_t *eoe /**< EoE handler */)
 {
 size_t rec_size, data_size;
 uint8_t *data, frame_type, last_fragment, time_appended;
 uint8_t frame_number, fragment_offset, fragment_number;
 off_t offset;
 State: TX START.
 Starts a new transmit sequence. If no data is available, a new receive
 sequence is started instead.
 */
-void ec_eoe_state_tx_start(ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_state_tx_start(ec_eoe_t *eoe /**< EoE handler */)
 {
 #if EOE_DEBUG_LEVEL > 0
 unsigned int wakeup;
 #endif
 State: TX SENT.
 Checks is the previous transmit command succeded and sends the next
 fragment, if necessary.
 */
-void ec_eoe_state_tx_sent(ec_eoe_t *eoe /**< EoE object */)
+void ec_eoe_state_tx_sent(ec_eoe_t *eoe /**< EoE handler */)
 {
 if (eoe->slave->mbox_command.state != EC_CMD_RECEIVED) {
 eoe->stats.tx_errors++;
 eoe->state = ec_eoe_state_rx_start;
 return;
 ec_eoe_t *eoe = *((ec_eoe_t **) netdev_priv(dev));
 ec_eoe_flush(eoe);
 eoe->opened = 1;
 netif_start_queue(dev);
 eoe->tx_queue_active = 1;
-EC_INFO("%s (slave %i) opened.\n", dev->name, eoe->slave->ring_position);
+EC_INFO("%s opened.\n", dev->name);
+if (!eoe->slave)
+EC_WARN("device %s is not coupled to any EoE slave!\n", dev->name);
+else {
+eoe->slave->requested_state = EC_SLAVE_STATE_OP;
+}
 return 0;
 }
 /*****************************************************************************/
 ec_eoe_t *eoe = *((ec_eoe_t **) netdev_priv(dev));
 netif_stop_queue(dev);
 eoe->tx_queue_active = 0;
 eoe->opened = 0;
 ec_eoe_flush(eoe);
-EC_INFO("%s (slave %i) stopped.\n", dev->name, eoe->slave->ring_position);
+EC_INFO("%s stopped.\n", dev->name);
+if (!eoe->slave)
+EC_WARN("device %s is not coupled to any EoE slave!\n", dev->name);
+else {
+eoe->slave->requested_state = EC_SLAVE_STATE_INIT;
+}
 return 0;
 }
 /*****************************************************************************/

changeset 251	c1d0b63a9302
parent 246	0bf7c769de06
child 261	44a3a5833c49