diff options
| -rw-r--r-- | converter/ps2_usb/Makefile | 13 | ||||
| -rw-r--r-- | converter/ps2_usb/config.h | 40 |
2 files changed, 1 insertions, 52 deletions
diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile index f20039c6f..1dd23c157 100644 --- a/converter/ps2_usb/Makefile +++ b/converter/ps2_usb/Makefile | |||
| @@ -91,19 +91,6 @@ PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomen | |||
| 91 | #PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin | 91 | #PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin |
| 92 | #PS2_USE_BUSYWAIT = yes # uses primitive reference code | 92 | #PS2_USE_BUSYWAIT = yes # uses primitive reference code |
| 93 | 93 | ||
| 94 | # Serial Mouse Options | ||
| 95 | # You can choose a mouse protocol and the implementation of | ||
| 96 | # the underlying serial connection. | ||
| 97 | # | ||
| 98 | #SERIAL_MOUSE_MICROSOFT_ENABLE = yes # Enable support for Microsoft-compatible mice | ||
| 99 | #SERIAL_MOUSE_MOUSESYSTEMS_ENABLE = yes # Enable support for Mousesystems-compatible mice | ||
| 100 | #SERIAL_MOUSE_USE_UART = yes # use hardware UART for serial connection | ||
| 101 | #SERIAL_MOUSE_USE_SOFT = yes # use software serial implementation | ||
| 102 | |||
| 103 | # Optional serial mouse driver features | ||
| 104 | # Support scrolling while holding the middle mouse button | ||
| 105 | # (currently only supported for Mousesystems mice): | ||
| 106 | #OPT_DEFS += -DSERIAL_MOUSE_CENTER_SCROLL | ||
| 107 | 94 | ||
| 108 | # Optimize size but this may cause error "relocation truncated to fit" | 95 | # Optimize size but this may cause error "relocation truncated to fit" |
| 109 | #EXTRALDFLAGS = -Wl,--relax | 96 | #EXTRALDFLAGS = -Wl,--relax |
diff --git a/converter/ps2_usb/config.h b/converter/ps2_usb/config.h index 5b644002d..c9bab1b07 100644 --- a/converter/ps2_usb/config.h +++ b/converter/ps2_usb/config.h | |||
| @@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 69 | #define PS2_DATA_PORT PORTD | 69 | #define PS2_DATA_PORT PORTD |
| 70 | #define PS2_DATA_PIN PIND | 70 | #define PS2_DATA_PIN PIND |
| 71 | #define PS2_DATA_DDR DDRD | 71 | #define PS2_DATA_DDR DDRD |
| 72 | #define PS2_DATA_BIT 0 | 72 | #define PS2_DATA_BIT 2 |
| 73 | #define PS2_INT_INIT() do { \ | 73 | #define PS2_INT_INIT() do { \ |
| 74 | EICRA |= ((1<<ISC11) | \ | 74 | EICRA |= ((1<<ISC11) | \ |
| 75 | (0<<ISC10)); \ | 75 | (0<<ISC10)); \ |
| @@ -170,42 +170,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 170 | #endif | 170 | #endif |
| 171 | #endif | 171 | #endif |
| 172 | 172 | ||
| 173 | #ifdef SERIAL_MOUSE_MICROSOFT | ||
| 174 | /* | ||
| 175 | * Serial(USART) configuration (for Microsoft serial mice) | ||
| 176 | * asynchronous, positive logic, 1200baud, bit order: LSB first | ||
| 177 | * 1-start bit, 7-data bit, no parity, 1-stop bit | ||
| 178 | */ | ||
| 179 | #define SERIAL_UART_BAUD 1200 | ||
| 180 | #define SERIAL_UART_DATA UDR1 | ||
| 181 | #define SERIAL_UART_UBRR ((F_CPU/(16UL*SERIAL_UART_BAUD))-1) | ||
| 182 | #define SERIAL_UART_RXD_VECT USART1_RX_vect | ||
| 183 | #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1)) | ||
| 184 | #define SERIAL_UART_INIT() do { \ | ||
| 185 | UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \ | ||
| 186 | UBRR1H = (uint8_t) (SERIAL_UART_UBRR>>8); /* baud rate */ \ | ||
| 187 | UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ | ||
| 188 | UCSR1C = (1<<UCSZ11) | (0<<UCSZ10); /* no parity, 1 stop bit, 7-bit characters */ \ | ||
| 189 | sei(); \ | ||
| 190 | } while(0) | ||
| 191 | #elif defined(SERIAL_MOUSE_MOUSESYSTEMS) | ||
| 192 | /* | ||
| 193 | * Serial(USART) configuration (for Mousesystems serial mice) | ||
| 194 | * asynchronous, positive logic, 1200baud, bit order: LSB first | ||
| 195 | * 1-start bit, 8-data bit, no parity, 1-stop bit | ||
| 196 | */ | ||
| 197 | #define SERIAL_UART_BAUD 1200 | ||
| 198 | #define SERIAL_UART_DATA UDR1 | ||
| 199 | #define SERIAL_UART_UBRR ((F_CPU/(16UL*SERIAL_UART_BAUD))-1) | ||
| 200 | #define SERIAL_UART_RXD_VECT USART1_RX_vect | ||
| 201 | #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1)) | ||
| 202 | #define SERIAL_UART_INIT() do { \ | ||
| 203 | UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \ | ||
| 204 | UBRR1H = (uint8_t) (SERIAL_UART_UBRR>>8); /* baud rate */ \ | ||
| 205 | UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ | ||
| 206 | UCSR1C = (1<<UCSZ11) | (1<<UCSZ10); /* no parity, 1 stop bit, 8-bit characters */ \ | ||
| 207 | sei(); \ | ||
| 208 | } while(0) | ||
| 209 | #endif | ||
| 210 | |||
| 211 | #endif | 173 | #endif |
