summaryrefslogtreecommitdiffstats
path: root/firmware/main.c
diff options
context:
space:
mode:
authorJenna Fox <a@creativepony.com>2012-09-23 18:22:23 +1000
committerJenna Fox <a@creativepony.com>2012-09-23 18:22:23 +1000
commitbf678ec404a41c31c29f44ef821f9b69c44f4e61 (patch)
tree80bf464eb125fc97a31670d920f3ee76fb118496 /firmware/main.c
parentb15af082f191583a5e9ec0644dfcdd43f22f93d9 (diff)
downloadmicronucleus-bf678ec404a41c31c29f44ef821f9b69c44f4e61.tar.gz
micronucleus-bf678ec404a41c31c29f44ef821f9b69c44f4e61.tar.bz2
micronucleus-bf678ec404a41c31c29f44ef821f9b69c44f4e61.zip
More stuff in firmware main.c
God I am getting bad at writing these commit messages
Diffstat (limited to 'firmware/main.c')
-rw-r--r--firmware/main.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/firmware/main.c b/firmware/main.c
index 6518d9d..ae32cf7 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -442,6 +442,21 @@ uchar usbFunctionWrite(uchar *data, uchar length) {
}
do {
+ // remember vectors or the tinyvector table
+ if (currentAddress == RESET_VECTOR_OFFSET * 2) {
+ vectorTemp[0] = *(short *)data;
+ }
+
+ if (currentAddress == USBPLUS_VECTOR_OFFSET * 2) {
+ vectorTemp[1] = *(short *)data;
+ }
+
+ // make sure we don't write over the bootloader!
+ if (currentAddress >= BOOTLOADER_ADDRESS - 6) {
+ __boot_page_fill_clear();
+ return isLast;
+ }
+
writeWordToPageBuffer(*(uint16_t *) data);
currentAddress += 2; // advance progmem address
data += 2; // advance data pointer