ieee802.11: Bring some BSD licensed header files in from FreeBSD.

include/nuttx/analog/ltc1867l.h

@@ -97,12 +97,12 @@ enum ltc1867l_analog_input_mode_e
   LTC1867L_BIPOLAR = 0,
 };
 
-struct ltc1867l_channel_config_s
+begin_packed_struct struct ltc1867l_channel_config_s
 {
   uint8_t channel;                                                     /* This will be the channel number returned in struct adc_msg_s for a conversion */
   enum ltc1867l_analog_multiplexer_config_e analog_multiplexer_config; /* Analog multiplexer configuration */
   enum ltc1867l_analog_input_mode_e analog_inputMode;                  /* Analog input mode */
-} packed_struct;
+} end_packed_struct;
 
 /****************************************************************************
  * Public Function Prototypes

include/nuttx/sensors/lis2dh.h

@@ -273,25 +273,25 @@ enum lis2dh_interrupt_mode
   LIS2DH_6D_POSITION = 0xc0,
 };
 
-struct lis2dh_vector_s
+begin_packed_struct struct lis2dh_vector_s
 {
   int16_t  x, y, z;
-} packed_struct;
+} end_packed_struct;
 
-struct lis2dh_res_header
+begin_packed_struct struct lis2dh_res_header
 {
   uint8_t meas_count;
   bool    int1_occurred;
   uint8_t int1_source;
   bool    int2_occurred;
   uint8_t int2_source;
-} packed_struct;
+} end_packed_struct;
 
-struct lis2dh_result
+begin_packed_struct struct lis2dh_result
 {
   struct lis2dh_res_header header;
   struct lis2dh_vector_s measurements[0];
-} packed_struct;
+} end_packed_struct;
 
 struct lis2dh_setup
 {
@@ -402,12 +402,12 @@ struct lis2dh_config_s
   CODE bool (*read_int2_pin)(void);
 };
 
-struct lis2dh_raw_data_s
+begin_packed_struct struct lis2dh_raw_data_s
 {
   uint16_t out_x;
   uint16_t out_y;
   uint16_t out_z;
-} packed_struct;
+} end_packed_struct;
 
 typedef struct lis2dh_raw_data_s lis2dh_raw_data_t;
 

include/nuttx/wireless/ieee80211/ieee80211_cypto.h

@@ -0,0 +1,119 @@
+/****************************************************************************
+ * net/ieee80211/ieee80211_crypto.h
+ * 802.11 protocol crypto-related definitions.
+ *
+ * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ ****************************************************************************/
+
+#ifndef __NET_IEEE80211_IEEE80211_CRYPTO_H
+#define __NET_IEEE80211_IEEE80211_CRYPTO_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define IEEE80211_KEYBUF_SIZE    16
+
+#define IEEE80211_TKIP_HDRLEN    8
+#define IEEE80211_TKIP_MICLEN    8
+#define IEEE80211_TKIP_ICVLEN    4
+#define IEEE80211_CCMP_HDRLEN    8
+#define IEEE80211_CCMP_MICLEN    8
+
+#define IEEE80211_PMK_LEN    32
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* 802.11 ciphers */
+
+enum ieee80211_cipher
+{
+  IEEE80211_CIPHER_NONE      = 0x00000000,
+  IEEE80211_CIPHER_USEGROUP  = 0x00000001,
+  IEEE80211_CIPHER_WEP40     = 0x00000002,
+  IEEE80211_CIPHER_TKIP      = 0x00000004,
+  IEEE80211_CIPHER_CCMP      = 0x00000008,
+  IEEE80211_CIPHER_WEP104    = 0x00000010,
+  IEEE80211_CIPHER_BIP       = 0x00000020   /* 11w */
+};
+
+/* 802.11 Authentication and Key Management Protocols */
+
+enum ieee80211_akm
+{
+  IEEE80211_AKM_NONE         = 0x00000000,
+  IEEE80211_AKM_8021X        = 0x00000001,
+  IEEE80211_AKM_PSK          = 0x00000002,
+  IEEE80211_AKM_SHA256_8021X = 0x00000004,  /* 11w */
+  IEEE80211_AKM_SHA256_PSK   = 0x00000008   /* 11w */
+};
+
+struct ieee80211_key
+{
+  uint8_t k_id;                             /* Identifier (0-5) */
+  enum ieee80211_cipher k_cipher;
+  unsigned int k_flags;
+
+#define IEEE80211_KEY_GROUP    0x00000001   /* Group data key */
+#define IEEE80211_KEY_TX       0x00000002   /* Tx+Rx */
+#define IEEE80211_KEY_IGTK     0x00000004   /* Integrity group key */
+
+  unsigned int k_len;
+  uint64_t k_rsc[IEEE80211_NUM_TID];
+  uint64_t k_mgmt_rsc;
+  uint64_t k_tsc;
+  uint8_t k_key[32];
+  FAR void *k_priv;
+};
+
+/* Entry in the PMKSA cache */
+
+struct ieee80211_pmk
+{
+  sq_entry_t pmk_next;
+  enum ieee80211_akm pmk_akm;
+  uint32_t pmk_lifetime;
+
+#define IEEE80211_PMK_INFINITE  0
+
+  uint8_t pmk_pmkid[IEEE80211_PMKID_LEN];
+  uint8_t pmk_macaddr[IEEE80211_ADDR_LEN];
+  uint8_t pmk_key[IEEE80211_PMK_LEN];
+};
+
+/****************************************************************************
+ * Inline Functions
+ ****************************************************************************/
+
+static __inline int ieee80211_is_8021x_akm(enum ieee80211_akm akm)
+{
+  return akm == IEEE80211_AKM_8021X || akm == IEEE80211_AKM_SHA256_8021X;
+}
+
+static __inline int ieee80211_is_sha256_akm(enum ieee80211_akm akm)
+{
+  return akm == IEEE80211_AKM_SHA256_8021X || akm == IEEE80211_AKM_SHA256_PSK;
+}
+
+#endif /* __NET_IEEE80211_IEEE80211_CRYPTO_H */