mfulz_github/qmk_firmware
1
0
Fork 1
mirror of https://github.com/mfulz/qmk_firmware.git synced 2025-08-01 18:20:43 +02:00
Code Issues Projects Releases Wiki Activity

exclude assembler in config.h includes

Browse Source
This commit is contained in:
Jack Humbert 2018-09-28 21:29:28 -04:00
parent 6650bd222d
commit 4caf9eade0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quantum/config_common.h
View File

@ -22,6 +22,9 @@
#define CUSTOM_MATRIX 2 /* Disables built-in matrix scanning code */ #define CUSTOM_MATRIX 2 /* Disables built-in matrix scanning code */
#ifdef __AVR__ #ifdef __AVR__
#ifndef __ASSEMBLER__
#include <avr/io.h>
#endif
#define PORT_SHIFTER 4 // this may be 4 for all AVR chips #define PORT_SHIFTER 4 // this may be 4 for all AVR chips
// If you want to add more to this list, reference the PINx definitions in these header // If you want to add more to this list, reference the PINx definitions in these header

8
tmk_core/protocol/vusb/usbdrv/usbdrvasm.S
View File

@ -118,7 +118,7 @@ RTMODEL "__rt_version", "3"
# define polyH r21 # define polyH r21
# define scratch r23 # define scratch r23
#else /* __IAR_SYSTEMS_ASM__ */ #else /* __IAR_SYSTEMS_ASM__ */
/* Register assignments for usbCrc16 on gcc */ /* Register assignments for usbCrc16 on gcc */
/* Calling conventions on gcc: /* Calling conventions on gcc:
* First parameter passed in r24/r25, second in r22/23 and so on. * 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 table(unsigned char x)
; { ; {
; unsigned value; ; unsigned value;
; ;
; value = (unsigned)x << 6; ; value = (unsigned)x << 6;
; value ^= (unsigned)x << 7; ; value ^= (unsigned)x << 7;
; if(parity(x)) ; if(parity(x))
@ -161,7 +161,7 @@ RTMODEL "__rt_version", "3"
; unsigned usbCrc16(unsigned char *argPtr, unsigned char argLen) ; unsigned usbCrc16(unsigned char *argPtr, unsigned char argLen)
; { ; {
; unsigned crc = 0xffff; ; unsigned crc = 0xffff;
; ;
; while(argLen--) ; while(argLen--)
; crc = table(lo8(crc) ^ *argPtr++) ^ hi8(crc); ; crc = table(lo8(crc) ^ *argPtr++) ^ hi8(crc);
; return ~crc; ; return ~crc;
@ -299,7 +299,7 @@ usbCrc16Append:
# define cnt16H r31 # define cnt16H r31
# define cntH r18 # define cntH r18
#else /* __IAR_SYSTEMS_ASM__ */ #else /* __IAR_SYSTEMS_ASM__ */
/* Register assignments for usbMeasureFrameLength on gcc */ /* Register assignments for usbMeasureFrameLength on gcc */
/* Calling conventions on gcc: /* Calling conventions on gcc:
* First parameter passed in r24/r25, second in r22/23 and so on. * First parameter passed in r24/r25, second in r22/23 and so on.