Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 81809
b: refs/heads/master
c: 0c6377f
h: refs/heads/master
i:
  81807: 0672887
v: v3
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Feb 1, 2008
1 parent 899a388 commit cc5bf88
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 98 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79d8bfb01be752694fb3ae93555fcc0ad91b232b
refs/heads/master: 0c6377f878eb767846934d6c70377afac9a4db68
14 changes: 0 additions & 14 deletions trunk/arch/m68knommu/platform/5206/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,20 +109,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level)

/***************************************************************************/

int mcf_timerirqpending(int timer)
{
unsigned int imr = 0;

switch (timer) {
case 1: imr = MCFSIM_IMR_TIMER1; break;
case 2: imr = MCFSIM_IMR_TIMER2; break;
default: break;
}
return (mcf_getipr() & imr);
}

/***************************************************************************/

void __init config_BSP(char *commandp, int size)
{
mcf_setimr(MCFSIM_IMR_MASKALL);
Expand Down
14 changes: 0 additions & 14 deletions trunk/arch/m68knommu/platform/5206e/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level)

/***************************************************************************/

int mcf_timerirqpending(int timer)
{
unsigned int imr = 0;

switch (timer) {
case 1: imr = MCFSIM_IMR_TIMER1; break;
case 2: imr = MCFSIM_IMR_TIMER2; break;
default: break;
}
return (mcf_getipr() & imr);
}

/***************************************************************************/

void __init config_BSP(char *commandp, int size)
{
mcf_setimr(MCFSIM_IMR_MASKALL);
Expand Down
14 changes: 0 additions & 14 deletions trunk/arch/m68knommu/platform/5249/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,20 +105,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level)

/***************************************************************************/

int mcf_timerirqpending(int timer)
{
unsigned int imr = 0;

switch (timer) {
case 1: imr = MCFSIM_IMR_TIMER1; break;
case 2: imr = MCFSIM_IMR_TIMER2; break;
default: break;
}
return (mcf_getipr() & imr);
}

/***************************************************************************/

void __init config_BSP(char *commandp, int size)
{
mcf_setimr(MCFSIM_IMR_MASKALL);
Expand Down
13 changes: 0 additions & 13 deletions trunk/arch/m68knommu/platform/5272/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,6 @@ void mcf_settimericr(int timer, int level)

/***************************************************************************/

int mcf_timerirqpending(int timer)
{
volatile unsigned long *icrp;

if ((timer >= 1 ) && (timer <= 4)) {
icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
return (*icrp & (0x8 << ((4 - timer) * 4)));
}
return 0;
}

/***************************************************************************/

void __init config_BSP(char *commandp, int size)
{
#if defined (CONFIG_MOD5272)
Expand Down
14 changes: 0 additions & 14 deletions trunk/arch/m68knommu/platform/5307/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,20 +119,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level)

/***************************************************************************/

int mcf_timerirqpending(int timer)
{
unsigned int imr = 0;

switch (timer) {
case 1: imr = MCFSIM_IMR_TIMER1; break;
case 2: imr = MCFSIM_IMR_TIMER2; break;
default: break;
}
return (mcf_getipr() & imr);
}

/***************************************************************************/

void __init config_BSP(char *commandp, int size)
{
mcf_setimr(MCFSIM_IMR_MASKALL);
Expand Down
14 changes: 0 additions & 14 deletions trunk/arch/m68knommu/platform/532x/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level)

/***************************************************************************/

int mcf_timerirqpending(int timer)
{
unsigned int imr = 0;

switch (timer) {
case 1: imr = 0x1; break;
case 2: imr = 0x2; break;
default: break;
}
return (mcf_getiprh() & imr);
}

/***************************************************************************/

void __init config_BSP(char *commandp, int size)
{
mcf_setimr(MCFSIM_IMR_MASKALL);
Expand Down
14 changes: 0 additions & 14 deletions trunk/arch/m68knommu/platform/5407/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level)

/***************************************************************************/

int mcf_timerirqpending(int timer)
{
unsigned int imr = 0;

switch (timer) {
case 1: imr = MCFSIM_IMR_TIMER1; break;
case 2: imr = MCFSIM_IMR_TIMER2; break;
default: break;
}
return (mcf_getipr() & imr);
}

/***************************************************************************/

void __init config_BSP(char *commandp, int size)
{
mcf_setimr(MCFSIM_IMR_MASKALL);
Expand Down

0 comments on commit cc5bf88

Please sign in to comment.