Maxim Integrated / OneWire

Dependents:   MAXREFDES131_Qt_Demo MAX32630FTHR_iButton_uSD_Logger MAX32630FTHR_DS18B20_uSD_Logger MAXREFDES130_131_Demo ... more

Revision:
53:071ae5d090d1
Parent:
52:4cba20c21941
Child:
57:1635f247ceae
--- a/OneWire_Masters/GPIO/owlink.s	Tue Apr 12 09:08:17 2016 -0500
+++ b/OneWire_Masters/GPIO/owlink.s	Tue Apr 12 10:51:20 2016 -0500
@@ -38,6 +38,31 @@
 #define THUMB_FUNC
 #endif
 
+// MACRO_ARM_BEGIN macro
+#ifdef TOOLCHAIN_ARM_STD
+#define MACRO_ARM_BEGIN MACRO
+#else // TOOLCHAIN_IAR or TOOLCHAIN_GCC_ARM
+#define MACRO_ARM_BEGIN
+#endif
+
+// MACRO_BEGIN macro
+#if defined TOOLCHAIN_IAR
+#define MACRO_BEGIN(name) name MACRO
+#elif defined TOOLCHAIN_ARM_STD
+#define MACRO_BEGIN(name) $label name
+#else // TOOLCHAIN_GCC_ARM
+#define MACRO_BEGIN(name) .macro name
+#endif
+
+// ENDM macro
+#if defined TOOLCHAIN_IAR
+// Use ENDM since IAR processes macros before #define directives.
+#elif defined TOOLCHAIN_ARM_STD
+#define ENDM MEND
+#else // TOOLCHAIN_GCC_ARM
+#define ENDM .endm
+#endif
+
 // Define a code section
 #if defined TOOLCHAIN_IAR 
   SECTION owlink : CODE
@@ -86,7 +111,7 @@
   and R0, R0, R1
   bx R14
   
-// void ow_bit(uint8_t * sendrecvbit, const unsigned int * inPortReg, unsigned int * outPortReg, unsigned int pinMask, const OwTiming * timing)
+// void ow_bit(uint8_t * sendrecvbit, volatile uint32_t * inPortReg, volatile uint32_t * outPortReg, unsigned int pinMask, const OwTiming * timing)
   THUMB_FUNC
   EXPORT_LABEL(ow_bit)
 LABEL(ow_bit)