From e2ffd59b4d93c9149de1caaa087371b0cfc512c9 Mon Sep 17 00:00:00 2001 From: wdenk Date: Fri, 31 Dec 2004 09:32:47 +0000 Subject: * Code cleanup, mostly for GCC-3.3.x * Cleanup confusing use of CONFIG_ETH*ADDR - ust his only to pre-define a MAC address; use CONFIG_HAS_ETH* to enable support for additional ethernet addresses. * Cleanup drivers/i82365.c - avoid duplication of code * Fix bogus "cannot span across banks" flash error message * Add support for CompactFlash for the CPC45 Board. --- common/cmd_pcmcia.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'common/cmd_pcmcia.c') diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c index 1387e89..31f2ba2 100644 --- a/common/cmd_pcmcia.c +++ b/common/cmd_pcmcia.c @@ -67,6 +67,8 @@ #include #endif +#include + #if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || \ ((CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)) @@ -540,9 +542,18 @@ static int check_ide_device (int slot) ide_devices_found |= (1 << slot); +#if CONFIG_CPC45 +#else /* set I/O area in config reg -> only valid for ARGOSY D5!!! */ *((uchar *)(addr + config_base)) = 1; - +#endif +#if 0 + printf("\n## Config_base = %04x ###\n", config_base); + printf("Configuration Option Register: %02x @ %x\n", readb(addr + config_base), addr + config_base); + printf("Card Configuration and Status Register: %02x\n", readb(addr + config_base + 2)); + printf("Pin Replacement Register Register: %02x\n", readb(addr + config_base + 4)); + printf("Socket and Copy Register: %02x\n", readb(addr + config_base + 6)); +#endif return (0); } #endif /* CONFIG_IDE_8xx_PCCARD */ -- cgit v1.1