diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-12-16 20:19:35 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-12-16 20:19:35 +0000 |
| commit | d9cda5bc47d86fa0e38a8197c9c3354e5af31be9 (patch) | |
| tree | b322bcac30744a5c8d3b36226dd8d5fc4d90b8c5 /sys | |
| parent | 464a58ac078a701c775ce0a912672334bdbbca62 (diff) | |
Enable RAM buffer for the second port too; makes dual port cards work so
reenable attachment of the second port on cards that have it.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index ff9deb007bc..d9b9eff7e6e 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.31 2006/12/16 19:15:35 kettenis Exp $ */ +/* $OpenBSD: if_msk.c,v 1.32 2006/12/16 20:19:34 kettenis Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -860,6 +860,9 @@ void msk_reset(struct sk_softc *sc) sk_win_write_1(sc, SK_RAMCTL, SK_RAMCTL_UNRESET); for (reg = SK_TO0;reg <= SK_TO11; reg++) sk_win_write_1(sc, reg, 36); + sk_win_write_1(sc, SK_RAMCTL + (SK_WIN_LEN / 2), SK_RAMCTL_UNRESET); + for (reg = SK_TO0;reg <= SK_TO11; reg++) + sk_win_write_1(sc, reg + (SK_WIN_LEN / 2), 36); /* * Configure interrupt moderation. The moderation timer @@ -1330,13 +1333,11 @@ mskc_attach(struct device *parent, struct device *self, void *aux) sc->sk_macs = 1; hw = sk_win_read_1(sc, SK_Y2_HWRES); -#if notyet if ((hw & SK_Y2_HWRES_LINK_MASK) == SK_Y2_HWRES_LINK_DUAL) { if ((sk_win_read_1(sc, SK_Y2_CLKGATE) & SK_Y2_CLKGATE_LINK2_INACTIVE) == 0) sc->sk_macs++; } -#endif skca.skc_port = SK_PORT_A; skca.skc_type = sc->sk_type; |