aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/main.cpp
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2014-07-01 18:29:07 +0200
committerCristian Maglie <c.maglie@bug.st>2014-07-01 18:29:07 +0200
commit08f101023053f7bceb226b17942432ad0acd14b1 (patch)
tree55c3d7d67f88e6dbaab22e811a757abe0922f8ab /cores/arduino/main.cpp
parent84bf36a96e6c8d1567ab6e091b9a4b500b5152e9 (diff)
parent4fdf87c0e8a801093d5f0513e4aab122e20bfc2e (diff)
Merge branch 'ide-1.5.x-timer-variant' of github.com:matthijskooijman/Arduino into matthijskooijman-ide-1.5.x-timer-variant
Diffstat (limited to 'cores/arduino/main.cpp')
-rw-r--r--cores/arduino/main.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
index 0ad6962..091c365 100644
--- a/cores/arduino/main.cpp
+++ b/cores/arduino/main.cpp
@@ -19,10 +19,17 @@
#include <Arduino.h>
+// Weak empty variant initialization function.
+// May be redefined by variant files.
+void initVariant() __attribute__((weak));
+void initVariant() { }
+
int main(void)
{
init();
+ initVariant();
+
#if defined(USBCON)
USBDevice.attach();
#endif