mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/fix_spi_cs_hold_time_issue_v4.4' into 'release/v4.4' 

spi_master: fix spi cs_ena_posttrans issue (v4.4)

See merge request espressif/esp-idf!16686
pull/8460/head
Michael (XIAO Xufeng) 2022-02-10 09:12:15 +00:00
rodzic 38b5c012f9 1140036424
commit fb1695ade7
3 zmienionych plików z 14 dodań i 30 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
components/hal/esp32c3/include/hal/spi_ll.h
Wyświetl plik

@ -1,16 +1,8 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/******************************************************************************* /*******************************************************************************
* NOTICE * NOTICE
@ -758,7 +750,7 @@ static inline void spi_ll_set_miso_delay(spi_dev_t *hw, int delay_mode, int dela
*/ */
static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold) static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold)
{ {
hw->user1.cs_hold_time = hold - 1; hw->user1.cs_hold_time = hold;
hw->user.cs_hold = hold ? 1 : 0; hw->user.cs_hold = hold ? 1 : 0;
} }

4
components/hal/esp32s2/include/hal/spi_ll.h
Wyświetl plik

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -738,7 +738,7 @@ static inline void spi_ll_set_dummy(spi_dev_t *hw, int dummy_n)
*/ */
static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold) static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold)
{ {
hw->ctrl2.cs_hold_time = hold - 1; hw->ctrl2.cs_hold_time = hold;
hw->user.cs_hold = hold ? 1 : 0; hw->user.cs_hold = hold ? 1 : 0;
} }

20
components/hal/esp32s3/include/hal/spi_ll.h
Wyświetl plik

@ -1,16 +1,8 @@
// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/******************************************************************************* /*******************************************************************************
* NOTICE * NOTICE
@ -772,7 +764,7 @@ static inline void spi_ll_set_miso_delay(spi_dev_t *hw, int delay_mode, int dela
*/ */
static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold) static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold)
{ {
hw->user1.cs_hold_time = hold - 1; hw->user1.cs_hold_time = hold;
hw->user.cs_hold = hold ? 1 : 0; hw->user.cs_hold = hold ? 1 : 0;
} }