Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

After reading the 21143 manual again, make sure SNOOZE is cleared in

Browse Source 
the CFDA register, too.
This commit is contained in:
thorpej 1999-12-07 07:36:19 +00:00
parent 6e36651a27
commit 546480874c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/cardbus/if_tlp_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tlp_cardbus.c,v 1.3 1999/12/07 07:33:25 thorpej Exp $ */
/* $NetBSD: if_tlp_cardbus.c,v 1.4 1999/12/07 07:36:19 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -103,6 +103,7 @@
#define TULIP_PCI_CFDA 0x40 /* configuration driver area */
#define CFDA_SLEEP 0x80000000 /* sleep mode */
#define CFDA_SNOOZE 0x40000000 /* snooze mode */
struct tulip_cardbus_softc {
struct tulip_softc sc_tulip; /* real Tulip softc */
@ -237,9 +238,9 @@ tlp_cardbus_attach(parent, self, aux)
* Clear the "sleep mode" bit in the CFDA register.
*/
reg = cardbus_conf_read(cc, cf, ca->ca_tag, TULIP_PCI_CFDA);
if (reg & CFDA_SLEEP)
if (reg & (CFDA_SLEEP|CFDA_SNOOZE))
cardbus_conf_write(cc, cf, ca->ca_tag, TULIP_PCI_CFDA,
reg & ~CFDA_SLEEP);
reg & ~(CFDA_SLEEP|CFDA_SNOOZE));
break;
default:

7
sys/dev/pci/if_tlp_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tlp_pci.c,v 1.25 1999/12/07 07:32:58 thorpej Exp $ */
/* $NetBSD: if_tlp_pci.c,v 1.26 1999/12/07 07:36:20 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -96,6 +96,7 @@
#define TULIP_PCI_CFDA 0x40 /* configuration driver area */
#define CFDA_SLEEP 0x80000000 /* sleep mode */
#define CFDA_SNOOZE 0x40000000 /* snooze mode */
struct tulip_pci_softc {
struct tulip_softc sc_tulip; /* real Tulip softc */
@ -455,9 +456,9 @@ tlp_pci_attach(parent, self, aux)
* Clear the "sleep mode" bit in the CFDA register.
*/
reg = pci_conf_read(pc, pa->pa_tag, TULIP_PCI_CFDA);
if (reg & CFDA_SLEEP)
if (reg & (CFDA_SLEEP|CFDA_SNOOZE))
pci_conf_write(pc, pa->pa_tag, TULIP_PCI_CFDA,
reg & ~CFDA_SLEEP);
reg & ~(CFDA_SLEEP|CFDA_SNOOZE));
break;
default: