Skip to content

Commit db3a435

Browse files
author
Cruz Monrreal
authored
Merge pull request #7267 from c1728p9/remove_endpoint_parameter
Remove endpoint parameter from USB callbacks
2 parents 2347133 + da45ea7 commit db3a435

File tree

14 files changed

+36
-38
lines changed

14 files changed

+36
-38
lines changed

‎TESTS/usb_device/basic/USBTester.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ void USBTester::callback_set_configuration(uint8_t configuration)
221221
}
222222

223223
bool USBTester::setup_iterface(uint8_t ep_in, uint8_t ep_out, uint32_t ep_size, usb_ep_type_t ep_type,
224-
uint8_t *buf, uint32_t buf_size, void (USBTester::*callback)(usb_ep_t endpoint))
224+
uint8_t *buf, uint32_t buf_size, void (USBTester::*callback)())
225225
{
226226
bool success = false;
227227

@@ -690,13 +690,13 @@ const uint8_t *USBTester::configuration_desc(uint8_t index)
690690
}
691691
}
692692

693-
void USBTester::epint_out_callback(usb_ep_t endpoint)
693+
void USBTester::epint_out_callback()
694694
{
695-
read_finish(endpoint);
696-
read_start(endpoint, int_buf, sizeof(int_buf));
695+
read_finish(int_out);
696+
read_start(int_out, int_buf, sizeof(int_buf));
697697
}
698-
void USBTester::epbulk_out_callback(usb_ep_t endpoint)
698+
void USBTester::epbulk_out_callback()
699699
{
700-
read_finish(endpoint);
701-
read_start(endpoint, bulk_buf, sizeof(bulk_buf));
700+
read_finish(bulk_out);
701+
read_start(bulk_out, bulk_buf, sizeof(bulk_buf));
702702
}

‎TESTS/usb_device/basic/USBTester.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class USBTester: public USBDevice {
6262
bool set_configuration(uint16_t configuration);
6363
bool set_interface(uint16_t interface, uint16_t alternate);
6464
bool setup_iterface(uint8_t ep_in, uint8_t ep_out, uint32_t ep_size, usb_ep_type_t ep_type,
65-
uint8_t *buf, uint32_t buf_size, void (USBTester::*callback)(usb_ep_t endpoint));
65+
uint8_t *buf, uint32_t buf_size, void (USBTester::*callback)());
6666
void remove_iterface(uint16_t interface);
6767
int16_t interface_0_alt_set;
6868
int16_t interface_1_alt_set;
@@ -117,8 +117,8 @@ class USBTester: public USBDevice {
117117
virtual void callback_request_xfer_done(const setup_packet_t *setup, bool aborted);
118118
virtual void callback_set_configuration(uint8_t configuration);
119119
virtual void callback_set_interface(uint16_t interface, uint8_t alternate);
120-
virtual void epbulk_out_callback(usb_ep_t endpoint);
121-
virtual void epint_out_callback(usb_ep_t endpoint);
120+
virtual void epbulk_out_callback();
121+
virtual void epint_out_callback();
122122
virtual void callback_reset();
123123
uint8_t ctrl_buf[2048];
124124

‎usb/device/USBAudio/USBAudio.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -883,10 +883,9 @@ void USBAudio::_receive_change(ChannelState new_state)
883883
}
884884
}
885885

886-
void USBAudio::_receive_isr(usb_ep_t ep)
886+
void USBAudio::_receive_isr()
887887
{
888888
assert_locked();
889-
MBED_ASSERT(ep == _episo_out);
890889

891890
uint32_t size = read_finish(_episo_out);
892891

@@ -984,10 +983,9 @@ void USBAudio::_send_isr_next_sync()
984983
_tx_frame_fract += _tx_fract_frames_per_xfer;
985984
}
986985

987-
void USBAudio::_send_isr(usb_ep_t ep)
986+
void USBAudio::_send_isr()
988987
{
989988
assert_locked();
990-
MBED_ASSERT(ep == _episo_in);
991989

992990
write_finish(_episo_in);
993991

‎usb/device/USBAudio/USBAudio.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ class USBAudio: protected USBDevice {
275275
void _build_configuration_desc();
276276

277277
void _receive_change(ChannelState new_state);
278-
void _receive_isr(usb_ep_t ep);
278+
void _receive_isr();
279279
void _send_change(ChannelState new_state);
280280
void _send_isr_start();
281281
void _send_isr_next_sync();
282-
void _send_isr(usb_ep_t ep);
282+
void _send_isr();
283283

284284
// has connect been called
285285
bool _connected;

‎usb/device/USBDevice/USBDevice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ void USBDevice::out(usb_ep_t endpoint)
939939
MBED_ASSERT(info->pending >= 1);
940940
info->pending -= 1;
941941
if (info->callback) {
942-
(this->*(info->callback))(endpoint);
942+
(this->*(info->callback))();
943943
}
944944
}
945945

@@ -957,7 +957,7 @@ void USBDevice::in(usb_ep_t endpoint)
957957
MBED_ASSERT(info->pending >= 1);
958958
info->pending -= 1;
959959
if (info->callback) {
960-
(this->*(info->callback))(endpoint);
960+
(this->*(info->callback))();
961961
}
962962
}
963963

