Skip to content

Co x m051 v2.2.1.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liamjeal wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Co x m051 v2.2.1.1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d38450
add timer cox.m051 a new interface xTimerStatueClear,
liamjeal Jan 15, 2013
4d69f24
Mofify CoX.M051: Add xTimerStatusClear interface. Modify the TimerIni…
liamjeal Jan 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
252 changes: 0 additions & 252 deletions CoX/CoX_Peripheral/CoX_Peripheral_KLx/spi/test/suite1/ewarm/EW126.tmp
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions CoX/CoX_Peripheral/CoX_Peripheral_M051/libcox/xtimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static unsigned long ulEXTClockFreq;
//
//! \brief The Timer 0 default IRQ, declared in start up code.
//!
//! \param None.
//! \param None.
//!
//! This function is to give a default Timer IRQ service.
//!
Expand Down Expand Up @@ -316,7 +316,7 @@ TimerInitConfig(unsigned long ulBase, unsigned long ulConfig,
break;
}
xHWREG(ulBase + TIMER_O_TCMPR) = ulTCMPRValue;
xHWREG(ulBase + TIMER_O_TCSR) = ulPreScale | ulConfig;
xHWREG(ulBase + TIMER_O_TCSR) = (ulPreScale - 1) | ulConfig;
}

//*****************************************************************************
Expand Down Expand Up @@ -1020,4 +1020,4 @@ void
TimerExtClockFreqSet(unsigned long ulClockFreq)
{
ulEXTClockFreq = ulClockFreq;
}
}
30 changes: 29 additions & 1 deletion CoX/CoX_Peripheral/CoX_Peripheral_M051/libcox/xtimer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ extern "C"
//
//! @}
//
//*****************************************************************************
//*****************************************************************************

//*****************************************************************************
//
Expand Down Expand Up @@ -438,6 +438,8 @@ extern "C"
//! |------------------------------|----------------|------------------|
//! |xTimerStatusGet | Mandatory | Y |
//! |------------------------------|----------------|------------------|
//! |xTimerStatusClear | Mandatory | Y |
//! |------------------------------|----------------|------------------|
//! |xTimerCounterDetectPhaseSelect| Mandatory | Y |
//! |------------------------------|----------------|------------------|
//! |xTimerCaptureEdgeSelect | Mandatory | Y |
Expand Down Expand Up @@ -756,6 +758,7 @@ extern "C"
//!
//! The \e ulIntFlags parameter can be one of the values:
//! \b xTIMER_INT_MATCH.
//! \b xTIMER_INT_CAP_EVENT
//! Details please refer to \ref xTIMER_INT_Type_CoX.
//!
//! \note When use this API ,the ulIntFlags parameter one of the interrupt event
Expand All @@ -766,6 +769,31 @@ extern "C"
#define xTimerStatusGet(ulBase, ulChannel, ulIntFlags) \
TimerIntStatus(ulBase, ulIntFlags)

//*****************************************************************************
//
//! \brief Get The Timer counter interrupt Status.
//!
//! \param ulBase is the base address of the Timer port.
//! \param ulChannel is the channel of the Timer port.
//! Details please refer to \ref xTIMER_Count_Channel
//! \param ulIntFlags is the interrupt type of the Timer port.
//! Details please refer to \ref xTIMER_INT_Type.
//!
//! This function is to disable The Timer counter interrupt.
//!
//! The \e ulIntFlags parameter can be one of the values:
//! \b xTIMER_INT_MATCH.
//! \b xTIMER_INT_CAP_EVENT
//! Details please refer to \ref xTIMER_INT_Type_CoX.
//!
//! \note When use this API ,the ulIntFlags parameter one of the interrupt event
//!
//! \return the Status of The Timer counter interrupt.
//
//*****************************************************************************
#define xTimerStatusClear(ulBase, ulChannel, ulIntFlags) \
TimerIntClear(ulBase, ulIntFlags)

//*****************************************************************************
//
//! \brief Select The Timer counter detect phase.
Expand Down
Loading