From ccd259938bea36f4842f3a4cf6ba7c815b7a5f2f Mon Sep 17 00:00:00 2001
From: Fabiano Riccardi <fabiuz4@hotmail.it>
Date: Mon, 31 Oct 2016 13:53:46 +0100
Subject: [PATCH] Cleanup and added copyright notices
Signed-off-by: Fabiano Riccardi <fabiuz4@hotmail.it>
---
.../interfaces-impl/cstimer.cpp | 29 ++++++++++-
.../interfaces-impl/gpio_timer.cpp | 38 ++++++++++-----
.../interfaces-impl/gpio_timer.h | 40 ++++++++++------
.../high_resolution_timer_base.cpp | 40 +++++++++++-----
.../high_resolution_timer_base.h | 48 ++++++++++++-------
.../interfaces-impl/timer_interface.h | 38 ++++++++++-----
.../interfaces-impl/transceiver_timer.cpp | 38 ++++++++++-----
.../interfaces-impl/transceiver_timer.h | 38 ++++++++++-----
8 files changed, 217 insertions(+), 92 deletions(-)
diff --git a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/cstimer.cpp b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/cstimer.cpp
index 83a6dd7a..c0aa7616 100644
--- a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/cstimer.cpp
+++ b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/cstimer.cpp
@@ -1,3 +1,30 @@
+/***************************************************************************
+ * Copyright (C) 2016 by Fabiano Riccardi, Sasan *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 General Public License for more details. *
+ * *
+ * As a special exception, if other files instantiate templates or use *
+ * macros or inline functions from this file, or you compile this file *
+ * and link it with other works to produce a work based on this file, *
+ * this file does not by itself cause the resulting work to be covered *
+ * by the GNU General Public License. However the source code for this *
+ * file must still be made available in accordance with the GNU General *
+ * Public License. This exception does not invalidate any other reasons *
+ * why a work based on this file might be covered by the GNU General *
+ * Public License. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, see <http://www.gnu.org/licenses/> *
+ ***************************************************************************/
+
#include "interfaces/cstimer.h"
#include "kernel/timeconversion.h"
#include "cstimer_impl.h"
@@ -15,7 +42,7 @@ namespace miosix {
}
void ContextSwitchTimer::IRQsetNextInterrupt(long long ns){
- pImpl->b.IRQsetNextInterrupt1(tc->ns2tick(ns));
+ pImpl->b.IRQsetNextInterruptCS(tc->ns2tick(ns));
}
long long ContextSwitchTimer::getNextInterrupt() const{
diff --git a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/gpio_timer.cpp b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/gpio_timer.cpp
index 83cfefbc..91007014 100644
--- a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/gpio_timer.cpp
+++ b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/gpio_timer.cpp
@@ -1,9 +1,29 @@
-/*
- * File: gpio_timer.cpp
- * Author: fabiuz
- *
- * Created on September 27, 2016, 6:30 AM
- */
+/***************************************************************************
+ * Copyright (C) 2016 by Fabiano Riccardi *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 General Public License for more details. *
+ * *
+ * As a special exception, if other files instantiate templates or use *
+ * macros or inline functions from this file, or you compile this file *
+ * and link it with other works to produce a work based on this file, *
+ * this file does not by itself cause the resulting work to be covered *
+ * by the GNU General Public License. However the source code for this *
+ * file must still be made available in accordance with the GNU General *
+ * Public License. This exception does not invalidate any other reasons *
+ * why a work based on this file might be covered by the GNU General *
+ * Public License. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, see <http://www.gnu.org/licenses/> *
+ ***************************************************************************/
#include "gpio_timer.h"
#include "hwmapping.h"
@@ -36,10 +56,6 @@ bool GPIOtimer::absoluteWait(long long tick){
return false;
}
-bool GPIOtimer::getMode(){
- return isInput;
-}
-
//NOTE: Think about how to set the right ms32chkp related to the captured timestamp
long long GPIOtimer::getExtEventTimestamp() const{
return b.IRQgetSetTimeGPIO();
@@ -105,7 +121,6 @@ bool GPIOtimer::waitTrigger(long long tick){
*/
bool GPIOtimer::absoluteSyncWaitTrigger(long long tick){
{
- expansion::gpio1::high();
FastInterruptDisableLock dLock;
if(isInput){
b.setModeGPIOTimer(false); //output timer
@@ -116,7 +131,6 @@ bool GPIOtimer::absoluteSyncWaitTrigger(long long tick){
if(b.IRQsetNextGPIOInterrupt(tick)==WaitResult::WAKEUP_IN_THE_PAST){
return true;
}
- expansion::gpio1::low();
do {
tWaiting=Thread::IRQgetCurrentThread();
Thread::IRQwait();
diff --git a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/gpio_timer.h b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/gpio_timer.h
index 92b8fdae..95d62455 100644
--- a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/gpio_timer.h
+++ b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/gpio_timer.h
@@ -1,15 +1,29 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/*
- * File: gpio_timer.h
- * Author: fabiuz
- *
- * Created on September 27, 2016, 6:30 AM
- */
+/***************************************************************************
+ * Copyright (C) 2016 by Fabiano Riccardi *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 General Public License for more details. *
+ * *
+ * As a special exception, if other files instantiate templates or use *
+ * macros or inline functions from this file, or you compile this file *
+ * and link it with other works to produce a work based on this file, *
+ * this file does not by itself cause the resulting work to be covered *
+ * by the GNU General Public License. However the source code for this *
+ * file must still be made available in accordance with the GNU General *
+ * Public License. This exception does not invalidate any other reasons *
+ * why a work based on this file might be covered by the GNU General *
+ * Public License. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, see <http://www.gnu.org/licenses/> *
+ ***************************************************************************/
#include "high_resolution_timer_base.h"
#include "hwmapping.h"
@@ -59,8 +73,6 @@ namespace miosix {
long long tick2ns(long long tick);
long long ns2tick(long long ns);
- bool getMode();
-
private:
GPIOtimer();
HighResolutionTimerBase& b;
diff --git a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/high_resolution_timer_base.cpp b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/high_resolution_timer_base.cpp
index 426554bf..b3653848 100644
--- a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/high_resolution_timer_base.cpp
+++ b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/high_resolution_timer_base.cpp
@@ -1,15 +1,29 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/*
- * File: high_resolution_timer_base.cpp
- * Author: fabiuz
- *
- * Created on September 27, 2016, 2:20 AM
- */
+/***************************************************************************
+ * Copyright (C) 2016 by Fabiano Riccardi, Sasan *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 General Public License for more details. *
+ * *
+ * As a special exception, if other files instantiate templates or use *
+ * macros or inline functions from this file, or you compile this file *
+ * and link it with other works to produce a work based on this file, *
+ * this file does not by itself cause the resulting work to be covered *
+ * by the GNU General Public License. However the source code for this *
+ * file must still be made available in accordance with the GNU General *
+ * Public License. This exception does not invalidate any other reasons *
+ * why a work based on this file might be covered by the GNU General *
+ * Public License. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, see <http://www.gnu.org/licenses/> *
+ ***************************************************************************/
#include "interfaces/arch_registers.h"
#include "kernel/kernel.h"
@@ -335,7 +349,7 @@ WaitResult HighResolutionTimerBase::IRQsetNextTransceiverInterrupt(long long tic
}
}
-void HighResolutionTimerBase::IRQsetNextInterrupt1(long long tick){
+void HighResolutionTimerBase::IRQsetNextInterruptCS(long long tick){
// First off, disable timers to prevent unnecessary IRQ
// when IRQsetNextInterrupt is called multiple times consecutively.
TIMER1->IEN &= ~TIMER_IEN_CC1;
diff --git a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/high_resolution_timer_base.h b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/high_resolution_timer_base.h
index 925daecf..f497a84b 100644
--- a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/high_resolution_timer_base.h
+++ b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/high_resolution_timer_base.h
@@ -1,15 +1,29 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/*
- * File: high_resolution_timer_base.h
- * Author: fabiuz
- *
- * Created on September 27, 2016, 2:20 AM
- */
+/***************************************************************************
+ * Copyright (C) 2016 by Fabiano Riccardi *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 General Public License for more details. *
+ * *
+ * As a special exception, if other files instantiate templates or use *
+ * macros or inline functions from this file, or you compile this file *
+ * and link it with other works to produce a work based on this file, *
+ * this file does not by itself cause the resulting work to be covered *
+ * by the GNU General Public License. However the source code for this *
+ * file must still be made available in accordance with the GNU General *
+ * Public License. This exception does not invalidate any other reasons *
+ * why a work based on this file might be covered by the GNU General *
+ * Public License. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, see <http://www.gnu.org/licenses/> *
+ ***************************************************************************/
#include "miosix.h"
@@ -44,19 +58,21 @@ public:
* \param tick the time when the interrupt will be fired, in timer ticks
*/
WaitResult IRQsetNextTransceiverInterrupt(long long tick);
- void IRQsetNextInterrupt1(long long tick);
+ void IRQsetNextInterruptCS(long long tick);
WaitResult IRQsetNextGPIOInterrupt(long long tick);
/**
* \return the time when the next interrupt will be fired.
- * That is, the last value passed to setNextInterrupt().
+ * That is, the last value passed to setNextInterrupt(), or the value
+ * captured in input mode.
*/
long long IRQgetSetTimeTransceiver() const;
long long IRQgetSetTimeCS() const;
long long IRQgetSetTimeGPIO() const;
/*
- * Clean buffer in TIMER used by GPIOTimer, necessary when input capture mode is enabled
+ * Clean buffer in TIMER used by GPIOTimer, necessary when input capture
+ * mode is enabled
*/
void cleanBufferGPIO();
void cleanBufferTrasceiver();
@@ -85,7 +101,7 @@ public:
* Function to prepare the timers to works in a given mode. For Transceiver,
* it use 2 different low channel, so we can set both of them at the
* beginning of our code.
- * @param input true to set the input/capture mode, false to set the output
+ * \param input true to set the input/capture mode, false to set the output
* mode
*/
void setModeGPIOTimer(bool input);
diff --git a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/timer_interface.h b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/timer_interface.h
index d5a6b8fd..2b80ba73 100644
--- a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/timer_interface.h
+++ b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/timer_interface.h
@@ -1,15 +1,29 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/*
- * File: timer.h
- * Author: fabiuz
- *
- * Created on October 17, 2016, 10:27 AM
- */
+/***************************************************************************
+ * Copyright (C) 2016 by Federico Terraneo, Fabiano Riccardi *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 General Public License for more details. *
+ * *
+ * As a special exception, if other files instantiate templates or use *
+ * macros or inline functions from this file, or you compile this file *
+ * and link it with other works to produce a work based on this file, *
+ * this file does not by itself cause the resulting work to be covered *
+ * by the GNU General Public License. However the source code for this *
+ * file must still be made available in accordance with the GNU General *
+ * Public License. This exception does not invalidate any other reasons *
+ * why a work based on this file might be covered by the GNU General *
+ * Public License. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, see <http://www.gnu.org/licenses/> *
+ ***************************************************************************/
#ifndef TIMER_INTERFACE_H
#define TIMER_INTERFACE_H
diff --git a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/transceiver_timer.cpp b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/transceiver_timer.cpp
index a8c8ef98..3e113111 100644
--- a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/transceiver_timer.cpp
+++ b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/transceiver_timer.cpp
@@ -1,15 +1,29 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/*
- * File: radio_timer.cpp
- * Author: fabiuz
- *
- * Created on October 11, 2016, 11:17 AM
- */
+/***************************************************************************
+ * Copyright (C) 2016 by Fabiano Riccardi *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 General Public License for more details. *
+ * *
+ * As a special exception, if other files instantiate templates or use *
+ * macros or inline functions from this file, or you compile this file *
+ * and link it with other works to produce a work based on this file, *
+ * this file does not by itself cause the resulting work to be covered *
+ * by the GNU General Public License. However the source code for this *
+ * file must still be made available in accordance with the GNU General *
+ * Public License. This exception does not invalidate any other reasons *
+ * why a work based on this file might be covered by the GNU General *
+ * Public License. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, see <http://www.gnu.org/licenses/> *
+ ***************************************************************************/
#include "transceiver_timer.h"
diff --git a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/transceiver_timer.h b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/transceiver_timer.h
index 99250e96..556e8ba7 100644
--- a/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/transceiver_timer.h
+++ b/miosix/arch/cortexM3_efm32gg/efm32gg332f1024_wandstem/interfaces-impl/transceiver_timer.h
@@ -1,15 +1,29 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/*
- * File: radio_timer.h
- * Author: fabiuz
- *
- * Created on October 11, 2016, 11:17 AM
- */
+/***************************************************************************
+ * Copyright (C) 2016 by Fabiano Riccardi *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 General Public License for more details. *
+ * *
+ * As a special exception, if other files instantiate templates or use *
+ * macros or inline functions from this file, or you compile this file *
+ * and link it with other works to produce a work based on this file, *
+ * this file does not by itself cause the resulting work to be covered *
+ * by the GNU General Public License. However the source code for this *
+ * file must still be made available in accordance with the GNU General *
+ * Public License. This exception does not invalidate any other reasons *
+ * why a work based on this file might be covered by the GNU General *
+ * Public License. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, see <http://www.gnu.org/licenses/> *
+ ***************************************************************************/
#include "high_resolution_timer_base.h"
#include "timer_interface.h"
--
GitLab