diff options
| author | Michael Hope <michael.hope@linaro.org> | 2010-09-29 20:45:57 +1300 |
|---|---|---|
| committer | Michael Hope <michael.hope@linaro.org> | 2010-09-29 20:45:57 +1300 |
| commit | 6fcd4cd306dbecf56f5b0b506a3c23762d1219fa (patch) | |
| tree | 467125eca5a2e6706001cad8e09bc475e58a12d9 /libmaple/systick.h | |
| parent | 368e4fc1662c2594b2a0908900713a2555a3ed8e (diff) | |
| parent | adde11b099ff5dad176e410279d21feac39d2c7e (diff) | |
| download | librambutan-6fcd4cd306dbecf56f5b0b506a3c23762d1219fa.tar.gz librambutan-6fcd4cd306dbecf56f5b0b506a3c23762d1219fa.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'libmaple/systick.h')
| -rw-r--r-- | libmaple/systick.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmaple/systick.h b/libmaple/systick.h index 80e2fde..7ec8497 100644 --- a/libmaple/systick.h +++ b/libmaple/systick.h @@ -1,4 +1,4 @@ -/* ***************************************************************************** +/****************************************************************************** * The MIT License * * Copyright (c) 2010 Perry Hung. @@ -20,12 +20,12 @@ * 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. - * ****************************************************************************/ + *****************************************************************************/ /** - * @file systick.h + * @file systick.h * - * @brief Various system timer definitions + * @brief Various system timer definitions */ #ifndef _SYSTICK_H_ @@ -51,7 +51,7 @@ static inline uint32 systick_get_count(void) { } static inline uint32 systick_check_underflow(void) { - return (__read(SYSTICK_CSR) & SYSTICK_CSR_COUNTFLAG); + return (__read(SYSTICK_CSR) & SYSTICK_CSR_COUNTFLAG); } #ifdef __cplusplus |