aboutsummaryrefslogtreecommitdiff
path: root/bootloaders/diskloader/src/USBCore.cpp
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2011-10-27 10:45:13 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2011-10-27 10:45:13 -0400
commit0ab2cb1c698017e4a81ec17d8677de09553e8683 (patch)
treeeae4a6608559c720a77ade32abdbd2f406cd2fa5 /bootloaders/diskloader/src/USBCore.cpp
parentda03595c32f3822d0b8c96ab61ec7b65131196ee (diff)
removed old comments and unused USB core code
Diffstat (limited to 'bootloaders/diskloader/src/USBCore.cpp')
-rw-r--r--bootloaders/diskloader/src/USBCore.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/bootloaders/diskloader/src/USBCore.cpp b/bootloaders/diskloader/src/USBCore.cpp
index 56944e5..4771181 100644
--- a/bootloaders/diskloader/src/USBCore.cpp
+++ b/bootloaders/diskloader/src/USBCore.cpp
@@ -1,5 +1,4 @@
-
/* Copyright (c) 2010, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
@@ -219,7 +218,6 @@ u8 USB_Available(u8 ep)
void USB_Recv_block(u8 ep, u8* dst, int len)
{
-// SetEP(ep & 7);
LockEP lock(ep);
while (len--)
{
@@ -277,16 +275,11 @@ int USB_Send(u8 ep, const void* d, int len)
int r = len;
const u8* data = (const u8*)d;
-// u8 zero = ep & TRANSFER_ZERO;
- u8 timeout = 250; // 250ms timeout on send? TODO
while (len)
{
u8 n = USB_SendSpace(ep);
if (n == 0)
{
-// if (!(--timeout))
-// return -1;
-// delay(1);
_delay_ms(1);
continue;
}
@@ -333,10 +326,6 @@ const u8 _initEndpoints[] =
EP_TYPE_BULK_OUT, // CDC_ENDPOINT_OUT
EP_TYPE_BULK_IN, // CDC_ENDPOINT_IN
#endif
-
-#ifdef HID_ENABLED
- EP_TYPE_INTERRUPT_IN // HID_ENDPOINT_INT
-#endif
};
#define EP_SINGLE_64 0x32 // EP0
@@ -469,10 +458,6 @@ bool SendDescriptor(Setup& setup)
return SendConfiguration(setup.wLength);
InitControl(setup.wLength);
-#ifdef HID_ENABLED
- if (HID_REPORT_DESCRIPTOR_TYPE == t)
- return HID_GetDescriptor(t);
-#endif
u8 desc_length = 0;
const u8* desc_addr = 0;
@@ -607,9 +592,7 @@ ISR(USB_GEN_vect)
// Start of Frame - happens every millisecond so we use it for TX and RX LED one-shot timing, too
if (udint & (1<<SOFI))
{
-//#ifdef CDC_ENABLED
USB_Flush(CDC_TX); // Send a tx frame if found
-//#endif
// check whether the one-shot period has elapsed. if so, turn off the LED
if (TxLEDPulse && !(--TxLEDPulse))
@@ -666,4 +649,4 @@ void USB_::poll()
{
}
-#endif /* if defined(USBCON) */ \ No newline at end of file
+#endif /* if defined(USBCON) */