diff options
author | Jack Humbert <jack.humb@gmail.com> | 2016-11-28 23:51:07 -0500 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2016-11-28 23:51:07 -0500 |
commit | 6e0f994950435aa5867e7b7ce780186d881d74ac (patch) | |
tree | 4a43aec89032a5bace8be91c3230b6d2fcedcb5f /quantum/config_common.h | |
parent | 7edac212c8ed8442bf4207e70dc8194631b2bf27 (diff) | |
parent | 1585fc4b616cb28b8d4a418cd31c8ce0dd64f731 (diff) | |
download | qmk_firmware-6e0f994950435aa5867e7b7ce780186d881d74ac.tar.gz qmk_firmware-6e0f994950435aa5867e7b7ce780186d881d74ac.zip |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
Diffstat (limited to 'quantum/config_common.h')
-rw-r--r-- | quantum/config_common.h | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/quantum/config_common.h b/quantum/config_common.h index f3897dc2c..17c11faeb 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h | |||
@@ -77,53 +77,7 @@ | |||
77 | } while(0) | 77 | } while(0) |
78 | # else | 78 | # else |
79 | # error "USART configuration is needed." | 79 | # error "USART configuration is needed." |
80 | #endif | 80 | # endif |
81 | |||
82 | // I'm fairly sure these aren't needed, but oh well - Jack | ||
83 | |||
84 | /* | ||
85 | * PS/2 Interrupt configuration | ||
86 | */ | ||
87 | #ifdef PS2_USE_INT | ||
88 | /* uses INT1 for clock line(ATMega32U4) */ | ||
89 | #define PS2_CLOCK_PORT PORTD | ||
90 | #define PS2_CLOCK_PIN PIND | ||
91 | #define PS2_CLOCK_DDR DDRD | ||
92 | #define PS2_CLOCK_BIT 1 | ||
93 | |||
94 | #define PS2_DATA_PORT PORTD | ||
95 | #define PS2_DATA_PIN PIND | ||
96 | #define PS2_DATA_DDR DDRD | ||
97 | #define PS2_DATA_BIT 0 | ||
98 | |||
99 | #define PS2_INT_INIT() do { \ | ||
100 | EICRA |= ((1<<ISC11) | \ | ||
101 | (0<<ISC10)); \ | ||
102 | } while (0) | ||
103 | #define PS2_INT_ON() do { \ | ||
104 | EIMSK |= (1<<INT1); \ | ||
105 | } while (0) | ||
106 | #define PS2_INT_OFF() do { \ | ||
107 | EIMSK &= ~(1<<INT1); \ | ||
108 | } while (0) | ||
109 | #define PS2_INT_VECT INT1_vect | ||
110 | #endif | ||
111 | |||
112 | /* | ||
113 | * PS/2 Busywait configuration | ||
114 | */ | ||
115 | #ifdef PS2_USE_BUSYWAIT | ||
116 | #define PS2_CLOCK_PORT PORTD | ||
117 | #define PS2_CLOCK_PIN PIND | ||
118 | #define PS2_CLOCK_DDR DDRD | ||
119 | #define PS2_CLOCK_BIT 1 | ||
120 | |||
121 | #define PS2_DATA_PORT PORTD | ||
122 | #define PS2_DATA_PIN PIND | ||
123 | #define PS2_DATA_DDR DDRD | ||
124 | #define PS2_DATA_BIT 0 | ||
125 | #endif | ||
126 | |||
127 | #endif | 81 | #endif |
128 | 82 | ||
129 | #endif | 83 | #endif |