diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-03-27 10:16:18 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-03-27 10:16:18 +0000 |
| commit | 0589a69ab89c165230be39638d4c16ce45d26f29 (patch) | |
| tree | 9d7fce56dc46f473c6dd8dac29252a440c8f8862 /sys/dev | |
| parent | 91842df480a0dbfff36db8eb626b2c6c2d26af70 (diff) | |
add definitions for more yukon 2 revisions found in linux driver
(which tend to be required to know which of the many bugs we will need
to work around before each particular revision of hardware will
actually work).
ok kettenis@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 38 | ||||
| -rw-r--r-- | sys/dev/pci/if_skreg.h | 13 |
2 files changed, 49 insertions, 2 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 8c88c4c9e47..e420c075229 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.72 2009/03/23 21:58:54 kettenis Exp $ */ +/* $OpenBSD: if_msk.c,v 1.73 2009/03/27 10:16:17 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1246,11 +1246,47 @@ mskc_attach(struct device *parent, struct device *self, void *aux) case SK_YUKON_EC_U_REV_A1: revstr = "A1"; break; + case SK_YUKON_EC_U_REV_B0: + revstr = "B0"; + break; + default: + ; + } + } + + if (sc->sk_type == SK_YUKON_FE) { + switch (sc->sk_rev) { + case SK_YUKON_FE_REV_A1: + revstr = "A1"; + break; + case SK_YUKON_FE_REV_A2: + revstr = "A2"; + break; default: ; } } + if (sc->sk_type == SK_YUKON_FE_P && sc->sk_rev == SK_YUKON_FE_P_REV_A0) + revstr = "A0"; + + if (sc->sk_type == SK_YUKON_EX) { + switch (sc->sk_rev) { + case SK_YUKON_EX_REV_A0: + revstr = "A0"; + break; + case SK_YUKON_EX_REV_B0: + revstr = "B0"; + break; + default: + ; + } + } + + if (sc->sk_type == SK_YUKON_SUPR && sc->sk_rev == SK_YUKON_SUPR_REV_A0) + revstr = "A0"; + + /* Announce the product name. */ printf(", %s", sc->sk_name); if (revstr != NULL) diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h index a97aaaa7a5b..2df4e59d857 100644 --- a/sys/dev/pci/if_skreg.h +++ b/sys/dev/pci/if_skreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_skreg.h,v 1.51 2009/03/16 12:47:35 deraadt Exp $ */ +/* $OpenBSD: if_skreg.h,v 1.52 2009/03/27 10:16:17 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -377,6 +377,17 @@ #define SK_YUKON_EC_U_REV_A0 0x1 #define SK_YUKON_EC_U_REV_A1 0x2 +#define SK_YUKON_EC_U_REV_B0 0x3 + +#define SK_YUKON_FE_REV_A1 0x1 +#define SK_YUKON_FE_REV_A2 0x2 + +#define SK_YUKON_FE_P_REV_A0 0x0 + +#define SK_YUKON_EX_REV_A0 0x1 +#define SK_YUKON_EX_REV_B0 0x2 + +#define SK_YUKON_SUPR_REV_A0 0x0 #define SK_IMCTL_IRQ_CLEAR 0x01 #define SK_IMCTL_STOP 0x02 |