Arduino Zero sync, general cleanup, add new clocking scheme for HCLK/APB1CLK/APB2CLK

Author: GrumpyOldPizza

cores/stm32l4/WInterrupts.c

@@ -1,9 +1,7 @@
-/* 
-  stdlib_noniso.h - nonstandard (but usefull) conversion functions
+/*
+  dtostrf - Emulation for dtostrf function from avr-libc
+  Copyright (c) 2015 Arduino LLC.  All rights reserved.
 
-  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
- 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -19,32 +17,14 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef STDLIB_NONISO_H
-#define STDLIB_NONISO_H
+#include <stdio.h>
 
-#ifdef __cplusplus
-extern "C"{
-#endif
+char *dtostrf (double val, signed char width, unsigned char prec, char *sout) {
+  asm(".global _printf_float");
 
-int atoi(const char *s);
+  char fmt[20];
+  sprintf(fmt, "%%%d.%df", width, prec);
+  sprintf(sout, fmt, val);
+  return sout;
+}
 
-long atol(const char* s);
-
-double atof(const char* s);
-
-char* itoa (int val, char *s, int radix);
-
-char* ltoa (long val, char *s, int radix);
-
-char* utoa (unsigned int val, char *s, int radix);
-
-char* ultoa (unsigned long val, char *s, int radix);
- 
-char* dtostrf (double val, signed char width, unsigned char prec, char *s);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-
-#endif

cores/stm32l4/WInterrupts.h

@@ -1,5 +1,6 @@
 /*
-  Copyright (c) 2015 Arduino LLC.  All right reserved.
+  dtostrf - Emulation for dtostrf function from avr-libc
+  Copyright (c) 2015 Arduino LLC.  All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -8,30 +9,21 @@
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include <Arduino.h>
-#include "Reset.h"
-
-#include "wiring_private.h"
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void initiateReset(int _ticks) {
-  armv7m_systick_timeout(stm32l4_system_bootloader, _ticks);
-}
-
-void cancelReset() {
-  armv7m_systick_timeout(NULL, 0);
-}
+char *dtostrf(double val, signed char width, unsigned char prec, char *sout);
 
 #ifdef __cplusplus
 }

cores/stm32l4/stdlib_noniso.h renamed to cores/stm32l4/avr/dtostrf.c

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016 Thomas Roell.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal with 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:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimers.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimers in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. Neither the name of Thomas Roell, nor the names of its contributors
+ *     may be used to endorse or promote products derived from this Software
+ *     without specific prior written permission.
+ *
+ * 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
+ * CONTRIBUTORS 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
+ * WITH THE SOFTWARE.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+extern int (*stm32l4_stdio_put)(char, FILE*);
+extern int (*stm32l4_stdio_get)(FILE*);
+
+FILE * fdevopen(int(*put)(char, FILE *), int(*get)(FILE *))
+{
+    if (put != NULL)
+    {
+	stm32l4_stdio_put = (void*)put;
+	
+	return stdout;
+    }
+    
+    if (get != NULL)
+    {
+	stm32l4_stdio_get = get;
+	
+	return stdin;
+    }
+    
+    return NULL;
+}