coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-04-30 19:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Amalgamated ecl_timer_list into ecl_timer

Browse Source
This commit is contained in:
John Wellbelove 2017-10-27 09:51:57 +01:00
parent ed8b47dacd
commit 58bf40b55d
5 changed files with 172 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
examples/ArmTimerCallbacks - C/ArmTimerCallbacks.uvoptx
View File

@ -248,18 +248,6 @@
<File>
<GroupNumber>1</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\src\c\ecl_timer_list.c</PathWithFileName>
<FilenameWithoutPath>ecl_timer_list.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>1</GroupNumber>
<FileNumber>4</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -271,19 +259,7 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
<FileNumber>5</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\src\c\ecl_timer_list.h</PathWithFileName>
<FilenameWithoutPath>ecl_timer_list.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>1</GroupNumber>
<FileNumber>6</FileNumber>
<FileNumber>4</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>

16
examples/ArmTimerCallbacks - C/ArmTimerCallbacks.uvprojx
View File

@ -10,8 +10,8 @@
<TargetName>Target 1</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060528::V5.06 update 5 (build 528)::ARMCC</pCCUsed>
<uAC6>0</uAC6>
<pCCUsed>6070000::V6.7::.\ARMCLANG</pCCUsed>
<uAC6>1</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F401RETx</Device>
@ -320,7 +320,7 @@
<PlainCh>1</PlainCh>
<Ropi>0</Ropi>
<Rwpi>0</Rwpi>
<wLevel>2</wLevel>
<wLevel>3</wLevel>
<uThumb>0</uThumb>
<uSurpInc>0</uSurpInc>
<uC99>1</uC99>
@ -390,21 +390,11 @@
<FileType>1</FileType>
<FilePath>..\..\src\c\ecl_timer.c</FilePath>
</File>
<File>
<FileName>ecl_timer_list.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\src\c\ecl_timer_list.c</FilePath>
</File>
<File>
<FileName>ecl_timer.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\src\c\ecl_timer.h</FilePath>
</File>
<File>
<FileName>ecl_timer_list.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\src\c\ecl_timer_list.h</FilePath>
</File>
<File>
<FileName>ecl_user.h</FileName>
<FileType>5</FileType>

169
src/c/ecl_timer.c
View File

