summaryrefslogtreecommitdiffstats
path: root/firmware/main.c
diff options
context:
space:
mode:
authorcpldcpu <cpldcpu@gmail.com>2014-01-03 20:50:08 +0100
committercpldcpu <cpldcpu@gmail.com>2014-01-03 20:50:08 +0100
commitbe508b4aa482d1677a894318fd4ad9da3a8fe5d4 (patch)
tree65802d31d26b9262fc1380d8b1aee47d2d55266c /firmware/main.c
parent8c4f3c3a798936de8126f3ebca8ccb6382ade93f (diff)
downloadmicronucleus-be508b4aa482d1677a894318fd4ad9da3a8fe5d4.tar.gz
micronucleus-be508b4aa482d1677a894318fd4ad9da3a8fe5d4.tar.bz2
micronucleus-be508b4aa482d1677a894318fd4ad9da3a8fe5d4.zip
firmware: typo, fix warning
Diffstat (limited to 'firmware/main.c')
-rw-r--r--firmware/main.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/firmware/main.c b/firmware/main.c
index 3ad1a14..16cca65 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -1,9 +1,11 @@
/*
* Project: Micronucleus - v1.11
*
- * Author (c) 2012 Jenna Fox
- * Optimizations after v1.06 (c) 2013 Tim Bo"scke - cpldcpu@gmail.com
- * Further input (c) 2013 Shay Green
+ * Original author (c) 2012 Jenna Fox
+ *
+ * Optimizations v1.10/v1.11 (c) 2013 Tim Bo"scke - cpldcpu@gmail.com
+ * v1.11 (c) 2013 Shay Green
+ *
* Based on USBaspLoader-tiny85 (c) 2012 Louis Beaudoin
* Based on USBaspLoader (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
*
@@ -25,6 +27,9 @@
#include <util/delay.h>
#include "bootloaderconfig.h"
+
+
+
#include "usbdrv/usbdrv.c"
// verify the bootloader address aligns with page size
@@ -152,6 +157,9 @@ static void writeWordToPageBuffer(uint16_t data) {
SREG=previous_sreg;
}
+// This function is never called, it is just here to suppress a compiler warning.
+USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) { return 0; }
+
/* ------------------------------------------------------------------------ */
static uint8_t usbFunctionSetup(uint8_t data[8]) {
usbRequest_t *rq = (void *)data;