diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2010-01-16 12:48:59 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2010-01-16 12:48:59 +0000 |
| commit | 20f7f8e90e993018da30785b049f4278d7e2868e (patch) | |
| tree | 72ce447b14d9a05a875d2ea39a246aba5e7c00f2 /sys/dev | |
| parent | 598d29e4c752131e7fe110ef81ddbe1423bb6028 (diff) | |
rename bluetooth coexistence flags. no binary change.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwnreg.h | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index ff52126b8cb..d6429226134 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.80 2010/01/16 12:42:17 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.81 2010/01/16 12:48:58 damien Exp $ */ /*- * Copyright (c) 2007-2009 Damien Bergamini <damien.bergamini@free.fr> @@ -4107,7 +4107,7 @@ iwn_config(struct iwn_softc *sc) /* Configure bluetooth coexistence. */ memset(&bluetooth, 0, sizeof bluetooth); - bluetooth.flags = IWN_BT_COEX_MODE_4WIRE; + bluetooth.flags = IWN_BT_COEX_CHAN_ANN | IWN_BT_COEX_BT_PRIO; bluetooth.lead_time = IWN_BT_LEAD_TIME_DEF; bluetooth.max_kill = IWN_BT_MAX_KILL_DEF; DPRINTF(("configuring bluetooth coexistence\n")); diff --git a/sys/dev/pci/if_iwnreg.h b/sys/dev/pci/if_iwnreg.h index 1bfc4a70155..84b1d1351d4 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.34 2009/11/08 11:54:48 damien Exp $ */ +/* $OpenBSD: if_iwnreg.h,v 1.35 2010/01/16 12:48:58 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -828,10 +828,9 @@ struct iwn5000_cmd_txpower { /* Structure for command IWN_CMD_BLUETOOTH. */ struct iwn_bluetooth { uint8_t flags; -#define IWN_BT_COEX_DISABLE 0 -#define IWN_BT_COEX_MODE_2WIRE 1 -#define IWN_BT_COEX_MODE_3WIRE 2 -#define IWN_BT_COEX_MODE_4WIRE 3 +#define IWN_BT_COEX_CHAN_ANN (1 << 0) +#define IWN_BT_COEX_BT_PRIO (1 << 1) +#define IWN_BT_COEX_2_WIRE (1 << 2) uint8_t lead_time; #define IWN_BT_LEAD_TIME_DEF 30 |