summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2022-03-11 09:57:35 +0700
committerhathach <[email protected]>2022-03-11 09:57:35 +0700
commita715077b1079993f4cd01bbf54b8166a6612b29b (patch)
treefcb5823931838b6b95ef3f60f98db948ee2a6a13
parent951ece17e1e26c297f3c05807271ab1ba56a2ada (diff)
remove usbh_control.c
-rw-r--r--examples/host/bare_api/Makefile1
-rw-r--r--examples/host/cdc_msc_hid/Makefile1
-rw-r--r--examples/host/hid_controller/Makefile1
-rw-r--r--examples/host/hid_to_cdc/Makefile3
-rw-r--r--hw/bsp/rp2040/family.cmake1
-rw-r--r--src/host/usbh_control.c85
6 files changed, 1 insertions, 91 deletions
diff --git a/examples/host/bare_api/Makefile b/examples/host/bare_api/Makefile
index c59369ffa..13e14df53 100644
--- a/examples/host/bare_api/Makefile
+++ b/examples/host/bare_api/Makefile
@@ -21,7 +21,6 @@ SRC_C += \
src/class/msc/msc_host.c \
src/host/hub.c \
src/host/usbh.c \
- src/host/usbh_control.c \
src/portable/ohci/ohci.c \
src/portable/nxp/lpc17_40/hcd_lpc17_40.c
diff --git a/examples/host/cdc_msc_hid/Makefile b/examples/host/cdc_msc_hid/Makefile
index ce0dd1a40..272acbac8 100644
--- a/examples/host/cdc_msc_hid/Makefile
+++ b/examples/host/cdc_msc_hid/Makefile
@@ -19,7 +19,6 @@ SRC_C += \
src/class/msc/msc_host.c \
src/host/hub.c \
src/host/usbh.c \
- src/host/usbh_control.c \
src/portable/ohci/ohci.c \
src/portable/nxp/lpc17_40/hcd_lpc17_40.c
diff --git a/examples/host/hid_controller/Makefile b/examples/host/hid_controller/Makefile
index c58df562b..06dc56914 100644
--- a/examples/host/hid_controller/Makefile
+++ b/examples/host/hid_controller/Makefile
@@ -22,7 +22,6 @@ SRC_C += \
src/class/msc/msc_host.c \
src/host/hub.c \
src/host/usbh.c \
- src/host/usbh_control.c \
src/portable/ohci/ohci.c \
src/portable/nxp/lpc17_40/hcd_lpc17_40.c
diff --git a/examples/host/hid_to_cdc/Makefile b/examples/host/hid_to_cdc/Makefile
index b62a383eb..3fe9b0888 100644
--- a/examples/host/hid_to_cdc/Makefile
+++ b/examples/host/hid_to_cdc/Makefile
@@ -14,7 +14,6 @@ CFLAGS += -Wno-error=cast-align -Wno-error=null-dereference
SRC_C += \
src/class/hid/hid_host.c \
src/host/hub.c \
- src/host/usbh.c \
- src/host/usbh_control.c
+ src/host/usbh.c
include ../../rules.mk
diff --git a/hw/bsp/rp2040/family.cmake b/hw/bsp/rp2040/family.cmake
index 1aa180ef8..e832c0756 100644
--- a/hw/bsp/rp2040/family.cmake
+++ b/hw/bsp/rp2040/family.cmake
@@ -83,7 +83,6 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
${TOP}/src/portable/raspberrypi/rp2040/hcd_rp2040.c
${TOP}/src/portable/raspberrypi/rp2040/rp2040_usb.c
${TOP}/src/host/usbh.c
- ${TOP}/src/host/usbh_control.c
${TOP}/src/host/hub.c
${TOP}/src/class/cdc/cdc_host.c
${TOP}/src/class/hid/hid_host.c
diff --git a/src/host/usbh_control.c b/src/host/usbh_control.c
deleted file mode 100644
index 38f03a8d2..000000000
--- a/src/host/usbh_control.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2020, Ha Thach (tinyusb.org)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * This file is part of the TinyUSB stack.
- */
-
-#include "tusb_option.h"
-
-#if CFG_TUH_ENABLED && 0
-
-#include "tusb.h"
-#include "usbh_classdriver.h"
-
-typedef struct
-{
- tusb_control_request_t request TU_ATTR_ALIGNED(4);
- uint8_t* buffer;
- tuh_control_complete_cb_t complete_cb;
-
- uint8_t daddr;
-} usbh_control_xfer_t;
-
-static usbh_control_xfer_t _xfer;
-static uint8_t _stage = CONTROL_STAGE_IDLE;
-
-//--------------------------------------------------------------------+
-// MACRO TYPEDEF CONSTANT ENUM DECLARATION
-//--------------------------------------------------------------------+
-
-uint8_t usbh_control_xfer_stage(void)
-{
- return _stage;
-}
-
-bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t const* request, void* buffer, tuh_control_complete_cb_t complete_cb)
-{
- // TODO need to claim the endpoint first
- const uint8_t rhport = usbh_get_rhport(dev_addr);
-
- _ctrl_xfer.xfer.daddr = dev_addr;
- _ctrl_xfer.xfer.request = (*request);
- _ctrl_xfer.xfer.buffer = buffer;
- _ctrl_xfer.xfer.complete_cb = complete_cb;
-
- _stage = CONTROL_STAGE_SETUP;
-
- // Send setup packet
- TU_ASSERT( hcd_setup_send(rhport, dev_addr, (uint8_t const*) &_ctrl_xfer.xfer.request) );
-
- return true;
-}
-
-void usbh_control_xfer_abort(uint8_t dev_addr)
-{
- if (_ctrl_xfer.xfer.daddr == dev_addr) _stage = CONTROL_STAGE_IDLE;
-}
-
-static void _xfer_complete(uint8_t dev_addr, xfer_result_t result)
-{
- TU_LOG2("\r\n");
- if (_ctrl_xfer.xfer.complete_cb) _ctrl_xfer.xfer.complete_cb(dev_addr, &_ctrl_xfer.xfer.request, result);
-}
-
-
-#endif