Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 08:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppc4xx: Minor coding style cleanup of Xilinx Virtex5 ml507 support

Browse source 
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2008-07-18 12:24:41 +02:00
parent 086511fc96
commit 60204d06ed
4 changed files with 23 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
cpu/ppc4xx/uic.c
View file

@ -59,27 +59,19 @@ DECLARE_GLOBAL_DATA_PTR;
void pic_enable(void) void pic_enable(void)
{ {
#if (UIC_MAX > 1) #if (UIC_MAX > 1)
/* Install the UIC1 handlers */ /* Install the UIC1 handlers */
irq_install_handler(VECNUM_UIC1NCI, (void *)(void *)external_interrupt, irq_install_handler(VECNUM_UIC1NCI, (void *)(void *)external_interrupt, 0);
0); irq_install_handler(VECNUM_UIC1CI, (void *)(void *)external_interrupt, 0);
irq_install_handler(VECNUM_UIC1CI, (void *)(void *)external_interrupt,
0);
#endif #endif
#if (UIC_MAX > 2) #if (UIC_MAX > 2)
irq_install_handler(VECNUM_UIC2NCI, (void *)(void *)external_interrupt, irq_install_handler(VECNUM_UIC2NCI, (void *)(void *)external_interrupt, 0);
0); irq_install_handler(VECNUM_UIC2CI, (void *)(void *)external_interrupt, 0);
irq_install_handler(VECNUM_UIC2CI, (void *)(void *)external_interrupt,
0);
#endif #endif
#if (UIC_MAX > 3) #if (UIC_MAX > 3)
irq_install_handler(VECNUM_UIC3NCI, (void *)(void *)external_interrupt, irq_install_handler(VECNUM_UIC3NCI, (void *)(void *)external_interrupt, 0);
0); irq_install_handler(VECNUM_UIC3CI, (void *)(void *)external_interrupt, 0);
irq_install_handler(VECNUM_UIC3CI, (void *)(void *)external_interrupt,
0);
#endif #endif
} }
/* Handler for UIC interrupt */ /* Handler for UIC interrupt */
@ -147,21 +139,14 @@ void external_interrupt(struct pt_regs *regs)
void pic_irq_ack(unsigned int vec) void pic_irq_ack(unsigned int vec)
{ {
if ((vec >= 0) && (vec < 32)) if ((vec >= 0) && (vec < 32))
mtdcr(uicsr, UIC_MASK(vec)); mtdcr(uicsr, UIC_MASK(vec));
#if (UIC_MAX > 1)
else if ((vec >= 32) && (vec < 64)) else if ((vec >= 32) && (vec < 64))
mtdcr(uic1sr, UIC_MASK(vec)); mtdcr(uic1sr, UIC_MASK(vec));
#endif
#if (UIC_MAX > 2)
else if ((vec >= 64) && (vec < 96)) else if ((vec >= 64) && (vec < 96))
mtdcr(uic2sr, UIC_MASK(vec)); mtdcr(uic2sr, UIC_MASK(vec));
#endif
#if (UIC_MAX > 3)
else if (vec >= 96) else if (vec >= 96)
mtdcr(uic3sr, UIC_MASK(vec)); mtdcr(uic3sr, UIC_MASK(vec));
#endif
} }
/* /*
@ -172,38 +157,24 @@ void pic_irq_enable(unsigned int vec)
if ((vec >= 0) && (vec < 32)) if ((vec >= 0) && (vec < 32))
mtdcr(uicer, mfdcr(uicer) | UIC_MASK(vec)); mtdcr(uicer, mfdcr(uicer) | UIC_MASK(vec));
#if (UIC_MAX > 1)
else if ((vec >= 32) && (vec < 64)) else if ((vec >= 32) && (vec < 64))
mtdcr(uic1er, mfdcr(uic1er) | UIC_MASK(vec)); mtdcr(uic1er, mfdcr(uic1er) | UIC_MASK(vec));
#endif
#if (UIC_MAX > 2)
else if ((vec >= 64) && (vec < 96)) else if ((vec >= 64) && (vec < 96))
mtdcr(uic2er, mfdcr(uic2er) | UIC_MASK(vec)); mtdcr(uic2er, mfdcr(uic2er) | UIC_MASK(vec));
#endif
#if (UIC_MAX > 3)
else if (vec >= 96) else if (vec >= 96)
mtdcr(uic3er, mfdcr(uic3er) | UIC_MASK(vec)); mtdcr(uic3er, mfdcr(uic3er) | UIC_MASK(vec));
#endif
debug("Install interrupt for vector %d ==> %p\n", vec, handler); debug("Install interrupt for vector %d ==> %p\n", vec, handler);
} }
void pic_irq_disable(unsigned int vec) void pic_irq_disable(unsigned int vec)
{ {
if ((vec >= 0) && (vec < 32)) if ((vec >= 0) && (vec < 32))
mtdcr(uicer, mfdcr(uicer) & ~UIC_MASK(vec)); mtdcr(uicer, mfdcr(uicer) & ~UIC_MASK(vec));
#if (UIC_MAX > 1)
else if ((vec >= 32) && (vec < 64)) else if ((vec >= 32) && (vec < 64))
mtdcr(uic1er, mfdcr(uic1er) & ~UIC_MASK(vec)); mtdcr(uic1er, mfdcr(uic1er) & ~UIC_MASK(vec));
#endif
#if (UIC_MAX > 2)
else if ((vec >= 64) && (vec < 96)) else if ((vec >= 64) && (vec < 96))
mtdcr(uic2er, mfdcr(uic2er) & ~UIC_MASK(vec)); mtdcr(uic2er, mfdcr(uic2er) & ~UIC_MASK(vec));
#endif
#if (UIC_MAX > 3)
else if (vec >= 96) else if (vec >= 96)
mtdcr(uic3er, mfdcr(uic3er) & ~UIC_MASK(vec)); mtdcr(uic3er, mfdcr(uic3er) & ~UIC_MASK(vec));
#endif
} }

10
drivers/serial/serial_xuartlite.c
View file

@ -56,8 +56,8 @@ void serial_putc(const char c)
{ {
if (c == '\n') if (c == '\n')
serial_putc('\r'); serial_putc('\r');
while (in_be32(UARTLITE_STATUS) & SR_TX_FIFO_FULL); while (in_be32((void *)UARTLITE_STATUS) & SR_TX_FIFO_FULL);
out_be32(UARTLITE_TX_FIFO, (unsigned char) (c & 0xff)); out_be32((void *)UARTLITE_TX_FIFO, (unsigned char) (c & 0xff));
} }
void serial_puts(const char * s) void serial_puts(const char * s)
@ -69,13 +69,13 @@ void serial_puts(const char * s)
int serial_getc(void) int serial_getc(void)
{ {
while (!(in_be32(UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA)); while (!(in_be32((void *)UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA));
return in_be32(UARTLITE_RX_FIFO) & 0xff; return in_be32((void *)UARTLITE_RX_FIFO) & 0xff;
} }
int serial_tstc(void) int serial_tstc(void)
{ {
return (in_be32(UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA); return (in_be32((void *)UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA);
} }
#endif /* CONFIG_MICROBLZE */ #endif /* CONFIG_MICROBLZE */