Merge branch 'bugfix/fix_some_wifi_bugs_0617_v4.2' into 'release/v4.2'

fix some wifi bugs 0617 (backport v4.2)

See merge request espressif/esp-idf!9210
This commit is contained in:
Jiang Jiang Jian 2020-06-17 18:27:37 +08:00
commit 1f074d313b
7 changed files with 15 additions and 11 deletions

View file

@ -24,6 +24,10 @@ extern "C" {
#include "esp32/rom/crc.h"
#endif
#if defined(CONFIG_IDF_TARGET_ESP32S2)
#include "esp32s2/rom/crc.h"
#endif
/******************* Polynomials Used in the CRC APIs ****************************
* CRC-8 x8+x2+x1+1 0x07
* CRC16-CCITT x16+x12+x5+1 0x1021
@ -43,6 +47,7 @@ static inline uint32_t esp_crc32_le(uint32_t crc, uint8_t const *buf, uint32_t l
return crc32_le(crc, buf, len);
}
#if defined(CONFIG_IDF_TARGET_ESP32)
/**
* @brief CRC32 value in big endian.
*
@ -55,6 +60,7 @@ static inline uint32_t esp_crc32_be(uint32_t crc, uint8_t const *buf, uint32_t l
{
return crc32_be(crc, buf, len);
}
#endif
/**
* @brief CRC16 value in little endian.
@ -69,6 +75,7 @@ static inline uint16_t esp_crc16_le(uint16_t crc, uint8_t const *buf, uint32_t l
return crc16_le(crc, buf, len);
}
#if defined(CONFIG_IDF_TARGET_ESP32)
/**
* @brief CRC16 value in big endian.
*
@ -81,6 +88,7 @@ static inline uint16_t esp_crc16_be(uint16_t crc, uint8_t const *buf, uint32_t l
{
return crc16_be(crc, buf, len);
}
#endif
/**
* @brief CRC8 value in little endian.
@ -95,6 +103,7 @@ static inline uint8_t esp_crc8_le(uint8_t crc, uint8_t const *buf, uint32_t len)
return crc8_le(crc, buf, len);
}
#if defined(CONFIG_IDF_TARGET_ESP32)
/**
* @brief CRC8 value in big endian.
*
@ -107,6 +116,7 @@ static inline uint8_t esp_crc8_be(uint8_t crc, uint8_t const *buf, uint32_t len)
{
return crc8_be(crc, buf, len);
}
#endif
#ifdef __cplusplus
}

@ -1 +1 @@
Subproject commit d2c242d4a5d2fe2099dc8453df2c5b31297d7ff7
Subproject commit efee8ef3ae0070c802676ad8b87dc2243159686d

View file

@ -1,6 +1,3 @@
| Supported Targets | ESP32 |
| ----------------- | ----- |
# ESPNOW Example
(See the README.md file in the upper level 'examples' directory for more information about examples.)

View file

@ -1,6 +1,3 @@
| Supported Targets | ESP32 |
| ----------------- | ----- |
# Iperf Example
## Note about iperf version

View file

@ -1,6 +1,3 @@
| Supported Targets | ESP32 |
| ----------------- | ----- |
# Simple Sniffer Example
(See the README.md file in the upper level 'examples' directory for more information about examples.)

View file

@ -9,7 +9,8 @@ menu "Example Configuration"
choice SNIFFER_PCAP_DESTINATION
prompt "Select destination to store pcap file"
default SNIFFER_PCAP_DESTINATION_SD
default SNIFFER_PCAP_DESTINATION_SD if IDF_TARGET_ESP32
default SNIFFER_PCAP_DESTINATION_JTAG if IDF_TARGET_ESP32S2
help
Select where to store the pcap file.
Currently support storing files to SD card or to host via JTAG interface.

View file

@ -19,8 +19,10 @@
#include "esp_wifi.h"
#include "esp_err.h"
#include "esp_log.h"
#if CONFIG_SNIFFER_PCAP_DESTINATION_SD
#include "driver/sdmmc_host.h"
#include "driver/sdspi_host.h"
#endif
#include "nvs_flash.h"
#include "sdmmc_cmd.h"
#include "cmd_system.h"