diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2018-11-02 17:31:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 17:31:40 +0100 |
| commit | 15f6278aa623ceda4c220daee1cbedb9e38e6a97 (patch) | |
| tree | be1f80786f810c75d0f914899d299c530664d324 /tmk_core | |
| parent | 5909d8aef1126357899b687155bfe377914891df (diff) | |
| download | qmk_firmware-15f6278aa623ceda4c220daee1cbedb9e38e6a97.tar.gz qmk_firmware-15f6278aa623ceda4c220daee1cbedb9e38e6a97.tar.xz | |
Add support for Atmega32A to pin declarations and universal matrix (#4015)
* add computed pins from mcu type
* update for atmega32a
* doc typo
* add atmega16 chips, link to references
* remove avr include from config
* exclude assembler in config.h includes
* consolodate options, add 646
* fix typo in pindef
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/vusb/usbdrv/usbdrvasm.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/protocol/vusb/usbdrv/usbdrvasm.S b/tmk_core/protocol/vusb/usbdrv/usbdrvasm.S index 45fcf1831..2e8097da9 100644 --- a/tmk_core/protocol/vusb/usbdrv/usbdrvasm.S +++ b/tmk_core/protocol/vusb/usbdrv/usbdrvasm.S @@ -118,7 +118,7 @@ RTMODEL "__rt_version", "3" # define polyH r21 # define scratch r23 -#else /* __IAR_SYSTEMS_ASM__ */ +#else /* __IAR_SYSTEMS_ASM__ */ /* Register assignments for usbCrc16 on gcc */ /* Calling conventions on gcc: * First parameter passed in r24/r25, second in r22/23 and so on. @@ -151,7 +151,7 @@ RTMODEL "__rt_version", "3" ; unsigned table(unsigned char x) ; { ; unsigned value; -; +; ; value = (unsigned)x << 6; ; value ^= (unsigned)x << 7; ; if(parity(x)) @@ -161,7 +161,7 @@ RTMODEL "__rt_version", "3" ; unsigned usbCrc16(unsigned char *argPtr, unsigned char argLen) ; { ; unsigned crc = 0xffff; -; +; ; while(argLen--) ; crc = table(lo8(crc) ^ *argPtr++) ^ hi8(crc); ; return ~crc; @@ -299,7 +299,7 @@ usbCrc16Append: # define cnt16H r31 # define cntH r18 -#else /* __IAR_SYSTEMS_ASM__ */ +#else /* __IAR_SYSTEMS_ASM__ */ /* Register assignments for usbMeasureFrameLength on gcc */ /* Calling conventions on gcc: * First parameter passed in r24/r25, second in r22/23 and so on. |