etherlabmaster: comparison master/ethernet.c

equal deleted inserted replaced

-:ea38efeeb7b3
+:6aa393418fb3
 }
 snprintf(eoe->datagram.name, EC_DATAGRAM_NAME_SIZE, name);
 if (!(eoe->dev = alloc_netdev(sizeof(ec_eoe_t *), name, ether_setup))) {
-EC_ERR("Unable to allocate net_device %s for EoE handler!\n", name);
+EC_SLAVE_ERR(slave, "Unable to allocate net_device %s"
+" for EoE handler!\n", name);
 ret = -ENODEV;
 goto out_return;
 }
 // initialize net_device
 #endif
 // connect the net_device to the kernel
 ret = register_netdev(eoe->dev);
 if (ret) {
-EC_ERR("Unable to register net_device: error %i\n", ret);
+EC_SLAVE_ERR(slave, "Unable to register net_device:"
+" error %i\n", ret);
 goto out_free;
 }
 // make the last address octet unique
 eoe->dev->dev_addr[ETH_ALEN - 1] = (uint8_t) eoe->dev->ifindex;
 // complete size in 32 bit blocks, rounded up.
 complete_offset = remaining_size / 32 + 1;
 }
 #if EOE_DEBUG_LEVEL >= 2
-EC_DBG("EoE %s TX sending fragment %u%s with %u octets (%u)."
+EC_SLAVE_DBG(slave, 0, "EoE %s TX sending fragment %u%s"
-" %u frames queued.\n", eoe->dev->name, eoe->tx_fragment_number,
+" with %u octets (%u). %u frames queued.\n",
-last_fragment ? "" : "+", current_size, complete_offset,
+eoe->dev->name, eoe->tx_fragment_number,
-eoe->tx_queued_frames);
+last_fragment ? "" : "+", current_size, complete_offset,
+eoe->tx_queued_frames);
 #endif
 #if EOE_DEBUG_LEVEL >= 3
