Consolidate bool type

[karo-tx-uboot.git] / board / mpl / common / isa.c

diff --git a/board/mpl/common/isa.c b/board/mpl/common/isa.c
index 5d467b48dc30fab456e11e628a73398b5e19aa5c..66724edf57c87bbd60b8792734643fe75ca5a3d5 100644 (file)
--- a/board/mpl/common/isa.c
+++ b/board/mpl/common/isa.c
@@ -41,13 +41,6 @@
 #define PRINTF(fmt,args...)
 #endif
 
-#ifndef        TRUE
-#define TRUE            1
-#endif
-#ifndef FALSE
-#define FALSE           0
-#endif
-
 #if defined(CONFIG_PIP405)
 
 extern int drv_isa_kbd_init (void);
@@ -116,9 +109,9 @@ unsigned char open_cfg_super_IO(int address)
        out8(CONFIG_SYS_ISA_IO_BASE_ADDRESS | address,0x55); /* open config */
        out8(CONFIG_SYS_ISA_IO_BASE_ADDRESS | address,0x20); /* set address to DEV ID */
        if(in8(CONFIG_SYS_ISA_IO_BASE_ADDRESS | address | 0x1)==0x40) /* ok Device ID is correct */
-               return TRUE;
+               return true;
        else
-               return FALSE;
+               return false;
 }
 
 void close_cfg_super_IO(int address)
@@ -179,7 +172,7 @@ void isa_sio_loadtable(void)
 
 void isa_sio_setup(void)
 {
-       if(open_cfg_super_IO(SIO_CFG_PORT)==TRUE)
+       if (open_cfg_super_IO(SIO_CFG_PORT) == true)
        {
                isa_sio_loadtable();
                close_cfg_super_IO(0x3F0);
@@ -382,12 +375,12 @@ void init_8259A(void)
 int handle_isa_int(void)
 {
        unsigned long irqack;
-       unsigned char isr1,isr2,irq;
+       unsigned char irq;
        /* first we acknokledge the int via the PCI bus */
        irqack=in32(PCI_INT_ACK_ADDR);
        /* now we get the ISRs */
-       isr2=in8(ISR_2);
-       isr1=in8(ISR_1);
+       in8(ISR_2);
+       in8(ISR_1);
        irq=(unsigned char)irqack;
        irq-=32;
 /*     if((irq==7)&&((isr1&0x80)==0)) {