Changeset 360823ca in mainline

Timestamp:

2012-11-04T12:21:03Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ef93167

Parents:

e5e2d73

Message:

rootamdm37x: Use checks instead of ifdefs.

Prevents accidental compile breakage and DCE will get red of the code anyway if not used.

File:

• uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (5 diffs)

uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

@@ -37 +37 @@
 #define _DDF_DATA_IMPLANT
 
-#define DEBUG_CM
+#define DEBUG_CM 1
 
 #include <ddf/driver.h>
@@ -64 +64 @@
 } amdm37x_t;
 
-#ifdef DEBUG_CM
 static void log(volatile void *place, uint32_t val, volatile void* base, size_t size, void *data, bool write)
 {
@@ -70 +69 @@
             (place - base) + data, place, val);
 }
-#endif
 
 static int amdm37x_hw_access_init(amdm37x_t *device)
@@ -102 +100 @@
                 return ret;
 
-#ifdef DEBUG_CM
-        pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log, (void*)AMDM37x_USBTLL_BASE_ADDRESS);
-        pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log, (void*)CLOCK_CONTROL_CM_BASE_ADDRESS);
-        pio_trace_enable(device->cm.core, CORE_CM_SIZE, log, (void*)CORE_CM_BASE_ADDRESS);
-        pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log, (void*)USBHOST_CM_BASE_ADDRESS);
-        pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log, (void*)AMDM37x_UHH_BASE_ADDRESS);
-#endif
+        if (DEBUG_CM) {
+                pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log, (void*)AMDM37x_USBTLL_BASE_ADDRESS);
+                pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log, (void*)CLOCK_CONTROL_CM_BASE_ADDRESS);
+                pio_trace_enable(device->cm.core, CORE_CM_SIZE, log, (void*)CORE_CM_BASE_ADDRESS);
+                pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log, (void*)USBHOST_CM_BASE_ADDRESS);
+                pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log, (void*)AMDM37x_UHH_BASE_ADDRESS);
+        }
         return EOK;
 }
@@ -153 +151 @@
                 pio_set_32(&device->cm.usbhost->iclken,
                     USBHOST_CM_ICLKEN_EN_USBHOST, 5);
-#ifdef DEBUG_CM
-        printf("DPLL5 (and everything else) should be on: %"PRIx32" %"PRIx32".\n",
-            pio_read_32((ioport32_t*)&device->cm.clocks->idlest_ckgen),
-            pio_read_32((ioport32_t*)&device->cm.clocks->idlest2_ckgen));
-#endif
+
+                if (DEBUG_CM) {
+                        printf("DPLL5 (and everything else) should be on: %"
+                            PRIx32" %"PRIx32".\n",
+                            pio_read_32((ioport32_t*)&device->cm.clocks->idlest_ckgen),
+                            pio_read_32((ioport32_t*)&device->cm.clocks->idlest2_ckgen));
+                }
         } else {
                 /* Disable interface and function clock for USB hosts */