-EC_DBG("");
+EC_SLAVE_DBG(master, 0, "");
 for (i = 0; i < current_size; i++) {
 printk("%02X ", eoe->tx_frame->skb->data[eoe->tx_offset + i]);
 if ((i + 1) % 16 == 0) {
 printk("\n");
-EC_DBG("");
+EC_SLAVE_DBG(master, 0, "");
 }
 }
 printk("\n");
 #endif
 void ec_eoe_state_rx_check(ec_eoe_t *eoe /**< EoE handler */)
 {
 if (eoe->datagram.state != EC_DATAGRAM_RECEIVED) {
 eoe->stats.rx_errors++;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("Failed to receive mbox check datagram for %s.\n",
+EC_SLAVE_WARN(eoe->slave, "Failed to receive mbox"
-eoe->dev->name);
+" check datagram for %s.\n", eoe->dev->name);
 #endif
 eoe->state = ec_eoe_state_tx_start;
 return;
 }
 #endif
 if (eoe->datagram.state != EC_DATAGRAM_RECEIVED) {
 eoe->stats.rx_errors++;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("Failed to receive mbox fetch datagram for %s.\n",
+EC_SLAVE_WARN(eoe->slave, "Failed to receive mbox"
-eoe->dev->name);
+" fetch datagram for %s.\n", eoe->dev->name);
 #endif
 eoe->state = ec_eoe_state_tx_start;
 return;
 }
 data = ec_slave_mbox_fetch(eoe->slave, &eoe->datagram,
 &mbox_prot, &rec_size);
 if (IS_ERR(data)) {
 eoe->stats.rx_errors++;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("Invalid mailbox response for %s.\n",
+EC_SLAVE_WARN(eoe->slave, "Invalid mailbox response for %s.\n",
 eoe->dev->name);
 #endif
 eoe->state = ec_eoe_state_tx_start;
 return;
 }
 if (mbox_prot != 0x02) { // EoE FIXME mailbox handler necessary
 eoe->stats.rx_errors++;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("Other mailbox protocol response for %s.\n",
+EC_SLAVE_WARN(eoe->slave, "Other mailbox protocol response for %s.\n",
 eoe->dev->name);
 #endif
 eoe->state = ec_eoe_state_tx_start;
 return;
 }
 frame_type = EC_READ_U16(data) & 0x000F;
 if (frame_type != 0x00) {
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("%s: Other frame received. Dropping.\n", eoe->dev->name);
+EC_SLAVE_WARN(eoe->slave, "%s: Other frame received."
+" Dropping.\n", eoe->dev->name);
 #endif
 eoe->stats.rx_dropped++;
 eoe->state = ec_eoe_state_tx_start;
 return;
 }
 fragment_number = EC_READ_U16(data + 2) & 0x003F;
 fragment_offset = (EC_READ_U16(data + 2) >> 6) & 0x003F;
 frame_number = (EC_READ_U16(data + 2) >> 12) & 0x000F;
 #if EOE_DEBUG_LEVEL >= 2
-EC_DBG("EoE %s RX fragment %u%s, offset %u, frame %u%s,"
+EC_SLAVE_DBG(eoe->slave, 0, "EoE %s RX fragment %u%s, offset %u,"
-" %u octets\n", eoe->dev->name, fragment_number,
+" frame %u%s, %u octets\n", eoe->dev->name, fragment_number,
 last_fragment ? "" : "+", fragment_offset, frame_number,
 time_appended ? ", + timestamp" : "",
 time_appended ? rec_size - 8 : rec_size - 4);
 #endif
 #if EOE_DEBUG_LEVEL >= 3
-EC_DBG("");
+EC_SLAVE_DBG(eoe->slave, 0, "");
 for (i = 0; i < rec_size - 4; i++) {
 printk("%02X ", data[i + 4]);
 if ((i + 1) % 16 == 0) {
 printk("\n");
-EC_DBG("");
+EC_SLAVE_DBG(eoe->slave, 0, "");
 }
 }
 printk("\n");
 #endif
 data_size = time_appended ? rec_size - 8 : rec_size - 4;
 if (!fragment_number) {
 if (eoe->rx_skb) {
-EC_WARN("EoE RX freeing old socket buffer...\n");
+EC_SLAVE_WARN(eoe->slave, "EoE RX freeing old socket buffer.\n");
 dev_kfree_skb(eoe->rx_skb);
 }
 // new socket buffer
 if (!(eoe->rx_skb = dev_alloc_skb(fragment_offset * 32))) {
 if (printk_ratelimit())
-EC_WARN("EoE RX low on mem. frame dropped.\n");
+EC_SLAVE_WARN(eoe->slave, "EoE RX low on mem,"
+" frame dropped.\n");
 eoe->stats.rx_dropped++;
 eoe->state = ec_eoe_state_tx_start;
 return;
 }
 fragment_number != eoe->rx_expected_fragment) {
 dev_kfree_skb(eoe->rx_skb);
 eoe->rx_skb = NULL;
 eoe->stats.rx_errors++;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("Fragmenting error at %s.\n", eoe->dev->name);
+EC_SLAVE_WARN(eoe->slave, "Fragmenting error at %s.\n",
+eoe->dev->name);
 #endif
 eoe->state = ec_eoe_state_tx_start;
 return;
 }
 }
 eoe->stats.rx_packets++;
 eoe->stats.rx_bytes += eoe->rx_skb->len;
 eoe->rx_counter += eoe->rx_skb->len;
 #if EOE_DEBUG_LEVEL >= 2
-EC_DBG("EoE %s RX frame completed with %u octets.\n",
+EC_SLAVE_DBG(eoe->slave, 0, "EoE %s RX frame completed"
-eoe->dev->name, eoe->rx_skb->len);
+" with %u octets.\n", eoe->dev->name, eoe->rx_skb->len);
 #endif
 // pass socket buffer to network stack
 eoe->rx_skb->dev = eoe->dev;
 eoe->rx_skb->protocol = eth_type_trans(eoe->rx_skb, eoe->dev);
 eoe->rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
 if (netif_rx(eoe->rx_skb)) {
-EC_WARN("EoE RX netif_rx failed.\n");
+EC_SLAVE_WARN(eoe->slave, "EoE RX netif_rx failed.\n");
 }
 eoe->rx_skb = NULL;
 eoe->state = ec_eoe_state_tx_start;
 }
 else {
 eoe->rx_expected_fragment++;
 #if EOE_DEBUG_LEVEL >= 2
-EC_DBG("EoE %s RX expecting fragment %u\n",
+EC_SLAVE_DBG(eoe->slave, 0, "EoE %s RX expecting fragment %u\n",
 eoe->dev->name, eoe->rx_expected_fragment);
 #endif
 eoe->state = ec_eoe_state_rx_start;
 }
 }
 kfree(eoe->tx_frame);
 eoe->tx_frame = NULL;
 eoe->stats.tx_errors++;
 eoe->state = ec_eoe_state_rx_start;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("Send error at %s.\n", eoe->dev->name);
+EC_SLAVE_WARN(eoe->slave, "Send error at %s.\n", eoe->dev->name);
 #endif
 return;
 }
 #if EOE_DEBUG_LEVEL >= 2
 if (wakeup)
-EC_DBG("EoE %s waking up TX queue...\n", eoe->dev->name);
+EC_SLAVE_DBG(eoe->slave, 0, "EoE %s waking up TX queue...\n",
+eoe->dev->name);
 #endif
 eoe->tries = EC_EOE_TRIES;
 eoe->state = ec_eoe_state_tx_sent;
 }
 eoe->tries--; // try again
 eoe->queue_datagram = 1;
 } else {
 eoe->stats.tx_errors++;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("Failed to receive send datagram for %s after %u tries.\n",
+EC_SLAVE_WARN(eoe->slave, "Failed to receive send"
+" datagram for %s after %u tries.\n",
 eoe->dev->name, EC_EOE_TRIES);
 #endif
 eoe->state = ec_eoe_state_rx_start;
 }
 return;
 eoe->tries--; // try again
 eoe->queue_datagram = 1;
 } else {
 eoe->stats.tx_errors++;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("No sending response for %s after %u tries.\n",
+EC_SLAVE_WARN(eoe->slave, "No sending response"
+" for %s after %u tries.\n",
 eoe->dev->name, EC_EOE_TRIES);
 #endif
 eoe->state = ec_eoe_state_rx_start;
 }
 return;
 dev_kfree_skb(eoe->tx_frame->skb);
 kfree(eoe->tx_frame);
 eoe->tx_frame = NULL;
 eoe->stats.tx_errors++;
 #if EOE_DEBUG_LEVEL >= 1
-EC_WARN("Send error at %s.\n", eoe->dev->name);
+EC_SLAVE_WARN(eoe->slave, "Send error at %s.\n", eoe->dev->name);
 #endif
 eoe->state = ec_eoe_state_rx_start;
 }
 }
 }
 eoe->rx_idle = 0;
 eoe->tx_idle = 0;
 netif_start_queue(dev);
 eoe->tx_queue_active = 1;
 #if EOE_DEBUG_LEVEL >= 2
