FreeCalypso > hg > fc-magnetite
view src/cs/drivers/drv_core/timer/timer.c @ 516:1ed9de6c90bd
src/g23m-gsm/sms/sms_for.c: bogus malloc removed
The new error handling code that was not present in TCS211 blob version
contains a malloc call that is bogus for 3 reasons:
1) The memory allocation in question is not needed in the first place;
2) libc malloc is used instead of one of the firmware's proper ways;
3) The memory allocation is made inside a function and then never freed,
i.e., a memory leak.
This bug was caught in gcc-built FreeCalypso fw projects (Citrine
and Selenite) because our gcc environment does not allow any use of
libc malloc (any reference to malloc produces a link failure),
but this code from TCS3.2 is wrong even for Magnetite: if this code
path is executed repeatedly over a long time, the many small allocations
made by this malloc call without a subsequent free will eventually
exhaust the malloc heap provided by the TMS470 environment, malloc will
start returning NULL, and the bogus code will treat it as an error.
Because the memory allocation in question is not needed at all,
the fix entails simply removing it.
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Sun, 22 Jul 2018 06:04:49 +0000 |
parents | 945cf7f506b2 |
children |
line wrap: on
line source
/******************************************************************************* TEXAS INSTRUMENTS INCORPORATED PROPRIETARY INFORMATION Property of Texas Instruments -- For Unrestricted Internal Use Only Unauthorized reproduction and/or distribution is strictly prohibited. This product is protected under copyright law and trade secret law as an unpublished work. Created 1987, (C) Copyright 1997 Texas Instruments. All rights reserved. Filename : timer.c Description : timer.c Project : drivers Author : pmonteil@tif.ti.com Patrice Monteil. Version number : 1.3 Date and time : 07/23/98 16:25:32 Previous delta : 07/23/98 16:25:32 SCCS file : /db/gsm_asp/db_ht96/dsp_0/gsw/rel_0/mcu_l1/release1.5/mod/emu/EMU_MCMP/eva3_drivers/source/SCCS/s.timer.c Sccs Id (SID) : '@(#) timer.c 1.3 07/23/98 16:25:32 ' *****************************************************************************/ #include "l1sw.cfg" #if (OP_L1_STANDALONE == 0) #include "main/sys_types.h" #else #include "sys_types.h" #endif #include "memif/mem.h" #include "inth/iq.h" #include "timer.h" /*-------------------------------------------------------------- * TIMER_Read() *-------------------------------------------------------------- * Parameters : num of the register to be read * Return :value of the timer register read * Functionality : read one of the TIMER register *--------------------------------------------------------------*/ SYS_UWORD16 TIMER_Read (unsigned short regNum) { volatile SYS_UWORD16 timerReg; switch (regNum) { case 0: timerReg = (( * (SYS_UWORD16 *) TIMER_CNTL_REG) & TIMER_CNTL_MASK); break; case 1: timerReg = ( * (SYS_UWORD16 *) TIMER_READ_REG); break; case 2: timerReg = (( * (SYS_UWORD16 *) TIMER_MODE_REG) & TIMER_MODE_MASK); break; default: break; } return(timerReg); } /*-------------------------------------------------------------- * TM_ResetTimer() *-------------------------------------------------------------- * Parameters : timer number (1 or 2) * timer value, reload yes or not, scale * Return : none * Functionality : Give the timewr state *--------------------------------------------------------------*/ void TM_ResetTimer (SYS_UWORD16 timerNum, SYS_UWORD16 countValue, SYS_UWORD16 autoReload, SYS_UWORD16 clockScale) { volatile SYS_UWORD16 *cntl; if (timerNum == 1) { cntl = (volatile SYS_UWORD16 *) TIMER1_CNTL; *cntl &= ~(START_STOP | PTV); /* stop and reset values */ (autoReload) ? (*cntl |= AR) : (*cntl &= ~AR); *cntl |= (clockScale << 2 ); * (SYS_UWORD16 *) TIMER1_LOAD_TIM = countValue; /*load the value */ *cntl |= START_STOP; } else { cntl = (volatile SYS_UWORD16 *) TIMER2_CNTL; *cntl &= ~(START_STOP | PTV); /* stop and reset values */ (autoReload) ? (*cntl |= AR) : (*cntl &= ~AR); *cntl |= (clockScale << 2 ); * (SYS_UWORD16 *) TIMER2_LOAD_TIM = countValue; /*load the value */ *cntl |= START_STOP; } } /* * TM_StopTimer * * Parameters : timer number (1 or 2) */ void TM_StopTimer (int timerNum) { volatile SYS_UWORD16 *cntl; if (timerNum == 1) { cntl = (volatile SYS_UWORD16 *) TIMER1_CNTL; } else { cntl = (volatile SYS_UWORD16 *) TIMER2_CNTL; } *cntl &= ~START_STOP; } /* * TM_ReadTimer * * Returns current timer value * * Parameters : timer number (1 or 2) * */ SYS_UWORD16 TM_ReadTimer (int timerNum) { if (timerNum == 1) { return (* (SYS_UWORD16 *) TIMER1_READ_TIM); } else { return (* (SYS_UWORD16 *) TIMER2_READ_TIM); } } /* * TM_StartTimer * * Parameters : timer number (1 or 2) * */ void TM_StartTimer (int timerNum) { volatile SYS_UWORD16 *cntl; if (timerNum == 1) { cntl = (volatile SYS_UWORD16 *) TIMER1_CNTL; } else { cntl = (volatile SYS_UWORD16 *) TIMER2_CNTL; } *cntl |= START_STOP; } void TM_DisableWatchdog (void) { /* volatile variable needed due C to optimization */ volatile SYS_UWORD16 *reg = (volatile SYS_UWORD16 *) TIMER_MODE_REG; *reg = 0xf5; *reg = 0xa0; } /* * TM_EnableWatchdog * */ void TM_EnableWatchdog(void) { * ((volatile SYS_UWORD16 *) TIMER_MODE_REG) = TIMER_WDOG; } /* * TM_ResetWatchdog * * Parameter : Tick count * Use a different value each time, otherwise watchdog bites */ void TM_ResetWatchdog(SYS_UWORD16 count) { * ((volatile SYS_UWORD16 *) TIMER_LOAD_REG) = count; } /* * TM_EnableTimer (int TimerNum) * * Parameter : TimerNum : timer to enable (timer1 or timer2) * */ void TM_EnableTimer (int TimerNum) { volatile SYS_UWORD16 *cntl; if (TimerNum == 1) { cntl = (volatile SYS_UWORD16 *) TIMER1_CNTL; } else { cntl = (volatile SYS_UWORD16 *) TIMER2_CNTL; } *cntl |= TIMER_CLK_EN; } /* * TM_DisableTimer (int TimerNum) * * Parameter : TimerNum : timer to enable (timer1 or timer2) * */ void TM_DisableTimer (int TimerNum) { volatile SYS_UWORD16 *cntl; if (TimerNum == 1) { cntl = (volatile SYS_UWORD16 *) TIMER1_CNTL; } else { cntl = (volatile SYS_UWORD16 *) TIMER2_CNTL; } *cntl &= ~TIMER_CLK_EN; } /*-------------------------------------------------------------- * TIMER_ReadValue() *-------------------------------------------------------------- * Parameters : none * Return : none * Functionality : Read timer value *--------------------------------------------------------------*/ unsigned short TIMER_ReadValue (void) { return(* (SYS_UWORD16 *) TIMER_READ_REG); } /*-------------------------------------------------------------- * TIMER_WriteValue() *-------------------------------------------------------------- * Parameters : none * Return : none * Functionality : Write timer value *--------------------------------------------------------------*/ void TIMER_WriteValue (SYS_UWORD16 value) { * (SYS_UWORD16 *) TIMER_LOAD_REG = value; /*load the value */ }