diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-03-23 11:44:01 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-03-23 11:44:01 +0000 |
| commit | 8346a32c855ddf516e5c720820ab83a2301a6a6c (patch) | |
| tree | 63939424531e2682c9e6b10bcd4cba12480e26cf | |
| parent | 17a92b7327bb5ec42b6b4ccef9d88f8532e35c9a (diff) | |
macppc seems to need a couple more casts before it will compile a
kernel after the cardbus rectification.
ok jsg@
| -rw-r--r-- | sys/dev/pci/pccbb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 6e06d9ababf..1866d42b147 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.71 2010/03/22 22:28:27 jsg Exp $ */ +/* $OpenBSD: pccbb.c,v 1.72 2010/03/23 11:44:00 krw Exp $ */ /* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */ /* @@ -2048,7 +2048,7 @@ pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t pch) /* power down the socket to reset it, clear the card reset pin */ - pccbb_power(sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V); + pccbb_power((pci_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V); /* * wait 200ms until power fails (Tpf). Then, wait 100ms since @@ -2064,7 +2064,7 @@ pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t pch) /* Power up the socket. */ power = Pcic_read(ph, PCIC_PWRCTL); Pcic_write(ph, PCIC_PWRCTL, (power & ~PCIC_PWRCTL_OE)); - pccbb_power(sc, voltage); + pccbb_power((pci_chipset_tag_t)sc, voltage); /* Now output enable */ power = Pcic_read(ph, PCIC_PWRCTL); @@ -2147,7 +2147,7 @@ pccbb_pcmcia_socket_disable(pcmcia_chipset_handle_t pch) power = Pcic_read(ph, PCIC_PWRCTL); power &= ~PCIC_PWRCTL_OE; Pcic_write(ph, PCIC_PWRCTL, power); - pccbb_power(sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V); + pccbb_power((pci_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V); /* * wait 300ms until power fails (Tpf). */ |