diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-10-28 18:42:48 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-10-28 18:42:48 +0000 |
| commit | 2ab8ddcf6d1c04e4a97b67f3cb343c19ce09a972 (patch) | |
| tree | 9b70022b64e56f03e222d35d36ace7bc9a292550 /sys/dev/pci/if_iwnreg.h | |
| parent | 6888a40feb5e56d47728d957ac0808a3d8aebbd7 (diff) | |
- use bus_space_write_1 to write to IWN_INT_PERIODIC (0x5), even though
bus_space_write_4 worked
- store enhanced power info in softc for 6000 Series
- fix a comment, remove an unused field in softc and reorder pci ids a bit
while i'm here
Diffstat (limited to 'sys/dev/pci/if_iwnreg.h')
| -rw-r--r-- | sys/dev/pci/if_iwnreg.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwnreg.h b/sys/dev/pci/if_iwnreg.h index 06a1b079565..5d7362ce445 100644 --- a/sys/dev/pci/if_iwnreg.h +++ b/sys/dev/pci/if_iwnreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwnreg.h,v 1.30 2009/10/26 17:55:29 damien Exp $ */ +/* $OpenBSD: if_iwnreg.h,v 1.31 2009/10/28 18:42:47 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -57,7 +57,7 @@ */ #define IWN_HW_IF_CONFIG 0x000 #define IWN_INT_COALESCING 0x004 -#define IWN_INT_PERIODIC 0x005 /* XXX fixme */ +#define IWN_INT_PERIODIC 0x005 /* use IWN_WRITE_1 */ #define IWN_INT 0x008 #define IWN_INT_MASK 0x00c #define IWN_FH_INT 0x010 @@ -1625,6 +1625,9 @@ static const char * const iwn_fw_errmsg[] = { #define IWN_WRITE(sc, reg, val) \ bus_space_write_4((sc)->sc_st, (sc)->sc_sh, (reg), (val)) +#define IWN_WRITE_1(sc, reg, val) \ + bus_space_write_1((sc)->sc_st, (sc)->sc_sh, (reg), (val)) + #define IWN_SETBITS(sc, reg, mask) \ IWN_WRITE(sc, reg, IWN_READ(sc, reg) | (mask)) |