Deleted Added
sdiff udiff text old ( 220866 ) new ( 220891 )
full compact
if_iwnreg.h (220866) if_iwnreg.h (220891)
1/* $FreeBSD: head/sys/dev/iwn/if_iwnreg.h 220866 2011-04-19 19:47:41Z bschmidt $ */
1/* $FreeBSD: head/sys/dev/iwn/if_iwnreg.h 220891 2011-04-20 16:59:27Z bschmidt $ */
2/* $OpenBSD: if_iwnreg.h,v 1.40 2010/05/05 19:41:57 damien Exp $ */
3
4/*-
5 * Copyright (c) 2007, 2008
6 * Damien Bergamini <damien.bergamini@free.fr>
7 *
8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above

--- 419 unchanged lines hidden (view full) ---

429#define IWN_CMD_TXPOWER_DBM 149
430#define IWN_CMD_TXPOWER 151
431#define IWN5000_CMD_TX_ANT_CONFIG 152
432#define IWN_CMD_BT_COEX 155
433#define IWN_CMD_GET_STATISTICS 156
434#define IWN_CMD_SET_CRITICAL_TEMP 164
435#define IWN_CMD_SET_SENSITIVITY 168
436#define IWN_CMD_PHY_CALIB 176
2/* $OpenBSD: if_iwnreg.h,v 1.40 2010/05/05 19:41:57 damien Exp $ */
3
4/*-
5 * Copyright (c) 2007, 2008
6 * Damien Bergamini <damien.bergamini@free.fr>
7 *
8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above

--- 419 unchanged lines hidden (view full) ---

429#define IWN_CMD_TXPOWER_DBM 149
430#define IWN_CMD_TXPOWER 151
431#define IWN5000_CMD_TX_ANT_CONFIG 152
432#define IWN_CMD_BT_COEX 155
433#define IWN_CMD_GET_STATISTICS 156
434#define IWN_CMD_SET_CRITICAL_TEMP 164
435#define IWN_CMD_SET_SENSITIVITY 168
436#define IWN_CMD_PHY_CALIB 176
437#define IWN_CMD_BT_COEX_PRIOTABLE 204
438#define IWN_CMD_BT_COEX_PROT 205
437
438 uint8_t flags;
439 uint8_t idx;
440 uint8_t qid;
441 uint8_t data[136];
442} __packed;
443
444/* Antenna flags, used in various commands. */

--- 379 unchanged lines hidden (view full) ---

824
825 uint8_t flags;
826#define IWN5000_TXPOWER_NO_CLOSED (1 << 6)
827
828 int8_t srv_limit; /* in half-dBm */
829 uint8_t reserved;
830} __packed;
831
439
440 uint8_t flags;
441 uint8_t idx;
442 uint8_t qid;
443 uint8_t data[136];
444} __packed;
445
446/* Antenna flags, used in various commands. */

--- 379 unchanged lines hidden (view full) ---

826
827 uint8_t flags;
828#define IWN5000_TXPOWER_NO_CLOSED (1 << 6)
829
830 int8_t srv_limit; /* in half-dBm */
831 uint8_t reserved;
832} __packed;
833
832/* Structure for command IWN_CMD_BLUETOOTH. */
834/* Structures for command IWN_CMD_BLUETOOTH. */
833struct iwn_bluetooth {
834 uint8_t flags;
835#define IWN_BT_COEX_CHAN_ANN (1 << 0)
836#define IWN_BT_COEX_BT_PRIO (1 << 1)
837#define IWN_BT_COEX_2_WIRE (1 << 2)
838
839 uint8_t lead_time;
840#define IWN_BT_LEAD_TIME_DEF 30
841
842 uint8_t max_kill;
843#define IWN_BT_MAX_KILL_DEF 5
844
845 uint8_t reserved;
846 uint32_t kill_ack;
847 uint32_t kill_cts;
848} __packed;
849
835struct iwn_bluetooth {
836 uint8_t flags;
837#define IWN_BT_COEX_CHAN_ANN (1 << 0)
838#define IWN_BT_COEX_BT_PRIO (1 << 1)
839#define IWN_BT_COEX_2_WIRE (1 << 2)
840
841 uint8_t lead_time;
842#define IWN_BT_LEAD_TIME_DEF 30
843
844 uint8_t max_kill;
845#define IWN_BT_MAX_KILL_DEF 5
846
847 uint8_t reserved;
848 uint32_t kill_ack;
849 uint32_t kill_cts;
850} __packed;
851
852struct iwn6000_btcoex_config {
853 uint8_t flags;
854 uint8_t lead_time;
855 uint8_t max_kill;
856 uint8_t bt3_t7_timer;
857 uint32_t kill_ack;
858 uint32_t kill_cts;
859 uint8_t sample_time;
860 uint8_t bt3_t2_timer;
861 uint16_t bt4_reaction;
862 uint32_t lookup_table[12];
863 uint16_t bt4_decision;
864 uint16_t valid;
865 uint8_t prio_boost;
866 uint8_t tx_prio_boost;
867 uint16_t rx_prio_boost;
868} __packed;
869
870struct iwn_btcoex_priotable {
871 uint8_t calib_init1;
872 uint8_t calib_init2;
873 uint8_t calib_periodic_low1;
874 uint8_t calib_periodic_low2;
875 uint8_t calib_periodic_high1;
876 uint8_t calib_periodic_high2;
877 uint8_t dtim;
878 uint8_t scan52;
879 uint8_t scan24;
880 uint8_t reserved[7];
881} __packed;
882
883struct iwn_btcoex_prot {
884 uint8_t open;
885 uint8_t type;
886 uint8_t reserved[2];
887} __packed;
888
850/* Structure for command IWN_CMD_SET_CRITICAL_TEMP. */
851struct iwn_critical_temp {
852 uint32_t reserved;
853 uint32_t tempM;
854 uint32_t tempR;
855/* degK <-> degC conversion macros. */
856#define IWN_CTOK(c) ((c) + 273)
857#define IWN_KTOC(k) ((k) - 273)

--- 905 unchanged lines hidden --- 		889/* Structure for command IWN_CMD_SET_CRITICAL_TEMP. */
890struct iwn_critical_temp {
891 uint32_t reserved;
892 uint32_t tempM;
893 uint32_t tempR;
894/* degK <-> degC conversion macros. */
895#define IWN_CTOK(c) ((c) + 273)
896#define IWN_KTOC(k) ((k) - 273)

--- 905 unchanged lines hidden ---