diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2005-12-30 19:47:40 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2005-12-30 19:47:40 +0000 |
| commit | 4ffa4b1cb93d540b0b57702783b4c009e48e1ebd (patch) | |
| tree | 058b4b35296e3152776ce047693918cdf4d9ca2c /sys/dev/ic | |
| parent | 59186e41369608855681212e555f620400f125ca (diff) | |
Properly detect AS99127F rev 1.
From Jonathan Fromer <jf@daimi.au.dk>.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/nslm7x.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/nslm7xvar.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ic/nslm7x.c b/sys/dev/ic/nslm7x.c index b1b47640763..9b40ad30f53 100644 --- a/sys/dev/ic/nslm7x.c +++ b/sys/dev/ic/nslm7x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nslm7x.c,v 1.11 2005/12/30 09:45:20 kettenis Exp $ */ +/* $OpenBSD: nslm7x.c,v 1.12 2005/12/30 19:47:39 kettenis Exp $ */ /* $NetBSD: nslm7x.c,v 1.17 2002/11/15 14:55:41 ad Exp $ */ /*- @@ -249,7 +249,7 @@ wb_match(struct lm_softc *sc) (*sc->lm_writereg)(sc, WB_BANKSEL, 0); j |= (*sc->lm_readreg)(sc, WB_VENDID); DPRINTF(("winbond vend id 0x%x\n", j)); - if (j != WB_VENDID_WINBOND) + if (j != WB_VENDID_WINBOND && j != WB_VENDID_ASUS) return 0; /* read device ID */ (*sc->lm_banksel)(sc, 0); diff --git a/sys/dev/ic/nslm7xvar.h b/sys/dev/ic/nslm7xvar.h index 705f130a1a8..db0a9ce1727 100644 --- a/sys/dev/ic/nslm7xvar.h +++ b/sys/dev/ic/nslm7xvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nslm7xvar.h,v 1.6 2005/12/30 09:45:20 kettenis Exp $ */ +/* $OpenBSD: nslm7xvar.h,v 1.7 2005/12/30 19:47:39 kettenis Exp $ */ /* $NetBSD: nslm7xvar.h,v 1.10 2002/11/15 14:55:42 ad Exp $ */ /*- @@ -88,6 +88,7 @@ #define WB_VENDID 0x4F /* vendor ID register */ #define WB_VENDID_WINBOND 0x5CA3 +#define WB_VENDID_ASUS 0x12C3 /* Bank0 regs */ #define WB_BANK0_CHIPID 0x58 #define WB_CHIPID_83781 0x10 |