alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/gcc8_compatibility' into 'master'

Browse Source 
gcc8 compatibility for master branch

See merge request idf/esp-idf!3481
This commit is contained in:
Angus Gratton 2018-10-22 11:11:04 +08:00
commit b964f389db
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/driver/test/test_spi_slave.c
View File

@ -9,6 +9,9 @@
#include "esp_log.h" #include "esp_log.h"
#include "sdkconfig.h" #include "sdkconfig.h"
#ifndef CONFIG_SPIRAM_SUPPORT
//This test should be removed once the timing test is merged.
#define PIN_NUM_MISO 25 #define PIN_NUM_MISO 25
#define PIN_NUM_MOSI 23 #define PIN_NUM_MOSI 23
#define PIN_NUM_CLK 19 #define PIN_NUM_CLK 19
@ -75,9 +78,6 @@ static void slave_init()
TEST_ESP_OK( spi_slave_initialize(VSPI_HOST, &buscfg, &slvcfg, 2) ); TEST_ESP_OK( spi_slave_initialize(VSPI_HOST, &buscfg, &slvcfg, 2) );
} }
#ifndef CONFIG_SPIRAM_SUPPORT
//This test should be removed once the timing test is merged.
TEST_CASE("test slave startup","[spi]") TEST_CASE("test slave startup","[spi]")
{ {
uint8_t master_txbuf[320]=MASTER_SEND; uint8_t master_txbuf[320]=MASTER_SEND;
@ -144,4 +144,4 @@ TEST_CASE("test slave startup","[spi]")
ESP_LOGI(MASTER_TAG, "test passed."); ESP_LOGI(MASTER_TAG, "test passed.");
} }
#endif #endif // !CONFIG_SPIRAM_SUPPORT

7
components/esp32/intr_alloc.c
View File

@ -706,13 +706,18 @@ esp_err_t IRAM_ATTR esp_intr_set_in_iram(intr_handle_t handle, bool is_in_iram)
return ESP_OK; return ESP_OK;
} }
static void esp_intr_free_cb(void *arg)
{
(void)esp_intr_free((intr_handle_t)arg);
}
esp_err_t esp_intr_free(intr_handle_t handle) esp_err_t esp_intr_free(intr_handle_t handle)
{ {
bool free_shared_vector=false; bool free_shared_vector=false;
if (!handle) return ESP_ERR_INVALID_ARG; if (!handle) return ESP_ERR_INVALID_ARG;
//Assign this routine to the core where this interrupt is allocated on. //Assign this routine to the core where this interrupt is allocated on.
if (handle->vector_desc->cpu!=xPortGetCoreID()) { if (handle->vector_desc->cpu!=xPortGetCoreID()) {
esp_err_t ret = esp_ipc_call_blocking(handle->vector_desc->cpu, (esp_ipc_func_t)&esp_intr_free, (void *)handle); esp_err_t ret = esp_ipc_call_blocking(handle->vector_desc->cpu, &esp_intr_free_cb, (void *)handle);
return ret == ESP_OK ? ESP_OK : ESP_FAIL; return ret == ESP_OK ? ESP_OK : ESP_FAIL;
} }
portENTER_CRITICAL(&spinlock); portENTER_CRITICAL(&spinlock);

4
components/mqtt/component.mk
View File

@ -2,7 +2,3 @@ COMPONENT_SUBMODULES += esp-mqtt
COMPONENT_ADD_INCLUDEDIRS := esp-mqtt/include COMPONENT_ADD_INCLUDEDIRS := esp-mqtt/include
COMPONENT_SRCDIRS := esp-mqtt esp-mqtt/lib COMPONENT_SRCDIRS := esp-mqtt esp-mqtt/lib
COMPONENT_PRIV_INCLUDEDIRS := esp-mqtt/lib/include COMPONENT_PRIV_INCLUDEDIRS := esp-mqtt/lib/include
ifeq ($(GCC_NOT_5_2_0), 1)
esp-mqtt/lib/transport_ws.o: CFLAGS += -Wno-format-overflow
endif

2
components/pthread/test/test_pthread.c
View File

@ -22,7 +22,7 @@ TEST_CASE("pthread create join", "[pthread]")
volatile int num = 7; volatile int num = 7;
volatile bool attr_init = false; volatile bool attr_init = false;
void *thread_rval = NULL; void *thread_rval = NULL;
pthread_t new_thread = NULL; pthread_t new_thread = (pthread_t)NULL;
pthread_attr_t attr; pthread_attr_t attr;
if (TEST_PROTECT()) { if (TEST_PROTECT()) {

4
docs/en/get-started/index.rst
View File

@ -326,7 +326,7 @@ Some environment variables can be specified whilst calling ``make`` allowing use
+=================+==============================================================+ +=================+==============================================================+
| ``ESPPORT`` | Overrides the serial port used in ``flash`` and ``monitor``. | | ``ESPPORT`` | Overrides the serial port used in ``flash`` and ``monitor``. |
| | | | | |
| | Examples: ``make flash ESPPORT=/dev/tty/USB0``, | | | Examples: ``make flash ESPPORT=/dev/ttyUSB1``, |
| | ``make monitor ESPPORT=COM1`` | | | ``make monitor ESPPORT=COM1`` |
+-----------------+--------------------------------------------------------------+ +-----------------+--------------------------------------------------------------+
| ``ESPBAUD`` | Overrides the serial baud rate when flashing the ESP32. | | ``ESPBAUD`` | Overrides the serial baud rate when flashing the ESP32. |
@ -339,7 +339,7 @@ Some environment variables can be specified whilst calling ``make`` allowing use
+-----------------+--------------------------------------------------------------+ +-----------------+--------------------------------------------------------------+
.. note:: .. note::
Users can export environment variables (e.g. ``export ESPPORT=/dev/tty/USB0``). Users can export environment variables (e.g. ``export ESPPORT=/dev/ttyUSB1``).
All subsequent calls of ``make`` within the same terminal session will use All subsequent calls of ``make`` within the same terminal session will use
the exported value given that the variable is not simultaneously overridden. the exported value given that the variable is not simultaneously overridden.