h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb_cdc: Rename interface functions to avoid the term "setup"

Browse Source 
Use "ep0" when referring to endpoint0 - don't use "setup" as that can
be confused with the low-level usb setup token.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2018-09-30 14:09:55 -04:00
parent 50a8efe0a5
commit 6ab16d2407
4 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/samd21/usbserial.c
View File

@@ -6,7 +6,7 @@
#include <string.h> // memcpy
#include "board/io.h" // readl
#include "board/usb_cdc.h" // usb_notify_setup
#include "board/usb_cdc.h" // usb_notify_ep0
#include "board/usb_cdc_ep.h" // USB_CDC_EP_BULK_IN
#include "internal.h" // enable_pclock
#include "samd21.h" // USB
@@ -122,19 +122,19 @@ usb_send_bulk_in(void *data, uint_fast8_t len)
}
int_fast8_t
usb_read_setup(void *data, uint_fast8_t max_len)
usb_read_ep0(void *data, uint_fast8_t max_len)
{
return usb_read_packet(0, 0, data, max_len);
}
int_fast8_t
usb_send_setup(const void *data, uint_fast8_t len)
usb_send_ep0(const void *data, uint_fast8_t len)
{
return usb_write_packet(0, 1, data, len);
}
void
usb_set_stall(void)
usb_stall_ep0(void)
{
EP0.EPSTATUSSET.reg = USB_DEVICE_EPSTATUS_STALLRQ(3);
}
@@ -145,7 +145,7 @@ void
usb_set_address(uint_fast8_t addr)
{
writeb(&set_address, addr | USB_DEVICE_DADD_ADDEN);
usb_send_setup(NULL, 0);
usb_send_ep0(NULL, 0);
}
void
@@ -212,7 +212,7 @@ USB_Handler(void)
USB->DEVICE.DADD.reg = set_address;
set_address = 0;
}
usb_notify_setup();
usb_notify_ep0();
}
if (ep & (1<<USB_CDC_EP_BULK_OUT)) {
uint8_t sts = EP_BULKOUT.EPINTFLAG.reg;