summaryrefslogtreecommitdiffstats
path: root/firmware/usbdrv
diff options
context:
space:
mode:
authorcpldcpu <cpldcpu@gmail.com>2014-01-04 15:22:34 +0100
committercpldcpu <cpldcpu@gmail.com>2014-01-04 15:22:34 +0100
commitc4907c6896943eb3ff778cb007a9891ac7b68248 (patch)
tree7a75965d243f3595074dfc8ee9fbd8f03da90fce /firmware/usbdrv
parent25018868d729d1fc2802d3472817d5c36298f435 (diff)
downloadmicronucleus-c4907c6896943eb3ff778cb007a9891ac7b68248.tar.gz
micronucleus-c4907c6896943eb3ff778cb007a9891ac7b68248.tar.bz2
micronucleus-c4907c6896943eb3ff778cb007a9891ac7b68248.zip
just log current state
Diffstat (limited to 'firmware/usbdrv')
-rw-r--r--firmware/usbdrv/asmcommon.inc5
-rw-r--r--firmware/usbdrv/usbdrvasm165.inc4
2 files changed, 4 insertions, 5 deletions
diff --git a/firmware/usbdrv/asmcommon.inc b/firmware/usbdrv/asmcommon.inc
index d2a4f7c..5e525f5 100644
--- a/firmware/usbdrv/asmcommon.inc
+++ b/firmware/usbdrv/asmcommon.inc
@@ -99,8 +99,9 @@ doReturn:
rjmp waitForJ ;[51] save the pops and pushes -- a new interrupt is already pending
sofError:
POP_RETI ;macro call
- reti
-
+; reti
+ ret
+
handleData:
#if USB_CFG_CHECK_CRC
CRC_CLEANUP_AND_CHECK ; jumps to ignorePacket if CRC error
diff --git a/firmware/usbdrv/usbdrvasm165.inc b/firmware/usbdrv/usbdrvasm165.inc
index 450d2fd..20457f4 100644
--- a/firmware/usbdrv/usbdrvasm165.inc
+++ b/firmware/usbdrv/usbdrvasm165.inc
@@ -49,9 +49,7 @@ USB_INTR_VECTOR:
in YL, SREG ;
push YL ;
-#ifdef TINY85MODE
-; look for magic word "B007" at the bottom of the stack
- lds YL, RAMEND
+#if 0
cpi YL, 0xB0
brne cleanupAndJumpToApp