Merge pull request #65 from mcci-catena/issue64

Make USBD_LL_ConnectionState() as weak function
mcci-catena · Jan 18, 2019 · 7d12b8a · 7d12b8a
2 parents 50d827f + 8e5ac06
commit 7d12b8a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/cores/arduino/stm32/usb_serial.h b/cores/arduino/stm32/usb_serial.h
@@ -56,10 +56,6 @@ class USBSerial : public Stream
 	int availableForWrite(void);
 	virtual size_t write(uint8_t);
 	virtual size_t write(const uint8_t *buffer, size_t size);
-	inline size_t write(unsigned long n) { return write((uint8_t)n); }
-	inline size_t write(long n) { return write((uint8_t)n); }
-	inline size_t write(unsigned int n) { return write((uint8_t)n); }
-	inline size_t write(int n) { return write((uint8_t)n); }
 	using Print::write;
 
 	bool dtr(void);

diff --git a/variants/CATENA_461x/usb/usbd_conf.c b/variants/CATENA_461x/usb/usbd_conf.c
@@ -584,7 +584,7 @@ void USBD_LL_DisableIRQ(void)
   * @param  None
   * @retval 0 if disconnected
   */
-uint32_t USBD_LL_ConnectionState(void)
+USBD_LL_ConnectionState_WEAK uint32_t USBD_LL_ConnectionState(void)
 {
   uint32_t vBus;
 

diff --git a/variants/CATENA_461x/usb/usbd_conf.h b/variants/CATENA_461x/usb/usbd_conf.h
@@ -70,6 +70,7 @@
 #define USBD_DEBUG_LEVEL                      0
 #define USBD_CDC_INTERVAL                     1000
 
+#define	USBD_LL_ConnectionState_WEAK	__weak
 
 /* Exported macro ------------------------------------------------------------*/
 /****************************************/