18c18
< * $FreeBSD: head/sys/dev/ath/ath_hal/ah_regdomain.c 199491 2009-11-18 18:48:18Z rpaulo $
---
> * $FreeBSD: head/sys/dev/ath/ath_hal/ah_regdomain.c 219394 2011-03-08 07:42:09Z adrian $
30a31,32
> #include "ah_regdomain.h"
>
47,49c49
< #define BMLEN 2 /* 2 x 64 bits in each channel bitmask */
< typedef uint64_t chanbmask_t[BMLEN];
<
---
> /* BMLEN is now defined in ah_regdomain.h */
317,335d316
< typedef struct regDomainPair {
< HAL_REG_DOMAIN regDmnEnum; /* 16 bit reg domain pair */
< HAL_REG_DOMAIN regDmn5GHz; /* 5GHz reg domain */
< HAL_REG_DOMAIN regDmn2GHz; /* 2GHz reg domain */
< uint32_t flags5GHz; /* Requirements flags (AdHoc
< disallow, noise floor cal needed,
< etc) */
< uint32_t flags2GHz; /* Requirements flags (AdHoc
< disallow, noise floor cal needed,
< etc) */
< uint64_t pscanMask; /* Passive Scan flags which
< can override unitary domain
< passive scan flags. This
< value is used as a mask on
< the unitary flags*/
< uint16_t singleCC; /* Country code of single country if
< a one-on-one mapping exists */
< } REG_DMN_PAIR_MAPPING;
<
449,453d429
< typedef struct {
< HAL_CTRY_CODE countryCode;
< HAL_REG_DOMAIN regDmnEnum;
< } COUNTRY_CODE_TO_ENUM_RD;
<
617,631d592
< typedef struct {
< uint16_t lowChannel; /* Low channel center in MHz */
< uint16_t highChannel; /* High Channel center in MHz */
< uint8_t powerDfs; /* Max power (dBm) for channel
< range when using DFS */
< uint8_t antennaMax; /* Max allowed antenna gain */
< uint8_t channelBW; /* Bandwidth of the channel */
< uint8_t channelSep; /* Channel separation within
< the band */
< uint64_t useDfs; /* Use DFS in the RegDomain
< if corresponding bit is set */
< uint64_t usePassScan; /* Use Passive Scan in the RegDomain
< if corresponding bit is set */
< } REG_DMN_FREQ_BAND;
<
1012,1030d972
< typedef struct regDomain {
< uint16_t regDmnEnum; /* value from EnumRd table */
< uint8_t conformanceTestLimit;
< uint32_t flags; /* Requirement flags (AdHoc disallow,
< noise floor cal needed, etc) */
< uint64_t dfsMask; /* DFS bitmask for 5Ghz tables */
< uint64_t pscan; /* Bitmask for passive scan */
< chanbmask_t chan11a; /* 11a channels */
< chanbmask_t chan11a_turbo; /* 11a static turbo channels */
< chanbmask_t chan11a_dyn_turbo; /* 11a dynamic turbo channels */
< chanbmask_t chan11a_half; /* 11a 1/2 width channels */
< chanbmask_t chan11a_quarter; /* 11a 1/4 width channels */
< chanbmask_t chan11b; /* 11b channels */
< chanbmask_t chan11g; /* 11g channels */
< chanbmask_t chan11g_turbo; /* 11g dynamic turbo channels */
< chanbmask_t chan11g_half; /* 11g 1/2 width channels */
< chanbmask_t chan11g_quarter; /* 11g 1/4 width channels */
< } REG_DOMAIN;
<
1716,1720d1657
< struct cmode {
< u_int mode;
< u_int flags;
< };
<