-EC_DBG("%s opened.\n", dev->name);
+EC_SLAVE_DBG(eoe->slave, 0, "%s opened.\n", dev->name);
 #endif
 ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_OP);
 return 0;
 }
 eoe->tx_idle = 1;
 eoe->tx_queue_active = 0;
 eoe->opened = 0;
 ec_eoe_flush(eoe);
 #if EOE_DEBUG_LEVEL >= 2
-EC_DBG("%s stopped.\n", dev->name);
+EC_SLAVE_DBG(eoe->slave, 0, "%s stopped.\n", dev->name);
 #endif
 ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_PREOP);
 return 0;
 }
 ec_eoe_t *eoe = *((ec_eoe_t **) netdev_priv(dev));
 ec_eoe_frame_t *frame;
 #if 0
 if (skb->len > eoe->slave->configured_tx_mailbox_size - 10) {
-EC_WARN("EoE TX frame (%u octets) exceeds MTU. dropping.\n", skb->len);
+EC_SLAVE_WARN(eoe->slave, "EoE TX frame (%u octets)"
+" exceeds MTU. dropping.\n", skb->len);
 dev_kfree_skb(skb);
 eoe->stats.tx_dropped++;
 return 0;
 }
 #endif
 if (!(frame =
 (ec_eoe_frame_t *) kmalloc(sizeof(ec_eoe_frame_t), GFP_ATOMIC))) {
 if (printk_ratelimit())
-EC_WARN("EoE TX: low on mem. frame dropped.\n");
+EC_SLAVE_WARN(eoe->slave, "EoE TX: low on mem. frame dropped.\n");
 return 1;
 }
 frame->skb = skb;
 eoe->tx_queue_active = 0;
 }
 up(&eoe->tx_queue_sem);
 #if EOE_DEBUG_LEVEL >= 2
-EC_DBG("EoE %s TX queued frame with %u octets (%u frames queued).\n",
+EC_SLAVE_DBG(eoe->slave, 0, "EoE %s TX queued frame"
-eoe->dev->name, skb->len, eoe->tx_queued_frames);
+" with %u octets (%u frames queued).\n",
+eoe->dev->name, skb->len, eoe->tx_queued_frames);
 if (!eoe->tx_queue_active)
-EC_WARN("EoE TX queue is now full.\n");
+EC_SLAVE_WARN(eoe->slave, "EoE TX queue is now full.\n");
 #endif
 return 0;
 }

changeset 1989	6aa393418fb3
parent 1921	d9cf40facbc4
child 2020	47db5df5c7b3
child 2235	cd49c2c31dcb
child 2267	2d36f36a433c