export WEAK macro

Author: facchinm

libraries/HID/HID.cpp

@@ -51,8 +51,6 @@ HIDDescriptor _hidInterface;
 u8 _hid_protocol = 1;
 u8 _hid_idle = 1;
 
-#define WEAK __attribute__ ((weak))
-
 int8_t WEAK HID_GetInterface(u8* interfaceNum)
 {
 	interfaceNum[0] += 1;	// uses 1

libraries/HID/HID.h

@@ -76,6 +76,8 @@ extern const u8 _hidReportDescriptor[] PROGMEM;
 // MUST be declared by the module
 size_t getsizeof_hidReportDescriptor();
 
+#define WEAK __attribute__ ((weak))
+
 #endif
 
 #endif

libraries/MouseAndKeyboard/MouseAndKeyboard.cpp

@@ -1,6 +1,7 @@
 #if 1 //defined(USBCON)
 
 #include "MouseAndKeyboard.h"
+#include "HID.h"
 
 const u8 _hidReportDescriptor[] PROGMEM = {
 
@@ -87,7 +88,7 @@ const u8 _hidReportDescriptor[] PROGMEM = {
 };
 
 size_t getsizeof_hidReportDescriptor() {
-	return sizeof(_hidReportDescriptor);
+    return sizeof(_hidReportDescriptor);
 }
 
 void WEAK setupUSB() {
@@ -316,10 +317,6 @@ const uint8_t _asciimap[128] =
     0               // DEL
 };
 
-size_t getsizeof_hidReportDescriptor() {
-    return sizeof(_hidReportDescriptor);
-}
-
 uint8_t USBPutChar(uint8_t c);
 
 // press() adds the specified key (printing, non-printing, or modifier)

libraries/MouseAndKeyboard/MouseAndKeyboard.h

@@ -94,4 +94,5 @@ class Keyboard_ : public Print
 };
 extern Keyboard_ Keyboard;
 
+#endif
 #endif