diff options
| author | tmk <nobody@nowhere> | 2013-11-28 07:50:17 +0100 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-11-28 07:50:55 +0100 |
| commit | 10b2b1ae431b31b2ae29228dcaccb5ea292bbf9a (patch) | |
| tree | 8ce43042c9988a35051667aede10e8afc7dcf204 /converter/ps2_usb/config.h | |
| parent | 8b4fa599cf485f5d06314938a228a88dabb0b7f5 (diff) | |
| download | qmk_firmware-10b2b1ae431b31b2ae29228dcaccb5ea292bbf9a.tar.gz qmk_firmware-10b2b1ae431b31b2ae29228dcaccb5ea292bbf9a.tar.xz | |
Fix key stack and PS/2 Overrun
Diffstat (limited to 'converter/ps2_usb/config.h')
| -rw-r--r-- | converter/ps2_usb/config.h | 86 |
1 files changed, 46 insertions, 40 deletions
diff --git a/converter/ps2_usb/config.h b/converter/ps2_usb/config.h index 1ad2bd1b4..c9bab1b07 100644 --- a/converter/ps2_usb/config.h +++ b/converter/ps2_usb/config.h @@ -40,6 +40,52 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ) +//#define NO_SUSPEND_POWER_DOWN + + +/* + * PS/2 Busywait + */ +#ifdef PS2_USE_BUSYWAIT +#define PS2_CLOCK_PORT PORTD +#define PS2_CLOCK_PIN PIND +#define PS2_CLOCK_DDR DDRD +#define PS2_CLOCK_BIT 5 +#define PS2_DATA_PORT PORTD +#define PS2_DATA_PIN PIND +#define PS2_DATA_DDR DDRD +#define PS2_DATA_BIT 2 +#endif + +/* + * PS/2 Pin interrupt + */ +#ifdef PS2_USE_INT +/* uses INT1 for clock line(ATMega32U4) */ +#define PS2_CLOCK_PORT PORTD +#define PS2_CLOCK_PIN PIND +#define PS2_CLOCK_DDR DDRD +#define PS2_CLOCK_BIT 1 +#define PS2_DATA_PORT PORTD +#define PS2_DATA_PIN PIND +#define PS2_DATA_DDR DDRD +#define PS2_DATA_BIT 2 +#define PS2_INT_INIT() do { \ + EICRA |= ((1<<ISC11) | \ + (0<<ISC10)); \ +} while (0) +#define PS2_INT_ON() do { \ + EIMSK |= (1<<INT1); \ +} while (0) +#define PS2_INT_OFF() do { \ + EIMSK &= ~(1<<INT1); \ +} while (0) +#define PS2_INT_VECT INT1_vect +#endif + +/* + * PS/2 USART + */ #ifdef PS2_USE_USART #if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) /* XCK for clock line and RXD for data line */ @@ -51,7 +97,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PS2_DATA_PIN PIND #define PS2_DATA_DDR DDRD #define PS2_DATA_BIT 2 - /* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */ /* set DDR of CLOCK as input to be slave */ #define PS2_USART_INIT() do { \ @@ -82,7 +127,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PS2_USART_RX_DATA UDR1 #define PS2_USART_ERROR (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1))) #define PS2_USART_RX_VECT USART1_RX_vect - #elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__) /* XCK for clock line and RXD for data line */ #define PS2_CLOCK_PORT PORTD @@ -93,7 +137,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PS2_DATA_PIN PIND #define PS2_DATA_DDR DDRD #define PS2_DATA_BIT 0 - /* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */ /* set DDR of CLOCK as input to be slave */ #define PS2_USART_INIT() do { \ @@ -127,41 +170,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #endif #endif - -#ifdef PS2_USE_INT -/* uses INT1 for clock line(ATMega32U4) */ -#define PS2_CLOCK_PORT PORTD -#define PS2_CLOCK_PIN PIND -#define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 5 -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 2 - -#define PS2_INT_INIT() do { \ - EICRA |= ((1<<ISC11) | \ - (0<<ISC10)); \ -} while (0) -#define PS2_INT_ON() do { \ - EIMSK |= (1<<INT1); \ -} while (0) -#define PS2_INT_OFF() do { \ - EIMSK &= ~(1<<INT1); \ -} while (0) -#define PS2_INT_VECT INT1_vect -#endif - - -#ifdef PS2_USE_BUSYWAIT -#define PS2_CLOCK_PORT PORTD -#define PS2_CLOCK_PIN PIND -#define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 5 -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 2 -#endif - #endif |