diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-01-02 00:17:33 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-01-02 00:17:33 +0000 |
| commit | 21a6c595cf47808e2eb97228220a07b2312fa9e2 (patch) | |
| tree | 0448a1c6ba0489ac8f7b63d4f415a834fe139e5f /sys | |
| parent | 6a6c82b3285dc7cc6ec64091cd688f144615cd97 (diff) | |
ugh, need this too for the last commit to sk(4).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_skreg.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h index dd378288d68..d464907cbc2 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.14 2004/11/16 17:45:54 brad Exp $ */ +/* $OpenBSD: if_skreg.h,v 1.15 2005/01/02 00:17:32 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -50,10 +50,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Values to keep the different chip revisions apart */ -#define SK_GENESIS 0 -#define SK_YUKON 1 - /* * GEnesis registers. The GEnesis chip has a 256-byte I/O window * but internally it has a 16K register space. This 16K space is @@ -311,6 +307,17 @@ #define SK_BLNKSTS 0x0179 #define SK_BLNKTST 0x017A +/* Values for SK_CHIPVER */ +#define SK_GENESIS 0x0A +#define SK_YUKON 0xB0 +#define SK_YUKON_LITE 0xB1 +#define SK_YUKON_LP 0xB2 +#define SK_YUKON_FAMILY(x) ((x) & 0xB0) +/* Known revisions in SK_CONFIG */ +#define SK_YUKON_LITE_REV_A0 0x0 /* invented, see test in skc_attach */ +#define SK_YUKON_LITE_REV_A1 0x3 +#define SK_YUKON_LITE_REV_A3 0x7 + #define SK_IMCTL_STOP 0x02 #define SK_IMCTL_START 0x04 @@ -1398,6 +1405,8 @@ struct sk_softc { struct resource *sk_irq; /* IRQ resource handle */ struct resource *sk_res; /* I/O or shared mem handle */ u_int8_t sk_type; + u_int8_t sk_rev; + char *sk_name; char *sk_vpd_prodname; char *sk_vpd_readonly; u_int32_t sk_rboff; /* RAMbuffer offset */ |