summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2022-03-17 17:25:53 +0700
committerhathach <[email protected]>2022-03-17 17:25:53 +0700
commit8aedb2ff37901d2d08c28308e2527d73ab179f5c (patch)
tree23bef76a57f28517b26e723764747b582c90f0ba
parent1ee699d49d6da7ce8b92cde1636e34ed90ff6396 (diff)
slightly change the signature of tuh_control_xfer
-rw-r--r--src/class/cdc/cdc_host.c2
-rw-r--r--src/class/hid/hid_host.c6
-rw-r--r--src/class/msc/msc_host.c2
-rw-r--r--src/host/hub.c8
-rw-r--r--src/host/usbh.c10
-rw-r--r--src/host/usbh.h4
6 files changed, 15 insertions, 17 deletions
diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index 9838df818..7ae8af77a 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -138,7 +138,7 @@ bool tuh_cdc_set_control_line_state(uint8_t dev_addr, bool dtr, bool rts, tuh_co
.wLength = 0
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
diff --git a/src/class/hid/hid_host.c b/src/class/hid/hid_host.c
index 7986ffc1a..65fccd32a 100644
--- a/src/class/hid/hid_host.c
+++ b/src/class/hid/hid_host.c
@@ -139,7 +139,7 @@ static bool _hidh_set_protocol(uint8_t dev_addr, uint8_t itf_num, uint8_t protoc
.wLength = 0
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
@@ -196,7 +196,7 @@ bool tuh_hid_set_report(uint8_t dev_addr, uint8_t instance, uint8_t report_id, u
.wLength = len
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
@@ -227,7 +227,7 @@ static bool _hidh_set_idle(uint8_t dev_addr, uint8_t itf_num, uint16_t idle_rate
.wLength = 0
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index ca51d63fa..fea587386 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -419,7 +419,7 @@ bool msch_set_config(uint8_t dev_addr, uint8_t itf_num)
.wLength = 1
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
diff --git a/src/host/hub.c b/src/host/hub.c
index 9f17b7eda..36f27398f 100644
--- a/src/host/hub.c
+++ b/src/host/hub.c
@@ -94,7 +94,7 @@ bool hub_port_clear_feature(uint8_t hub_addr, uint8_t hub_port, uint8_t feature,
.wLength = 0
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
@@ -125,7 +125,7 @@ bool hub_port_set_feature(uint8_t hub_addr, uint8_t hub_port, uint8_t feature,
.wLength = 0
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
@@ -156,7 +156,7 @@ bool hub_port_get_status(uint8_t hub_addr, uint8_t hub_port, void* resp,
.wLength = 4
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
@@ -248,7 +248,7 @@ bool hub_set_config(uint8_t dev_addr, uint8_t itf_num)
.wLength = sizeof(descriptor_hub_desc_t)
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
diff --git a/src/host/usbh.c b/src/host/usbh.c
index 3ab72ac0e..2d01c9144 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -326,7 +326,7 @@ static bool _get_descriptor(uint8_t daddr, uint8_t type, uint8_t index, uint16_t
.wLength = tu_htole16(len)
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
@@ -411,7 +411,7 @@ bool tuh_descriptor_get_hid_report(uint8_t daddr, uint8_t itf_num, uint8_t desc_
.wLength = len
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
@@ -442,7 +442,7 @@ bool tuh_configuration_set(uint8_t daddr, uint8_t config_num,
.wLength = 0
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
@@ -889,7 +889,7 @@ static void _control_blocking_complete_cb(uint8_t daddr, tuh_control_xfer_t* xfe
*((xfer_result_t*) xfer->user_arg) = xfer->result;
}
-bool tuh_control_xfer (uint8_t daddr, tuh_control_xfer_t const* xfer)
+bool tuh_control_xfer (uint8_t daddr, tuh_control_xfer_t* xfer)
{
// pre-check to help reducing mutex lock
TU_VERIFY(_ctrl_xfer.stage == CONTROL_STAGE_IDLE);
@@ -1404,7 +1404,7 @@ static bool enum_request_set_addr(void)
.wLength = 0
};
- tuh_control_xfer_t const xfer =
+ tuh_control_xfer_t xfer =
{
.ep_addr = 0,
.setup = &request,
diff --git a/src/host/usbh.h b/src/host/usbh.h
index ec6be67dc..801938a39 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -53,8 +53,6 @@ struct tuh_control_xfer_s
uint32_t actual_len;
uint8_t* buffer;
-
-
tuh_control_xfer_cb_t complete_cb;
uintptr_t user_arg;
};
@@ -118,7 +116,7 @@ static inline bool tuh_ready(uint8_t daddr)
// Carry out a control transfer
// true on success, false if there is on-going control transfer or incorrect parameters
// Blocking if complete callback is NULL, in this case 'user_arg' must contain xfer_result_t variable
-bool tuh_control_xfer(uint8_t daddr, tuh_control_xfer_t const* xfer);
+bool tuh_control_xfer(uint8_t daddr, tuh_control_xfer_t* xfer);
//bool tuh_edpt_xfer(uint8_t daddr, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes);