ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8149 from ganesh-ramachandran/m066_usticker-new_feature 

Add usticker feature to TMPM066
pull/7948/head
Cruz Monrreal 2018-10-08 10:09:33 -05:00 committed by GitHub
parent f5cfdfafb3 cd618e640b
commit 866018b22d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
targets/TARGET_TOSHIBA/TARGET_TMPM066/us_ticker.c
View File

@ -1,5 +1,5 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
* (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2018 All rights reserved
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -13,51 +13,57 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include <stdbool.h>
#include "us_ticker_api.h" #include "us_ticker_api.h"
#include "mbed_critical.h" #include "tmpm066_tmrb.h"
#include "tmpm066_intifsd.h"
#define TMR16A_100US 0x960 // fsys = fc = 24MHz, Ttmra = 1/24us, 100us*24us = 2400 = 0x960 #define MAX_TICK_16_BIT 0xFFFF
#define TMR16A_SYSCK ((uint32_t)0x00000001)
#define TMR16A_RUN ((uint32_t)0x00000001)
#define TMR16A_STOP ((uint32_t)0x00000000)
#define OVERFLOW_32BIT (0xFFFFFFFF / 0x64)
static uint8_t us_ticker_inited = 0; // Is ticker initialized yet? static bool us_ticker_inited = false; // Is ticker initialized yet?
static volatile uint32_t ticker_int_counter = 0; // Amount of overflows until user interrupt
static volatile uint32_t us_ticker = 0; // timer counter
void INT16A0_IRQHandler(void) void INTTB7_IRQHandler(void)
{
us_ticker++;
if (us_ticker > OVERFLOW_32BIT) {
us_ticker = 0;
}
}
void INT16A1_IRQHandler(void)
{ {
us_ticker_irq_handler(); us_ticker_irq_handler();
} }
const ticker_info_t* us_ticker_get_info()
{
static const ticker_info_t info = {
3000000, // 3MHz,
16 // 16 bit counter
};
return &info;
}
// initialize us_ticker // initialize us_ticker
void us_ticker_init(void) void us_ticker_init(void)
{ {
// Enable clock supply to TA0 TMRB_InitTypeDef m_tmrb0;
CG_SetFcPeriphA(CG_FC_PERIPH_TMR16A, ENABLE);
if (us_ticker_inited) { if (us_ticker_inited) {
us_ticker_disable_interrupt();
return; return;
} }
us_ticker_inited = 1; us_ticker_inited = true;
// TSB_TB7 using free-run
m_tmrb0.Mode = TMRB_INTERVAL_TIMER;
m_tmrb0.ClkDiv = TMRB_CLK_DIV_8;
m_tmrb0.UpCntCtrl = TMRB_FREE_RUN;
m_tmrb0.TrailingTiming = MAX_TICK_16_BIT;
m_tmrb0.LeadingTiming = MAX_TICK_16_BIT;
// Enable channel 0
TMRB_Enable(TSB_TB7);
// Stops and clear count operation // Stops and clear count operation
TSB_T16A0->RUN = TMR16A_STOP; TMRB_SetRunState(TSB_TB7, TMRB_STOP);
TSB_T16A0->CR = TMR16A_SYSCK; // Mask All interrupts
// Permits INTTA0 interrupt TMRB_SetINTMask(TSB_TB7, TMRB_MASK_MATCH_LEADINGTIMING_INT | TMRB_MASK_MATCH_TRAILINGTIMING_INT | TMRB_MASK_OVERFLOW_INT);
NVIC_EnableIRQ(INT16A0_IRQn); // Initialize timer
// Match counter set to max value TMRB_Init(TSB_TB7, &m_tmrb0);
TSB_T16A0->RG = TMR16A_100US; // Starts TSB_TB7
TSB_T16A0->RUN = TMR16A_RUN; TMRB_SetRunState(TSB_TB7, TMRB_RUN);
} }
uint32_t us_ticker_read(void) uint32_t us_ticker_read(void)
@ -68,47 +74,47 @@ uint32_t us_ticker_read(void)
us_ticker_init(); us_ticker_init();
} }
uint32_t tickerbefore = 0; ret_val = (uint32_t)TMRB_GetUpCntValue(TSB_TB7);
do {
tickerbefore = us_ticker;
ret_val = (us_ticker * 100);
} while (tickerbefore != us_ticker);
return ret_val; return ret_val;
} }
void us_ticker_set_interrupt(timestamp_t timestamp) void us_ticker_set_interrupt(timestamp_t timestamp)
{ {
uint32_t delta = 0; NVIC_DisableIRQ(INTTB7_IRQn);
NVIC_ClearPendingIRQ(INTTB7_IRQn);
// Stops and clear count operation TMRB_ChangeTrailingTiming(TSB_TB7, timestamp);
TSB_T16A1->RUN = TMR16A_STOP; //Mask all Interrupts except trailing edge interrupt
TSB_T16A1->CR = TMR16A_SYSCK; TMRB_SetINTMask(TSB_TB7, TMRB_MASK_MATCH_LEADINGTIMING_INT | TMRB_MASK_OVERFLOW_INT);
// Set the compare register NVIC_EnableIRQ(INTTB7_IRQn);
delta = (timestamp - us_ticker_read());
TSB_T16A1->RG = delta;
// Set Interrupt
NVIC_EnableIRQ(INT16A1_IRQn);
// Start TMR_TA1 timer
TSB_T16A1->RUN = TMR16A_RUN;
} }
void us_ticker_fire_interrupt(void) void us_ticker_fire_interrupt(void)
{ {
NVIC_SetPendingIRQ(INT16A1_IRQn); NVIC_SetPendingIRQ(INTTB7_IRQn);
NVIC_EnableIRQ(INTTB7_IRQn);
} }
void us_ticker_disable_interrupt(void) void us_ticker_disable_interrupt(void)
{ {
NVIC_DisableIRQ(INT16A1_IRQn); // Mask All interrupts
TMRB_SetINTMask(TSB_TB7, TMRB_MASK_MATCH_LEADINGTIMING_INT | TMRB_MASK_MATCH_TRAILINGTIMING_INT | TMRB_MASK_OVERFLOW_INT);
// Also clear and disable interrupts by NVIC
NVIC_ClearPendingIRQ(INTTB7_IRQn);
NVIC_DisableIRQ(INTTB7_IRQn);
} }
void us_ticker_clear_interrupt(void) void us_ticker_clear_interrupt(void)
{ {
//no flags to clear INTIFSD_ClearINTReq(INTIFSD_INT_SRC_TMRB_7_MDOVF);
NVIC_ClearPendingIRQ(INTTB7_IRQn);
} }
void us_ticker_free(void) void us_ticker_free(void)
{ {
TMRB_SetINTMask(TSB_TB7, TMRB_MASK_MATCH_LEADINGTIMING_INT | TMRB_MASK_MATCH_TRAILINGTIMING_INT | TMRB_MASK_OVERFLOW_INT);
NVIC_ClearPendingIRQ(INTTB7_IRQn);
NVIC_DisableIRQ(INTTB7_IRQn);
TMRB_SetRunState(TSB_TB7, TMRB_STOP);
TMRB_Disable(TSB_TB7);
} }

2
targets/targets.json
View File

@ -4326,7 +4326,7 @@
"extra_labels": ["TOSHIBA"], "extra_labels": ["TOSHIBA"],
"macros": ["__TMPM066__", "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""], "macros": ["__TMPM066__", "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"], "supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
"device_has": ["ANALOGIN", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "SERIAL", "SLEEP", "I2C", "I2CSLAVE", "STDIO_MESSAGES", "PWMOUT"], "device_has": ["USTICKER", "ANALOGIN", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "SERIAL", "SLEEP", "I2C", "I2CSLAVE", "STDIO_MESSAGES", "PWMOUT"],
"device_name": "TMPM066FWUG", "device_name": "TMPM066FWUG",
"detect_code": ["7011"], "detect_code": ["7011"],
"release_versions": ["5"] "release_versions": ["5"]