Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Delcare COUNTER_MASK properly.

Browse Source 
* Restructure timer_read() so that the compiler generates better code.
This commit is contained in:
thorpej 2002-04-14 19:47:03 +00:00
parent f00c3c2e40
commit a9e4c1a943
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/arch/evbarm/iq80310/iq80310_timer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iq80310_timer.c,v 1.10 2002/04/13 22:42:39 thorpej Exp $ */
/* $NetBSD: iq80310_timer.c,v 1.11 2002/04/14 19:47:03 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@ -63,9 +63,9 @@
* Deal with them here.
*/
#if defined(IOP310_TEAMASA_NPWR)
#define COUNTER_MASK ((1U << 20) - 1)
#define COUNTER_MASK 0x0007ffff
#else /* Default to stock IQ80310 */
#define COUNTER_MASK ((1U << 23) - 1)
#define COUNTER_MASK 0x003fffff
#endif /* list of IQ80310-based designs */
#define COUNTS_PER_SEC 33000000 /* 33MHz */
@ -97,7 +97,7 @@ static __inline uint32_t
timer_read(void)
{
uint32_t rv;
uint8_t la[4];
uint8_t la0, la1, la2, la3;
/*
* First read latches count.
@ -106,16 +106,16 @@ timer_read(void)
* latched. The loop appears to work around the problem.
*/
do {
la[0] = CPLD_READ(IQ80310_TIMER_LA0);
} while (la[0] == 0);
la[1] = CPLD_READ(IQ80310_TIMER_LA1);
la[2] = CPLD_READ(IQ80310_TIMER_LA2);
la[3] = CPLD_READ(IQ80310_TIMER_LA3);
la0 = CPLD_READ(IQ80310_TIMER_LA0);
} while (la0 == 0);
la1 = CPLD_READ(IQ80310_TIMER_LA1);
la2 = CPLD_READ(IQ80310_TIMER_LA2);
la3 = CPLD_READ(IQ80310_TIMER_LA3);
rv = ((la[0] & 0x40) >> 1) | (la[0] & 0x1f);
rv |= (((la[1] & 0x40) >> 1) | (la[1] & 0x1f)) << 6;
rv |= (((la[2] & 0x40) >> 1) | (la[2] & 0x1f)) << 12;
rv |= (la[3] & 0x0f) << 18;
rv = ((la0 & 0x40) >> 1) | (la0 & 0x1f);
rv |= (((la1 & 0x40) >> 1) | (la1 & 0x1f)) << 6;
rv |= (((la2 & 0x40) >> 1) | (la2 & 0x1f)) << 12;
rv |= (la3 & 0x0f) << 18;
return (rv);
}