--- a/master/domain.c	Mon May 03 10:13:25 2010 +0200
+++ b/master/domain.c	Mon May 03 18:07:57 2010 +0200
@@ -115,9 +115,9 @@
     domain->data_size += fmmu->data_size;
     list_add_tail(&fmmu->list, &domain->fmmu_configs);
 
-    if (domain->master->debug_level)
-        EC_DBG("Domain %u: Added %u bytes, total %zu.\n", domain->index,
-                fmmu->data_size, domain->data_size);
+    EC_MASTER_DBG(domain->master, 1, "Domain %u:"
+            " Added %u bytes, total %zu.\n",
+            domain->index, fmmu->data_size, domain->data_size);
 }
 
 /*****************************************************************************/
@@ -142,7 +142,8 @@
     int ret;
 
     if (!(datagram = kmalloc(sizeof(ec_datagram_t), GFP_KERNEL))) {
-        EC_ERR("Failed to allocate domain datagram!\n");
+        EC_MASTER_ERR(domain->master,
+                "Failed to allocate domain datagram!\n");
         return -ENOMEM;
     }
 
@@ -212,8 +213,9 @@
     if (domain->data_size && domain->data_origin == EC_ORIG_INTERNAL) {
         if (!(domain->data =
                     (uint8_t *) kmalloc(domain->data_size, GFP_KERNEL))) {
-            EC_ERR("Failed to allocate %zu bytes internal memory for"
-                    " domain %u!\n", domain->data_size, domain->index);
+            EC_MASTER_ERR(domain->master, "Failed to allocate %zu bytes"
+                    " internal memory for domain %u!\n",
+                    domain->data_size, domain->index);
             return -ENOMEM;
         }
     }
@@ -280,14 +282,15 @@
         datagram_count++;
     }
 
-    EC_INFO("Domain%u: Logical address 0x%08x, %zu byte, "
-            "expected working counter %u.\n", domain->index,
+    EC_MASTER_INFO(domain->master, "Domain%u: Logical address 0x%08x,"
+            " %zu byte, expected working counter %u.\n", domain->index,
             domain->logical_base_address, domain->data_size,
             domain->expected_working_counter);
     list_for_each_entry(datagram, &domain->datagrams, list) {
-        EC_INFO("  Datagram %s: Logical offset 0x%08x, %zu byte, type %s.\n",
-                datagram->name, EC_READ_U32(datagram->address),
-                datagram->data_size, ec_datagram_type_string(datagram));
+        EC_MASTER_INFO(domain->master, "  Datagram %s: Logical offset 0x%08x,"
+                " %zu byte, type %s.\n", datagram->name,
+                EC_READ_U32(datagram->address), datagram->data_size,
+                ec_datagram_type_string(datagram));
     }
     
     return 0;
@@ -340,9 +343,8 @@
     ec_slave_config_t *sc;
     int ret;
     
-    if (domain->master->debug_level)
-        EC_DBG("ecrt_domain_reg_pdo_entry_list(domain = 0x%p, regs = 0x%p)\n",
-                domain, regs);
+    EC_MASTER_DBG(domain->master, 1, "ecrt_domain_reg_pdo_entry_list("
+            "domain = 0x%p, regs = 0x%p)\n", domain, regs);
 
     for (reg = regs; reg->index; reg++) {
         sc = ecrt_master_slave_config_err(domain->master, reg->alias,
@@ -372,9 +374,8 @@
 
 void ecrt_domain_external_memory(ec_domain_t *domain, uint8_t *mem)
 {
-    if (domain->master->debug_level)
-        EC_DBG("ecrt_domain_external_memory(domain = 0x%p, mem = 0x%p)\n",
-                domain, mem);
+    EC_MASTER_DBG(domain->master, 1, "ecrt_domain_external_memory("
+            "domain = 0x%p, mem = 0x%p)\n", domain, mem);
 
     down(&domain->master->master_sem);
 
@@ -417,13 +418,14 @@
         jiffies - domain->notify_jiffies > HZ) {
         domain->notify_jiffies = jiffies;
         if (domain->working_counter_changes == 1) {
-            EC_INFO("Domain %u: Working counter changed to %u/%u.\n",
-                    domain->index, domain->working_counter,
+            EC_MASTER_INFO(domain->master, "Domain %u: Working counter"
+                    " changed to %u/%u.\n", domain->index,
+                    domain->working_counter, domain->expected_working_counter);
+        } else {
+            EC_MASTER_INFO(domain->master, "Domain %u: %u working counter"
+                    " changes - now %u/%u.\n", domain->index,
+                    domain->working_counter_changes, domain->working_counter,
                     domain->expected_working_counter);
-        } else {
-            EC_INFO("Domain %u: %u working counter changes - now %u/%u.\n",
-                    domain->index, domain->working_counter_changes,
-                    domain->working_counter, domain->expected_working_counter);
         }
         domain->working_counter_changes = 0;
     }