diff options
Diffstat (limited to 'usr/src/uts/common/io/cardbus')
| -rw-r--r-- | usr/src/uts/common/io/cardbus/cardbus.c | 10 | ||||
| -rw-r--r-- | usr/src/uts/common/io/cardbus/cardbus_cfg.c | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/usr/src/uts/common/io/cardbus/cardbus.c b/usr/src/uts/common/io/cardbus/cardbus.c index ae82907c87..643549b5dc 100644 --- a/usr/src/uts/common/io/cardbus/cardbus.c +++ b/usr/src/uts/common/io/cardbus/cardbus.c @@ -58,7 +58,7 @@ #ifdef sparc #include <sys/ddi_subrdefs.h> -#elif defined(__x86) || defined(__amd64) +#elif defined(__x86) #include <sys/pci_intr_lib.h> #include <sys/mach_intr.h> #endif @@ -1092,7 +1092,7 @@ cardbus_init_child_regs(dev_info_t *child) { ddi_acc_handle_t config_handle; uint16_t command_preserve, command; -#if !defined(__i386) && !defined(__amd64) +#if !defined(__x86) uint8_t bcr; #endif uint8_t header_type; @@ -1139,7 +1139,7 @@ cardbus_init_child_regs(dev_info_t *child) pci_config_put16(config_handle, PCI_CONF_COMM, command); command = pci_config_get16(config_handle, PCI_CONF_COMM); -#if !defined(__i386) && !defined(__amd64) +#if !defined(__x86) /* * If the device has a bus control register then program it * based on the settings in the command register. @@ -1265,7 +1265,7 @@ cardbus_initchild(dev_info_t *rdip, dev_info_t *dip, dev_info_t *child, kmem_zalloc(sizeof (struct cardbus_parent_private_data), KM_SLEEP); -#elif defined(__x86) || defined(__amd64) +#elif defined(__x86) ppd = (struct cardbus_parent_private_data *) kmem_zalloc(sizeof (struct cardbus_parent_private_data) + sizeof (struct intrspec), KM_SLEEP); @@ -1369,7 +1369,7 @@ cardbus_removechild(dev_info_t *dip) ppd->ppd.par_nreg * sizeof (struct regspec)); #ifdef sparc kmem_free(ppd, sizeof (struct cardbus_parent_private_data)); -#elif defined(__x86) || defined(__amd64) +#elif defined(__x86) kmem_free(ppd, sizeof (struct cardbus_parent_private_data) + sizeof (struct intrspec)); #endif diff --git a/usr/src/uts/common/io/cardbus/cardbus_cfg.c b/usr/src/uts/common/io/cardbus/cardbus_cfg.c index c380a96c0e..e9027091e3 100644 --- a/usr/src/uts/common/io/cardbus/cardbus_cfg.c +++ b/usr/src/uts/common/io/cardbus/cardbus_cfg.c @@ -28,8 +28,6 @@ * From "@(#)pcicfg.c 1.31 99/06/18 SMI" */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Cardbus configurator */ @@ -1264,7 +1262,7 @@ cardbus_allocate_chunk(dev_info_t *dip, uint8_t type, uint8_t sec_bus) io_request->ra_len += cardbus_min_spare_io; if (io_request->ra_len) { -#if defined(__x86) || defined(__amd64) +#if defined(__x86) io_request->ra_boundbase = 0x1000; io_request->ra_boundlen = 0xefff; #else @@ -3229,7 +3227,7 @@ cardbus_config_setup(dev_info_t *dip, ddi_acc_handle_t *handle) cardbus_err(dip, 8, "cardbus_config_setup PCICFG_NODEVICE\n"); ret = PCICFG_NODEVICE; -#elif defined(__x86) || defined(__amd64) +#elif defined(__x86) if (ddi_get16(*handle, (uint16_t *)cfgaddr) == 0xffff) { cardbus_err(dip, 8, "cardbus_config_setup PCICFG_NODEVICE\n"); |