@ -30,7 +30,174 @@ SOFTWARE.
#include <assert.h>
#include "ecl_timer.h"
#include "ecl_timer_list.h"
//*****************************************************************************
// Internal timer list
//*****************************************************************************
static ecl_timer_id_t head;
static ecl_timer_id_t tail;
static ecl_timer_id_t current;
static struct ecl_timer_config* ptimers;
static void ecl_timer_list_init(struct ecl_timer_config* const ptimers_)
{
ptimers = ptimers_;
head = ECL_TIMER_NO_TIMER;
tail = ECL_TIMER_NO_TIMER;
current = ECL_TIMER_NO_TIMER;
}
//*******************************
static struct ecl_timer_config* ecl_timer_list_front()
{
return &ptimers[head];
}
//*******************************
static ecl_timer_id_t ecl_timer_list_begin()
{
current = head;
return current;
}
//*******************************
static ecl_timer_id_t ecl_timer_list_next(ecl_timer_id_t last)
{
current = ptimers[last].next;
return current;
}
//*******************************
static int ecl_timer_list_empty()
{
return head == ECL_TIMER_NO_TIMER;
}
//*******************************
// Inserts the timer at the correct delta position
//*******************************
static void ecl_timer_list_insert(ecl_timer_id_t id_)
{
struct ecl_timer_config* ptimer = &ptimers[id_];
if (head == ECL_TIMER_NO_TIMER)
{
// No entries yet.
head = id_;
tail = id_;
ptimer->previous = ECL_TIMER_NO_TIMER;
ptimer->next = ECL_TIMER_NO_TIMER;
}
else
{
// We already have entries.
ecl_timer_id_t test_id = ecl_timer_list_begin();
while (test_id != ECL_TIMER_NO_TIMER)
{
struct ecl_timer_config* ptest = &ptimers[test_id];
// Find the correct place to insert.
if (ptimer->delta <= ptest->delta)
{
if (ptest->id == head)
{
head = ptimer->id;
}
// Insert before ptest->
ptimer->previous = ptest->previous;
ptest->previous = ptimer->id;
ptimer->next = ptest->id;
// Adjust the next delta to compensate.
ptest->delta -= ptimer->delta;
if (ptimer->previous != ECL_TIMER_NO_TIMER)
{
ptimers[ptimer->previous].next = ptimer->id;
}
break;
}
else
{
ptimer->delta -= ptest->delta;
}
test_id = ecl_timer_list_next(test_id);
}
// Reached the end?
if (test_id == ECL_TIMER_NO_TIMER)
{
// Tag on to the tail.
ptimers[tail].next = ptimer->id;
ptimer->previous = tail;
ptimer->next = ECL_TIMER_NO_TIMER;
tail = ptimer->id;
}
}
}
//*******************************
static void ecl_timer_list_remove(ecl_timer_id_t id_, int has_expired)
{
struct ecl_timer_config* ptimer = &ptimers[id_];
if (head == id_)
{
head = ptimer->next;
}
else
{
ptimers[ptimer->previous].next = ptimer->next;
}
if (tail == id_)
{
tail = ptimer->previous;
}
else
{
ptimers[ptimer->next].previous = ptimer->previous;
}
if (!has_expired)
{
// Adjust the next delta.
if (ptimer->next != ECL_TIMER_NO_TIMER)
{
ptimers[ptimer->next].delta += ptimer->delta;
}
}
ptimer->previous = ECL_TIMER_NO_TIMER;
ptimer->next = ECL_TIMER_NO_TIMER;
ptimer->delta = ECL_TIMER_INACTIVE;
}
//*******************************
static void ecl_timer_list_clear()
{
ecl_timer_id_t id = ecl_timer_list_begin();
while (id != ECL_TIMER_NO_TIMER)
{
struct ecl_timer_config* ptimer = &ptimers[id];
id = ecl_timer_list_next(id);
ptimer->next = ECL_TIMER_NO_TIMER;
}
head = ECL_TIMER_NO_TIMER;
tail = ECL_TIMER_NO_TIMER;
current = ECL_TIMER_NO_TIMER;
}
//*****************************************************************************
// Timer Framework
//*****************************************************************************
//*******************************************
/// Default initialisation.

201
src/c/ecl_timer_list.c
View File

