Merge branch 'mikulka' of git@rtime.felk.cvut.cz:arc into mikulka

[arc.git] / include / CalibrationData.h

diff --git a/include/CalibrationData.h b/include/CalibrationData.h
index b76f73216e4b002772a34deda91f19b82e2cfd7e..e4dfbde2251772006a25aaaa2bbb565b521a61b5 100644 (file)
--- a/include/CalibrationData.h
+++ b/include/CalibrationData.h
@@ -3,16 +3,13 @@
 \r
 #include "Calibration_Settings.h"\r
 \r
-#ifdef CALIBRATION_ACTIVE\r
+#ifdef CALIBRATION_ENABLED\r
 /* Section data from linker script. */\r
 extern char __CALIB_RAM_START;\r
 extern char __CALIB_RAM_END;\r
 extern char __CALIB_ROM_START;\r
+#endif /* CALIBRATION_ENABLED */\r
 #define ARC_DECLARE_CALIB(type, name) type __attribute__((section (".calibration"))) name\r
-#else\r
-#define ARC_DECLARE_CALIB(type, name) const type name\r
-#endif /* CALIBRATION_ACTIVE */\r
-\r
-\r
+#define ARC_DECLARE_CALIB_EXTERN(type, name) extern type name\r
 \r
 #endif /* CALIBRATIONDATA_H_ */\r