Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5187995f authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: remove duplicate ColdFire mcf_autovector() code 



Each of the ColdFire CPU platform code that used the old style interrupt
controller had its own copy of the mcf_autovector() function. They are all
the same, remove them all and create a single function in the common
coldfire/intc.c code.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 5938084b

arch/m68knommu/platform/5206/config.c

+0 −17
Original line number Diff line number Diff line
@@ -68,23 +68,6 @@ static void __init m5206_uarts_init(void) 


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



void mcf_autovector(unsigned int vec)

{

	volatile unsigned char  *mbar;

	unsigned char		icr;



	if ((vec >= 25) && (vec <= 31)) {

		vec -= 25;

		mbar = (volatile unsigned char *) MCF_MBAR;

		icr = MCFSIM_ICR_AUTOVEC | (vec << 3);

		*(mbar + MCFSIM_ICR1 + vec) = icr;

		vec = 0x1 << (vec + 1);

		mcf_setimr(mcf_getimr() & ~vec);

	}

}



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



void mcf_settimericr(unsigned int timer, unsigned int level)

{

	volatile unsigned char *icrp;

arch/m68knommu/platform/5206e/config.c

+0 −17
Original line number Diff line number Diff line
@@ -69,23 +69,6 @@ static void __init m5206e_uarts_init(void) 


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



void mcf_autovector(unsigned int vec)

{

	volatile unsigned char  *mbar;

	unsigned char		icr;



	if ((vec >= 25) && (vec <= 31)) {

		vec -= 25;

		mbar = (volatile unsigned char *) MCF_MBAR;

		icr = MCFSIM_ICR_AUTOVEC | (vec << 3);

		*(mbar + MCFSIM_ICR1 + vec) = icr;

		vec = 0x1 << (vec + 1);

		mcf_setimr(mcf_getimr() & ~vec);

	}

}



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



void mcf_settimericr(unsigned int timer, unsigned int level)

{

	volatile unsigned char *icrp;

arch/m68knommu/platform/5249/config.c

+0 −14
Original line number Diff line number Diff line
@@ -66,20 +66,6 @@ static void __init m5249_uarts_init(void) 
}





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



void mcf_autovector(unsigned int vec)

{

	volatile unsigned char  *mbar;



	if ((vec >= 25) && (vec <= 31)) {

		mbar = (volatile unsigned char *) MCF_MBAR;

		vec = 0x1 << (vec - 24);

		*(mbar + MCFSIM_AVR) |= vec;

		mcf_setimr(mcf_getimr() & ~vec);

	}

}



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



void mcf_settimericr(unsigned int timer, unsigned int level)

arch/m68knommu/platform/5272/config.c

+0 −7
Original line number Diff line number Diff line
@@ -148,13 +148,6 @@ void mcf_disableall(void) 


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



void mcf_autovector(unsigned int vec)

{

	/* Everything is auto-vectored on the 5272 */

}



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



void mcf_settimericr(int timer, int level)

{

	volatile unsigned long *icrp;

arch/m68knommu/platform/5307/config.c

+0 −14
Original line number Diff line number Diff line
@@ -83,20 +83,6 @@ static void __init m5307_uarts_init(void) 


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



void mcf_autovector(unsigned int vec)

{

	volatile unsigned char  *mbar;



	if ((vec >= 25) && (vec <= 31)) {

		mbar = (volatile unsigned char *) MCF_MBAR;

		vec = 0x1 << (vec - 24);

		*(mbar + MCFSIM_AVR) |= vec;

		mcf_setimr(mcf_getimr() & ~vec);

	}

}



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



void mcf_settimericr(unsigned int timer, unsigned int level)

{

	volatile unsigned char *icrp;