aboutsummaryrefslogtreecommitdiff
path: root/sys/pccard
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2001-08-21 07:38:13 +0000
committerWarner Losh <imp@FreeBSD.org>2001-08-21 07:38:13 +0000
commitabd21a20119784048ce6f0021645b63160f873e8 (patch)
tree081ae36d225a9e596afd9e3fcaa21c95dc6a8585 /sys/pccard
parent6db5812aefcfec7ab38bb4bc8b4016c2c7b55e84 (diff)
downloadsrc-abd21a20119784048ce6f0021645b63160f873e8.tar.gz
src-abd21a20119784048ce6f0021645b63160f873e8.zip
These appear to be necessary for a pci cardbus card, but not for laptops.
Ifdef them out until I figure out the right way to configure this. This solves Nate's hangs as well as Anders Andersson's. MCF: Soon.
Notes
Notes: svn path=/head/; revision=82032
Diffstat (limited to 'sys/pccard')
-rw-r--r--sys/pccard/pcic_pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c
index e48e0f79d25a..d6b5654ebfdd 100644
--- a/sys/pccard/pcic_pci.c
+++ b/sys/pccard/pcic_pci.c
@@ -334,10 +334,12 @@ pcic_pci_ti_init(device_t dev)
* Takeshi Shibagaki(shiba@jp.freebsd.org)
*/
if (sc->func_route >= pci_parallel) {
+#ifdef PCI_CARDBUS_CARD
devcntl &= ~TI113X_DEVCNTL_INTR_MASK;
pci_write_config(dev, TI113X_PCI_DEVICE_CONTROL, devcntl, 1);
devcntl = pci_read_config(dev, TI113X_PCI_DEVICE_CONTROL, 1);
syscntl |= TI113X_SYSCNTL_INTRTIE;
+#endif
syscntl &= ~TI113X_SYSCNTL_SMIENB;
pci_write_config(dev, TI113X_PCI_SYSTEM_CONTROL, syscntl, 1);
}