‎usb/device/USBDevice/USBDevice.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*/
4343
class USBDevice: public USBPhyEvents {
4444
public:
45-
typedef void (USBDevice::*ep_cb_t)(usb_ep_t endpoint);
45+
typedef void (USBDevice::*ep_cb_t)();
4646

4747
enum RequestResult {
4848
Receive = 0,
@@ -157,7 +157,7 @@ class USBDevice: public USBPhyEvents {
157157
* @returns true if successful, false otherwise
158158
*/
159159
template<typename T>
160-
bool endpoint_add(usb_ep_t endpoint, uint32_t max_packet, usb_ep_type_t type, void (T::*callback)(usb_ep_t endpoint))
160+
bool endpoint_add(usb_ep_t endpoint, uint32_t max_packet, usb_ep_type_t type, void (T::*callback)())
161161
{
162162
return endpoint_add(endpoint, max_packet, type, static_cast<ep_cb_t>(callback));
163163
}
@@ -539,7 +539,7 @@ class USBDevice: public USBPhyEvents {
539539
void _complete_set_interface();
540540

541541
struct endpoint_info_t {
542-
void (USBDevice::*callback)(usb_ep_t endpoint);
542+
ep_cb_t callback;
543543
uint16_t max_packet_size;
544544
uint16_t transfer_size;
545545
uint8_t flags;

‎usb/device/USBHID/USBHID.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ bool USBHID::read_nb(HID_REPORT *report)
233233
return success;
234234
}
235235

236-
void USBHID::_send_isr(usb_ep_t endpoint)
236+
void USBHID::_send_isr()
237237
{
238238
assert_locked();
239239

@@ -247,7 +247,7 @@ void USBHID::_send_isr(usb_ep_t endpoint)
247247

248248
}
249249

250-
void USBHID::_read_isr(usb_ep_t endpoint)
250+
void USBHID::_read_isr()
251251
{
252252
assert_locked();
253253

‎usb/device/USBHID/USBHID.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ class USBHID: public USBDevice {
245245

246246
private:
247247
void _init(uint8_t output_report_length, uint8_t input_report_length);
248-
void _send_isr(usb_ep_t endpoint);
249-
void _read_isr(usb_ep_t endpoint);
248+
void _send_isr();
249+
void _read_isr();
250250

251251
class AsyncSend;
252252
class AsyncRead;

‎usb/device/USBMIDI/USBMIDI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,14 +311,14 @@ const uint8_t *USBMIDI::configuration_desc(uint8_t index)
311311
return _config_descriptor;
312312
}
313313

314-
void USBMIDI::_in_callback(usb_ep_t ep)
314+
void USBMIDI::_in_callback()
315315
{
316316
assert_locked();
317317

318318
_flags.set(FLAG_WRITE_DONE);
319319
}
320320

321-
void USBMIDI::_out_callback(usb_ep_t ep)
321+
void USBMIDI::_out_callback()
322322
{
323323
assert_locked();
324324

‎usb/device/USBMIDI/USBMIDI.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ class USBMIDI: public USBDevice {
176176
Callback<void()> _callback;
177177

178178
void _init();
179-
void _in_callback(usb_ep_t);
180-
void _out_callback(usb_ep_t);
179+
void _in_callback();
180+
void _out_callback();
181181
bool _next_message();
182182
};
183183

‎usb/device/USBMSD/USBMSD.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ int USBMSD::disk_status()
216216
return 0;
217217
}
218218

219-
void USBMSD::_isr_out(usb_ep_t endpoint)
219+
void USBMSD::_isr_out()
220220
{
221221
_out_task.call();
222222
}
223223

224-
void USBMSD::_isr_in(usb_ep_t endpoint)
224+
void USBMSD::_isr_in()
225225
{
226226
_in_task.call();
227227
}

‎usb/device/USBMSD/USBMSD.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ class USBMSD: public USBDevice {
246246
virtual void callback_request(const setup_packet_t *setup);
247247
virtual void callback_request_xfer_done(const setup_packet_t *setup, bool aborted);
248248

249-
void _isr_out(usb_ep_t endpoint);
250-
void _isr_in(usb_ep_t endpoint);
249+
void _isr_out();
250+
void _isr_in();
251251

252252
void _out();
253253
void _in();

‎usb/device/USBSerial/USBCDC.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,11 @@ void USBCDC::_send_isr_start()
410410
* Called by when CDC data is sent
411411
* Warning: Called in ISR
412412
*/
413-
void USBCDC::_send_isr(usb_ep_t endpoint)
413+
void USBCDC::_send_isr()
414414
{
415415
assert_locked();
416416

417-
write_finish(endpoint);
417+
write_finish(_bulk_in);
418418
_tx_buf = _tx_buffer;
419419
_tx_size = 0;
420420
_tx_in_progress = false;
@@ -472,7 +472,7 @@ void USBCDC::_receive_isr_start()
472472
* Called by when CDC data is received
473473
* Warning: Called in ISR
474474
*/
475-
void USBCDC::_receive_isr(usb_ep_t endpoint)
475+
void USBCDC::_receive_isr()
476476
{
477477
assert_locked();
478478

‎usb/device/USBSerial/USBCDC.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ class USBCDC: public USBDevice {
194194
void _change_terminal_connected(bool connected);
195195

196196
void _send_isr_start();
197-
void _send_isr(usb_ep_t endpoint);
197+
void _send_isr();
198198

199199
void _receive_isr_start();
200-
void _receive_isr(usb_ep_t endpoint);
200+
void _receive_isr();
201201

202202
usb_ep_t _bulk_in;
203203
usb_ep_t _bulk_out;

0 commit comments

Comments
 (0)