input: Use finer grain udelays while waitng for the i8042 keyboard buffer to empty

[u-boot] / drivers / pcmcia / i82365.c

diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index a40fcf41c95b431456c1018f4db33f144f8df376..1cde83a763257126dcad35323138fd6d7e2ccb0b 100644 (file)
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -31,8 +31,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_I82365
-
 #include <command.h>
 #include <pci.h>
 #include <pcmcia.h>
@@ -274,11 +272,7 @@ static u_int cirrus_set_opts (socket_info_t * s)
 {
        cirrus_state_t *p = &s->c_state;
        u_int mask = 0xffff;
-#if DEBUG
-       char buf[200];
-
-       memset (buf, 0, 200);
-#endif
+       char buf[200] = {0};
 
        if (has_ring == -1)
                has_ring = 1;
@@ -911,8 +905,8 @@ int i82365_init (void)
        mem.map = 0;
        mem.flags = MAP_ATTRIB | MAP_ACTIVE;
        mem.speed = 300;
-       mem.sys_start = CFG_PCMCIA_MEM_ADDR;
-       mem.sys_stop = CFG_PCMCIA_MEM_ADDR + CFG_PCMCIA_MEM_SIZE - 1;
+       mem.sys_start = CONFIG_SYS_PCMCIA_MEM_ADDR;
+       mem.sys_stop = CONFIG_SYS_PCMCIA_MEM_ADDR + CONFIG_SYS_PCMCIA_MEM_SIZE - 1;
        mem.card_start = 0;
        i365_set_mem_map (&socket, &mem);
 
@@ -920,8 +914,8 @@ int i82365_init (void)
        mem.map = 1;
        mem.flags = MAP_ACTIVE;
        mem.speed = 300;
-       mem.sys_start = CFG_PCMCIA_MEM_ADDR + CFG_PCMCIA_MEM_SIZE;
-       mem.sys_stop = CFG_PCMCIA_MEM_ADDR + (2 * CFG_PCMCIA_MEM_SIZE) - 1;
+       mem.sys_start = CONFIG_SYS_PCMCIA_MEM_ADDR + CONFIG_SYS_PCMCIA_MEM_SIZE;
+       mem.sys_stop = CONFIG_SYS_PCMCIA_MEM_ADDR + (2 * CONFIG_SYS_PCMCIA_MEM_SIZE) - 1;
        mem.card_start = 0;
        i365_set_mem_map (&socket, &mem);
 
@@ -990,8 +984,8 @@ static void i82365_dump_regions (pci_dev_t dev)
 {
        u_int tmp[2];
        u_int *mem = (void *) socket.cb_phys;
-       u_char *cis = (void *) CFG_PCMCIA_MEM_ADDR;
-       u_char *ide = (void *) (CFG_ATA_BASE_ADDR + CFG_ATA_REG_OFFSET);
+       u_char *cis = (void *) CONFIG_SYS_PCMCIA_MEM_ADDR;
+       u_char *ide = (void *) (CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_REG_OFFSET);
 
        pci_read_config_dword (dev, 0x00, tmp + 0);
        pci_read_config_dword (dev, 0x80, tmp + 1);
@@ -1010,5 +1004,3 @@ static void i82365_dump_regions (pci_dev_t dev)
                ide[4], ide[5], ide[6], ide[7]);
 }
 #endif /* DEBUG */
-
-#endif /* CONFIG_I82365 */