Merge Catena 4550 BSP. Remove not use variants and drivers.

Author: chwon64

.gitignore

@@ -1,5 +1,47 @@
-*.orig
-*.swp
-.DS_Store
-boards.local.txt
-platform.local.txt
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Backup files
+*.BAK
+*.CKP
+*~
+
+# Visual Studio things (for the Visual Micro stuff)
+.vs
+Debug
+Release
+__vm
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+*.sln
+
+# VS Code things
+.vscode

boards.txt

@@ -120,6 +120,8 @@ class HardwareSerial : public Stream
     using Print::write; // pull in write(str) and write(buf, size) from Print
     operator bool() { return true; }
 
+    bool dtr(void) { return true; }
+
     void setRx(uint32_t _rx);
     void setTx(uint32_t _tx);
     void setRx(PinName _rx);

cores/arduino/HardwareSerial.h

@@ -0,0 +1,146 @@
+/******************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2010 Perry Hung.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *****************************************************************************/
+
+/**
+ * @brief USB virtual serial terminal
+ */
+
+ /*
+  * Arduino srl - www.arduino.org
+  * 2016 Jun 9: Edited Francesco Alessi (alfran) - francesco@arduino.org
+  */
+
+#ifdef USBCON
+
+#include <string.h>
+
+#include "wiring.h"
+#include "usb_serial.h"
+#include "usbd_core.h"
+#include "usbd_desc.h"
+#include "usbd_cdc.h"
+#include "usbd_cdc_desc.h"
+#include "usbd_cdc_if.h"
+
+/* USB Device Core handle declaration */
+USBD_HandleTypeDef hUSBD_Device_CDC;
+
+USBSerial SerialUSB;
+
+
+USBSerial::USBSerial(void)
+{
+  if (USBD_Init(&hUSBD_Device_CDC, &CDC_Desc, DEVICE_FS) == USBD_OK)
+  {
+
+    /* Add Supported Class */
+    if (USBD_RegisterClass(&hUSBD_Device_CDC, USBD_CDC_CLASS) == USBD_OK)
+    {
+
+      /* Add CDC Interface Class */
+      if (USBD_CDC_RegisterInterface(&hUSBD_Device_CDC, &USBD_Interface_fops_FS) == USBD_OK)
+      {
+
+        /* Start Device Process */
+        USBD_Start(&hUSBD_Device_CDC);
+      }
+    }
+  }
+}
+
+/* USBSerial is always available and instantiated in main.cpp */
+void USBSerial::begin(void)
+{
+}
+
+void USBSerial::end(void)
+{
+}
+
+int USBSerial::availableForWrite(void)
+{
+  return CDC_AvailableForWrite();
+}
+
+size_t USBSerial::write(uint8_t ch)
+{
+  return CDC_Write(&ch, 1);
+}
+
+size_t USBSerial::write(const uint8_t *buffer, size_t size)
+{
+  return CDC_Write(buffer, size);
+}
+
+int USBSerial::available(void)
+{
+  return CDC_AvailableForRead();
+}
+
+int USBSerial::read(void)
+{
+  return CDC_Read();
+}
+
+int USBSerial::peek(void)
+{
+  return CDC_Peek();
+}
+
+void USBSerial::flush(void)
+{
+  CDC_Flush();
+}
+
+bool USBSerial::dtr(void)
+{
+  uint32_t LineState = CDC_LineState();
+  return LineState & 1;
+}
+
+bool USBSerial::rts(void)
+{
+  uint32_t LineState = CDC_LineState();
+  return (LineState & 2) >> 1;
+}
+
+bool USBSerial::isConnected(void)
+{
+  return USBD_LL_ConnectionState();
+}
+
+USBSerial::operator bool()
+{
+  bool result = false;
+  uint32_t LineState = CDC_LineState();
+
+  if (LineState & 1)
+    result = true;
+  delay(10);
+  return result;
+}
+
+#endif /* USBCON */

cores/arduino/stm32/usb_serial.cpp

@@ -0,0 +1,83 @@
+/******************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2010 Perry Hung.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *****************************************************************************/
+
+/**
+ * @brief Wirish virtual serial port
+ */
+
+ /*
+  * Arduino srl - www.arduino.org
+  * 2016 Jun 9: Edited Francesco Alessi (alfran) - francesco@arduino.org
+  */
+
+#ifndef _USB_SERIAL_H_
+#define _USB_SERIAL_H_
+
+#ifdef USBCON
+
+#include "Stream.h"
+
+/**
+ * @brief Virtual serial terminal.
+ */
+class USBSerial : public Stream {
+public:
+    USBSerial(void);
+
+    void begin(void);
+    void begin(unsigned long baud) { begin(); }
+    void end(void);
+
+    virtual int available(void);
+    virtual int peek(void);
+    virtual void flush(void);
+    virtual int read(void);
+
+    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);
+    bool rts(void);
+    bool isConnected();
+
+    virtual operator bool(void);
+};
+
+extern USBSerial SerialUSB;
+
+#ifdef NO_HWSERIAL
+# define Serial SerialUSB
+#endif
+
+#endif /* USBCON */
+
+#endif /* _USB_SERIAL_H_ */

cores/arduino/stm32/usb_serial.h

@@ -46,6 +46,7 @@
 #include "WCharacter.h"
 #include "WMath.h"
 #include "WString.h"
+#include "usb_serial.h"
 #endif // __cplusplus
 
 #define clockCyclesPerMicrosecond() ( SystemCoreClock / 1000000L )

cores/arduino/wiring.h

@@ -60,10 +60,17 @@ extern void delay( uint32_t dwMs ) ;
  * \param dwUs the number of microseconds to pause (uint32_t)
  */
 static inline void delayMicroseconds(uint32_t) __attribute__((always_inline, unused));
-static inline void delayMicroseconds(uint32_t usec){
-  uint32_t start = GetCurrentMicro();
+static inline void delayMicroseconds(uint32_t usec)
+{
+  uint32_t end;
 
-  while((start+usec) > GetCurrentMicro());
+  if (usec == 0)
+    return;
+
+  end = GetCurrentMicro() + usec;
+  if (end < usec)
+    while (end < GetCurrentMicro());
+  while (end > GetCurrentMicro());
 }
 
 #ifdef __cplusplus