etherlabmaster: comparison master/device.c

equal deleted inserted replaced

-:d28360ee74c5
+:d9cf40facbc4
 else if (device == &master->backup_device)
 mb = 'b';
 sprintf(ifname, "ecdbg%c%u", mb, master->index);
-ret = ec_debug_init(&device->dbg, ifname);
+ret = ec_debug_init(&device->dbg, device, ifname);
 if (ret < 0) {
-EC_ERR("Failed to init debug device!\n");
+EC_MASTER_ERR(master, "Failed to init debug device!\n");
 goto out_return;
 }
 #endif
 for (i = 0; i < EC_TX_RING_SIZE; i++)
 device->tx_skb[i] = NULL;
 for (i = 0; i < EC_TX_RING_SIZE; i++) {
 if (!(device->tx_skb[i] = dev_alloc_skb(ETH_FRAME_LEN))) {
-EC_ERR("Error allocating device socket buffer!\n");
+EC_MASTER_ERR(master, "Error allocating device socket buffer!\n");
 ret = -ENOMEM;
 goto out_tx_ring;
 }
 // add Ethernet-II-header
 )
 {
 int ret;
 if (!device->dev) {
-EC_ERR("No net_device to open!\n");
+EC_MASTER_ERR(device->master, "No net_device to open!\n");
 return -ENODEV;
 }
 if (device->open) {
-EC_WARN("Device already opened!\n");
+EC_MASTER_WARN(device->master, "Device already opened!\n");
 return 0;
 }
 device->link_state = 0;
 )
 {
 int ret;
 if (!device->dev) {
-EC_ERR("No device to close!\n");
+EC_MASTER_ERR(device->master, "No device to close!\n");
 return -ENODEV;
 }
 if (!device->open) {
-EC_WARN("Device already closed!\n");
+EC_MASTER_WARN(device->master, "Device already closed!\n");
 return 0;
 }
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 ret = device->dev->netdev_ops->ndo_stop(device->dev);
 // set the right length for the data
 skb->len = ETH_HLEN + size;
 if (unlikely(device->master->debug_level > 1)) {
-EC_DBG("Sending frame:\n");
+EC_MASTER_DBG(device->master, 2, "Sending frame:\n");
 ec_print_data(skb->data, ETH_HLEN + size);
 }
 // start sending
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 // calculate index of the newest frame in the ring to get its time
 ring_index = (device->debug_frame_index + EC_DEBUG_RING_SIZE - 1)
 % EC_DEBUG_RING_SIZE;
 t0 = device->debug_frames[ring_index].t;
-EC_DBG("Debug ring %u:\n", ring_index);
+EC_MASTER_DBG(device->master, 1, "Debug ring %u:\n", ring_index);
 // calculate index of the oldest frame in the ring
 ring_index = (device->debug_frame_index + EC_DEBUG_RING_SIZE
 - device->debug_frame_count) % EC_DEBUG_RING_SIZE;
 for (i = 0; i < device->debug_frame_count; i++) {
 df = &device->debug_frames[ring_index];
 timersub(&t0, &df->t, &diff);
-EC_DBG("Frame %u, dt=%u.%06u s, %s:\n",
+EC_MASTER_DBG(device->master, 1, "Frame %u, dt=%u.%06u s, %s:\n",
 i + 1 - device->debug_frame_count,
 (unsigned int) diff.tv_sec,
 (unsigned int) diff.tv_usec,
 (df->dir == TX) ? "TX" : "RX");
 ec_print_data(df->data, df->data_size);
 {
 ec_master_t *master = device->master;
 char str[20];
 ec_mac_print(device->dev->dev_addr, str);
-EC_INFO("Master %u releasing main device %s.\n", master->index, str);
+EC_MASTER_INFO(master, "Releasing main device %s.\n", str);
 down(&master->device_sem);
 ec_device_detach(device);
 up(&master->device_sem);
 }
 {
 int ret;
 ret = ec_device_open(device);
 if (ret) {
-EC_ERR("Failed to open device!\n");
+EC_MASTER_ERR(device->master, "Failed to open device!\n");
 return ret;
 }
 ret = ec_master_enter_idle_phase(device->master);
 if (ret) {
-EC_ERR("Failed to enter IDLE phase!\n");
+EC_MASTER_ERR(device->master, "Failed to enter IDLE phase!\n");
 return ret;
 }
 return 0;
 }
 void ecdev_close(ec_device_t *device /**< EtherCAT device */)
 {
 ec_master_leave_idle_phase(device->master);
 if (ec_device_close(device))
-EC_WARN("Failed to close device!\n");
+EC_MASTER_WARN(device->master, "Failed to close device!\n");
 }
 /*****************************************************************************/
 /** Accepts a received frame.
 {
 const void *ec_data = data + ETH_HLEN;
 size_t ec_size = size - ETH_HLEN;
 if (unlikely(!data)) {
-EC_WARN("%s() called with NULL data.\n", __func__);
+EC_MASTER_WARN(device->master, "%s() called with NULL data.\n",
+__func__);
 return;
 }
 device->rx_count++;
 if (unlikely(device->master->debug_level > 1)) {
-EC_DBG("Received frame:\n");
+EC_MASTER_DBG(device->master, 2, "Received frame:\n");
 ec_print_data(data, size);
 }
 #ifdef EC_DEBUG_IF
 ec_debug_send(&device->dbg, data, size);
 ec_device_t *device, /**< EtherCAT device */
 uint8_t state /**< new link state */
 )
 {
 if (unlikely(!device)) {
-EC_WARN("ecdev_set_link(): No device!\n");
+EC_MASTER_WARN(device->master, "ecdev_set_link(): No device!\n");
 return;
 }
 if (likely(state != device->link_state)) {
 device->link_state = state;
-EC_INFO("Link state changed to %s.\n", (state ? "UP" : "DOWN"));
+EC_MASTER_INFO(device->master,
+"Link state changed to %s.\n", (state ? "UP" : "DOWN"));
 }
 }
 /*****************************************************************************/
 uint8_t ecdev_get_link(
 const ec_device_t *device /**< EtherCAT device */
 )
 {
 if (unlikely(!device)) {
-EC_WARN("ecdev_get_link(): No device!\n");
+EC_MASTER_WARN(device->master, "ecdev_get_link(): No device!\n");
 return 0;
 }
 return device->link_state;
 }

changeset 1921	d9cf40facbc4
parent 1907	dd276ae226b4
child 1956	f461dc0d145a