diff options
| -rw-r--r-- | sys/dev/pci/if_msk.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_skreg.h | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 3f3e954e27c..2aa1cf3816c 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.12 2006/08/19 04:03:22 brad Exp $ */ +/* $OpenBSD: if_msk.c,v 1.13 2006/08/19 21:16:22 kettenis Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -829,6 +829,10 @@ void msk_reset(struct sk_softc *sc) /* Disable descriptor polling */ CSR_WRITE_4(sc, SK_DPT_TIMER_CTRL, SK_DPT_TCTL_STOP); + /* Disable time stamps */ + CSR_WRITE_1(sc, SK_TSTAMP_CTL, SK_TSTAMP_STOP); + CSR_WRITE_1(sc, SK_TSTAMP_CTL, SK_TSTAMP_IRQ_CLEAR); + /* Enable RAM interface */ sk_win_write_1(sc, SK_RAMCTL, SK_RAMCTL_UNRESET); for (reg = SK_TO0;reg <= SK_TO11; reg++) diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h index 31c8f1c691d..243dc8e6052 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.37 2006/08/16 21:06:23 kettenis Exp $ */ +/* $OpenBSD: if_skreg.h,v 1.38 2006/08/19 21:16:22 kettenis Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1202,6 +1202,13 @@ #define SK_DPT_TTEST_OFF 0x0002 /* Test Mode Off */ #define SK_DPT_TTEST_ON 0x0004 /* Test Mode On */ +#define SK_TSTAMP_COUNT 0x0e14 +#define SK_TSTAMP_CTL 0x0e18 + +#define SK_TSTAMP_IRQ_CLEAR 0x01 +#define SK_TSTAMP_STOP 0x02 +#define SK_TSTAMP_START 0x04 + #define SK_Y2_ASF_CSR 0x0e68 #define SK_Y2_ASF_RESET 0x08 |