Merge branch 'patch-5' of https://github.com/janjongboom/mbed-os into rollup

0xc0170 · 0xc0170 · commit 760ded6d764b · 2019-03-14T11:36:41.000Z
diff --git a/targets/TARGET_Atmel/TARGET_SAM_CortexM0P/TARGET_SAML21J18A/analogout_api.c b/targets/TARGET_Atmel/TARGET_SAM_CortexM0P/TARGET_SAML21J18A/analogout_api.c
@@ -21,6 +21,8 @@
 #include "PeripheralPins.h"
 #include "dac.h"
 
+#if DEVICE_ANALOGOUT
+
 extern uint8_t g_sys_init;
 
 #define MAX_VAL_12BIT 0x0FFF  /*12 Bit DAC for SAML21*/
@@ -119,4 +121,5 @@ const PinMap *analogout_pinmap()
 {
     return PinMap_DAC;
 }
-#endif
+
+#endif // DEVICE_ANALOGOUT

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`#include "PeripheralPins.h"`
`22`	`22`	`#include "dac.h"`
`23`	`23`
	`24`	`+#if DEVICE_ANALOGOUT`
	`25`	`+`
`24`	`26`	`extern uint8_t g_sys_init;`
`25`	`27`
`26`	`28`	`#define MAX_VAL_12BIT 0x0FFF /12 Bit DAC for SAML21/`
`@@ -119,4 +121,5 @@ const PinMap *analogout_pinmap()`
`119`	`121`	`{`
`120`	`122`	`return PinMap_DAC;`
`121`	`123`	`}`
`122`		`-#endif`
	`124`	`+`
	`125`	`+#endif // DEVICE_ANALOGOUT`