mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
Merge branch 'contrib/github_pr_8812' into 'master'
usb_serial_jtag: make CONFIG_DEFAULT initializer match order of structure definition (GitHub PR) Closes IDFGH-7218 See merge request espressif/esp-idf!17886
This commit is contained in:
commit
080953ce02
@ -1,16 +1,8 @@
|
||||
// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// 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.
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
@ -33,8 +25,8 @@ typedef struct {
|
||||
} usb_serial_jtag_driver_config_t;
|
||||
|
||||
#define USB_SERIAL_JTAG_DRIVER_CONFIG_DEFAULT() (usb_serial_jtag_driver_config_t) {\
|
||||
.rx_buffer_size = 256,\
|
||||
.tx_buffer_size = 256,\
|
||||
.rx_buffer_size = 256,\
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -398,7 +398,6 @@ components/bt/host/bluedroid/stack/smp/smp_main.c
|
||||
components/bt/host/bluedroid/stack/smp/smp_utils.c
|
||||
components/console/linenoise/linenoise.c
|
||||
components/console/linenoise/linenoise.h
|
||||
components/driver/include/driver/usb_serial_jtag.h
|
||||
components/esp32/include/rom/aes.h
|
||||
components/esp32/include/rom/bigint.h
|
||||
components/esp32/include/rom/cache.h
|
||||
|
Loading…
Reference in New Issue
Block a user