@ -1,201 +0,0 @@
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2017 jwellbelove
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.
******************************************************************************/
#include "ecl_timer.h"
#include "ecl_timer_list.h"
//*************************************************************************
/// A specialised intrusive linked list for timer data.
//*************************************************************************
static ecl_timer_id_t head;
static ecl_timer_id_t tail;
static ecl_timer_id_t current;
struct ecl_timer_config* ptimers;
void ecl_timer_list_init(struct ecl_timer_config* const ptimers_)
{
ptimers = ptimers_;
head = ECL_TIMER_NO_TIMER;
tail = ECL_TIMER_NO_TIMER;
current = ECL_TIMER_NO_TIMER;
}
//*******************************
struct ecl_timer_config* ecl_timer_list_front()
{
return &ptimers[head];
}
//*******************************
ecl_timer_id_t ecl_timer_list_begin()
{
current = head;
return current;
}
//*******************************
ecl_timer_id_t ecl_timer_list_previous(ecl_timer_id_t last)
{
current = ptimers[last].previous;
return current;
}
//*******************************
ecl_timer_id_t ecl_timer_list_next(ecl_timer_id_t last)
{
current = ptimers[last].next;
return current;
}
//*******************************
int ecl_timer_list_empty()
{
return head == ECL_TIMER_NO_TIMER;
}
//*******************************
// Inserts the timer at the correct delta position
//*******************************
void ecl_timer_list_insert(ecl_timer_id_t id_)
{
struct ecl_timer_config* ptimer = &ptimers[id_];
if (head == ECL_TIMER_NO_TIMER)
{
// No entries yet.
head = id_;
tail = id_;
ptimer->previous = ECL_TIMER_NO_TIMER;
ptimer->next = ECL_TIMER_NO_TIMER;
}
else
{
// We already have entries.
ecl_timer_id_t test_id = ecl_timer_list_begin();
while (test_id != ECL_TIMER_NO_TIMER)
{
struct ecl_timer_config* ptest = &ptimers[test_id];
// Find the correct place to insert.
if (ptimer->delta <= ptest->delta)
{
if (ptest->id == head)
{
head = ptimer->id;
}
// Insert before ptest->
ptimer->previous = ptest->previous;
ptest->previous = ptimer->id;
ptimer->next = ptest->id;
// Adjust the next delta to compensate.
ptest->delta -= ptimer->delta;
if (ptimer->previous != ECL_TIMER_NO_TIMER)
{
ptimers[ptimer->previous].next = ptimer->id;
}
break;
}
else
{
ptimer->delta -= ptest->delta;
}
test_id = ecl_timer_list_next(test_id);
}
// Reached the end?
if (test_id == ECL_TIMER_NO_TIMER)
{
// Tag on to the tail.
ptimers[tail].next = ptimer->id;
ptimer->previous = tail;
ptimer->next = ECL_TIMER_NO_TIMER;
tail = ptimer->id;
}
}
}
//*******************************
void ecl_timer_list_remove(ecl_timer_id_t id_, int has_expired)
{
struct ecl_timer_config* ptimer = &ptimers[id_];
if (head == id_)
{
head = ptimer->next;
}
else
{
ptimers[ptimer->previous].next = ptimer->next;
}
if (tail == id_)
{
tail = ptimer->previous;
}
else
{
ptimers[ptimer->next].previous = ptimer->previous;
}
if (!has_expired)
{
// Adjust the next delta.
if (ptimer->next != ECL_TIMER_NO_TIMER)
{
ptimers[ptimer->next].delta += ptimer->delta;
}
}
ptimer->previous = ECL_TIMER_NO_TIMER;
ptimer->next = ECL_TIMER_NO_TIMER;
ptimer->delta = ECL_TIMER_INACTIVE;
}
//*******************************
void ecl_timer_list_clear()
{
ecl_timer_id_t id = ecl_timer_list_begin();
while (id != ECL_TIMER_NO_TIMER)
{
struct ecl_timer_config* ptimer = &ptimers[id];
id = ecl_timer_list_next(id);
ptimer->next = ECL_TIMER_NO_TIMER;
}
head = ECL_TIMER_NO_TIMER;
tail = ECL_TIMER_NO_TIMER;
current = ECL_TIMER_NO_TIMER;
}

44
src/c/ecl_timer_list.h
View File

@ -1,44 +0,0 @@
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2017 jwellbelove
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.
******************************************************************************/
#ifndef __ETL_C_TIMER_FRAMEWORK_LIST__
#define __ETL_C_TIMER_FRAMEWORK_LIST__
#include "ecl_timer.h"
void ecl_timer_list_init(struct ecl_timer_config* const ptimers_);
struct ecl_timer_config* ecl_timer_list_front(void);
ecl_timer_id_t ecl_timer_list_begin(void);
ecl_timer_id_t ecl_timer_list_previous(ecl_timer_id_t last);
ecl_timer_id_t ecl_timer_list_next(ecl_timer_id_t last);
int ecl_timer_list_empty(void);
void ecl_timer_list_insert(ecl_timer_id_t id_);
void ecl_timer_list_remove(ecl_timer_id_t id_, int has_expired);
void ecl_timer_list_clear(void);
#endif