summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorShay Green <gblargg@gmail.com>2014-07-14 17:12:55 -0500
committerShay Green <gblargg@gmail.com>2014-07-14 17:12:55 -0500
commit3c997b042f0480e15818fcd55802dba6277f383a (patch)
tree1bc8fbc7d2d7fe650dba3eddd564b4f028bc581e /firmware
parent044d47585ce3459ecbf7ce2bb87ea35992d0cdae (diff)
downloadmicronucleus-3c997b042f0480e15818fcd55802dba6277f383a.tar.gz
micronucleus-3c997b042f0480e15818fcd55802dba6277f383a.tar.bz2
micronucleus-3c997b042f0480e15818fcd55802dba6277f383a.zip
Expanded tabs for previous commit
Diffstat (limited to 'firmware')
-rw-r--r--firmware/osccalASM.S20
1 files changed, 10 insertions, 10 deletions
diff --git a/firmware/osccalASM.S b/firmware/osccalASM.S
index 6484350..fa26dc4 100644
--- a/firmware/osccalASM.S
+++ b/firmware/osccalASM.S
@@ -147,20 +147,20 @@ usbCOWaitLoop:
sbic USBIN, USBMINUS ;[2]
rjmp usbCOWaitLoop ;[3]
- sbis USBIN, USBPLUS ; ignore frame if data is present
- rjmp usbCOnotdata
+ sbis USBIN, USBPLUS ; ignore frame if data is present
+ rjmp usbCOnotdata
usbCOWaitNoData:
- in cnt16H, USBIN ; wait for SE0 state (both lines low)
- andi cnt16H, (1<<USBPLUS)|(1<<USBMINUS)
- brne usbCOWaitNoData
- in cnt16H, USBIN ; be sure SE0 state wasn't a glitch
- andi cnt16H, (1<<USBPLUS)|(1<<USBMINUS)
- brne usbCOWaitNoData
+ in cnt16H, USBIN ; wait for SE0 state (both lines low)
+ andi cnt16H, (1<<USBPLUS)|(1<<USBMINUS)
+ brne usbCOWaitNoData
+ in cnt16H, USBIN ; be sure SE0 state wasn't a glitch
+ andi cnt16H, (1<<USBPLUS)|(1<<USBMINUS)
+ brne usbCOWaitNoData
usbCOWaitNoData2:
- sbis USBIN, USBMINUS ; wait for D- go to high
+ sbis USBIN, USBMINUS ; wait for D- go to high
rjmp usbCOWaitNoData2
- rjmp usbCOLoopNoCal
+ rjmp usbCOLoopNoCal
usbCOnotdata:
sbrs cnt16H, 7 ;delay overflow?