kopia lustrzana https://github.com/espressif/esp-idf
usb_host: Rename struct/ll/hal files to use "usb_dwc" prefix
This commit updates the DWC_OTG based struct/ll/hal file names to use the prefix "usb_dwc". This naming scheme reduces ambiguity if another USB controller implementation is added. As a result, "hcd.c" has been renamed to "hcd_dwc.c"pull/10984/head
rodzic
9f3c0b1e38
commit
c06346da35
|
@ -68,7 +68,7 @@ if(NOT BOOTLOADER_BUILD)
|
||||||
"esp32s2/touch_sensor_hal.c"
|
"esp32s2/touch_sensor_hal.c"
|
||||||
"esp32s2/dac_hal.c"
|
"esp32s2/dac_hal.c"
|
||||||
"esp32s2/interrupt_descriptor_table.c"
|
"esp32s2/interrupt_descriptor_table.c"
|
||||||
"usbh_hal.c")
|
"usb_dwc_hal.c")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${target} STREQUAL "esp32s3")
|
if(${target} STREQUAL "esp32s3")
|
||||||
|
@ -90,7 +90,7 @@ if(NOT BOOTLOADER_BUILD)
|
||||||
"esp32s3/interrupt_descriptor_table.c"
|
"esp32s3/interrupt_descriptor_table.c"
|
||||||
"esp32s3/touch_sensor_hal.c"
|
"esp32s3/touch_sensor_hal.c"
|
||||||
"esp32s3/rtc_cntl_hal.c"
|
"esp32s3/rtc_cntl_hal.c"
|
||||||
"usbh_hal.c")
|
"usb_dwc_hal.c")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${target} STREQUAL "esp32c3")
|
if(${target} STREQUAL "esp32c3")
|
||||||
|
|
|
@ -2,7 +2,7 @@ COMPONENT_SRCDIRS := . esp32
|
||||||
COMPONENT_ADD_INCLUDEDIRS := esp32/include include platform_port/include
|
COMPONENT_ADD_INCLUDEDIRS := esp32/include include platform_port/include
|
||||||
COMPONENT_ADD_LDFRAGMENTS += linker.lf
|
COMPONENT_ADD_LDFRAGMENTS += linker.lf
|
||||||
|
|
||||||
COMPONENT_OBJEXCLUDE += ./spi_slave_hd_hal.o ./spi_flash_hal_gpspi.o ./spi_slave_hd_hal.o ./ds_hal.o ./gdma_hal.o ./lcd_hal.o ./systimer_hal.o ./usb_hal.o ./usbh_hal.o ./usb_phy_hal.o ./xt_wdt_hal.o
|
COMPONENT_OBJEXCLUDE += ./spi_slave_hd_hal.o ./spi_flash_hal_gpspi.o ./spi_slave_hd_hal.o ./ds_hal.o ./gdma_hal.o ./lcd_hal.o ./systimer_hal.o ./usb_hal.o ./usb_dwc_hal.o ./usb_phy_hal.o ./xt_wdt_hal.o
|
||||||
|
|
||||||
ifndef CONFIG_ETH_USE_ESP32_EMAC
|
ifndef CONFIG_ETH_USE_ESP32_EMAC
|
||||||
COMPONENT_OBJEXCLUDE += ./emac_hal.o
|
COMPONENT_OBJEXCLUDE += ./emac_hal.o
|
||||||
|
|
|
@ -17,8 +17,8 @@ NOTE: Thread safety is the responsibility fo the HAL user. All USB Host HAL
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "soc/usbh_struct.h"
|
#include "soc/usb_dwc_struct.h"
|
||||||
#include "hal/usbh_ll.h"
|
#include "hal/usb_dwc_ll.h"
|
||||||
#include "hal/usb_types_private.h"
|
#include "hal/usb_types_private.h"
|
||||||
#include "hal/assert.h"
|
#include "hal/assert.h"
|
||||||
|
|
|
@ -12,7 +12,7 @@ extern "C" {
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "soc/usbh_struct.h"
|
#include "soc/usb_dwc_struct.h"
|
||||||
#include "hal/usb_types_private.h"
|
#include "hal/usb_types_private.h"
|
||||||
#include "hal/misc.h"
|
#include "hal/misc.h"
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "sdkconfig.h"
|
#include "sdkconfig.h"
|
||||||
#include "hal/usbh_hal.h"
|
#include "hal/usb_dwc_hal.h"
|
||||||
#include "hal/usbh_ll.h"
|
#include "hal/usb_dwc_ll.h"
|
||||||
#include "hal/assert.h"
|
#include "hal/assert.h"
|
||||||
|
|
||||||
// ------------------------------------------------ Macros and Types ---------------------------------------------------
|
// ------------------------------------------------ Macros and Types ---------------------------------------------------
|
|
@ -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.
|
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
|
@ -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.
|
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
|
@ -4,7 +4,7 @@ set(priv_include)
|
||||||
set(priv_require)
|
set(priv_require)
|
||||||
|
|
||||||
if(CONFIG_USB_OTG_SUPPORTED)
|
if(CONFIG_USB_OTG_SUPPORTED)
|
||||||
list(APPEND srcs "hcd.c"
|
list(APPEND srcs "hcd_dwc.c"
|
||||||
"hub.c"
|
"hub.c"
|
||||||
"usb_helpers.c"
|
"usb_helpers.c"
|
||||||
"usb_host.c"
|
"usb_host.c"
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "esp_timer.h"
|
#include "esp_timer.h"
|
||||||
#include "esp_err.h"
|
#include "esp_err.h"
|
||||||
#include "esp_rom_gpio.h"
|
#include "esp_rom_gpio.h"
|
||||||
#include "hal/usbh_hal.h"
|
#include "hal/usb_dwc_hal.h"
|
||||||
#include "hal/usb_types_private.h"
|
#include "hal/usb_types_private.h"
|
||||||
#include "soc/gpio_pins.h"
|
#include "soc/gpio_pins.h"
|
||||||
#include "soc/gpio_sig_map.h"
|
#include "soc/gpio_sig_map.h"
|
Ładowanie…
Reference in New Issue