diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-05-27 18:00:14 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2014-06-10 12:44:19 -0700 |
| commit | 9bd2fd86c9d48f73041f148a6bfc88a7d57e386c (patch) | |
| tree | d82befb7a9040cff31c7a6c0ca9de80ddd344c82 | |
| parent | 424a9d0ac7615ca32990bdf49eafa68b2e052e20 (diff) | |
| download | libhardware_legacy-9bd2fd86c9d48f73041f148a6bfc88a7d57e386c.tar.gz | |
Fix build breaks caused by duplicate definitions
Some types are defined in link_layer_stats.h as well as rtt.h; this
change removes duplicate definitions
Change-Id: If1e16b7868c7ad7f9b5ca4d020d26df4c17daf0a
| -rw-r--r-- | include/hardware_legacy/link_layer_stats.h | 1 | ||||
| -rw-r--r-- | include/hardware_legacy/rtt.h | 38 | ||||
| -rw-r--r-- | include/hardware_legacy/wifi_hal.h | 2 |
3 files changed, 2 insertions, 39 deletions
diff --git a/include/hardware_legacy/link_layer_stats.h b/include/hardware_legacy/link_layer_stats.h index 38ec650..d5e9a67 100644 --- a/include/hardware_legacy/link_layer_stats.h +++ b/include/hardware_legacy/link_layer_stats.h @@ -24,6 +24,7 @@ typedef enum { WIFI_CHAN_WIDTH_80P80 = 4,
WIFI_CHAN_WIDTH_5 = 5,
WIFI_CHAN_WIDTH_10 = 6,
+ WIFI_CHAN_WIDTH_INVALID = -1
} wifi_channel_width;
typedef enum {
diff --git a/include/hardware_legacy/rtt.h b/include/hardware_legacy/rtt.h index b9d6299..63cd55c 100644 --- a/include/hardware_legacy/rtt.h +++ b/include/hardware_legacy/rtt.h @@ -5,16 +5,6 @@ #define __WIFI_HAL_RTT_H__ /* channel operating width */ -typedef enum { - WIFI_CHAN_WIDTH_INVALID = 0, - WIFI_CHAN_WIDTH_20 = 1, - WIFI_CHAN_WIDTH_40 = 2, - WIFI_CHAN_WIDTH_80 = 3, - WIFI_CHAN_WIDTH_160 = 4, - WIFI_CHAN_WIDTH_80_80 = 5, - WIFI_CHAN_WIDTH_5 = 6, - WIFI_CHAN_WIDTH_10 = 7 -} wifi_channel_width; /* Ranging status */ typedef enum { @@ -29,24 +19,6 @@ typedef enum { RTT_STATUS_ABORTED } wifi_rtt_status; -/* channel information */ -typedef struct { - wifi_channel_width width; // channel width (20, 40, 80, 80+80, 160) - wifi_channel center_freq; // primary 20 MHz channel - wifi_channel center_freq1; // center frequency (MHz) first segment - wifi_channel center_freq2; // center frequency (MHz) second segment, valid for 80+80 -} wifi_channel_info; - -/* wifi rate */ -typedef struct { - u32 preamble :3; // 0: OFDM, 1:CCK, 2:HT 3:VHT 4..7 reserved - u32 nss :2; // 0:1x1, 1:2x2, 3:3x3, 4:4x4 - u32 bw :3; // 0:20MHz, 1:40Mhz, 2:80Mhz, 3:160Mhz - u32 rateMcsIdx :8; // OFDM/CCK rate code would be as per ieee std in the units of 0.5mbps - // HT/VHT it would be mcs index - u32 reserved :16; // reserved - u32 bitrate; // units of 100 Kbps -} wifi_rate; /* RTT Type */ typedef enum { @@ -56,16 +28,6 @@ typedef enum { RTT_TYPE_AUTO, // Two sided if remote supports; one sided otherwise } wifi_rtt_type; -/* wifi peer device */ -typedef enum -{ - WIFI_PEER_STA, - WIFI_PEER_AP, - WIFI_PEER_P2P, - WIFI_PEER_NBD, - WIFI_PEER_INVALID, -} wifi_peer_type; - /* RTT configuration */ typedef struct { mac_addr addr; // peer device mac address diff --git a/include/hardware_legacy/wifi_hal.h b/include/hardware_legacy/wifi_hal.h index 30fd22c..cd79a2f 100644 --- a/include/hardware_legacy/wifi_hal.h +++ b/include/hardware_legacy/wifi_hal.h @@ -102,8 +102,8 @@ wifi_error wifi_reset_iface_event_handler(wifi_request_id id, wifi_interface_han /* include various feature headers */ #include "gscan.h" -#include "rtt.h" #include "link_layer_stats.h" +#include "rtt.h" #endif |