~ruther/qmk_firmware

8b9c61ade54c3018970d94dfbc319a69f29ac6af — tmk 11 years ago b316f19
Revert ps2_usb/Makefile and config.h
2 files changed, 1 insertions(+), 52 deletions(-)

M converter/ps2_usb/Makefile
M converter/ps2_usb/config.h
M converter/ps2_usb/Makefile => converter/ps2_usb/Makefile +0 -13
@@ 91,19 91,6 @@ PS2_USE_USART = yes	# uses hardware USART engine for PS/2 signal receive(recomen
#PS2_USE_INT = yes	# uses external interrupt for falling edge of PS/2 clock pin
#PS2_USE_BUSYWAIT = yes	# uses primitive reference code

# Serial Mouse Options
#   You can choose a mouse protocol and the implementation of
#   the underlying serial connection.
#
#SERIAL_MOUSE_MICROSOFT_ENABLE = yes	# Enable support for Microsoft-compatible mice
#SERIAL_MOUSE_MOUSESYSTEMS_ENABLE = yes	# Enable support for Mousesystems-compatible mice
#SERIAL_MOUSE_USE_UART = yes		# use hardware UART for serial connection
#SERIAL_MOUSE_USE_SOFT = yes		# use software serial implementation

# Optional serial mouse driver features
# Support scrolling while holding the middle mouse button
# (currently only supported for Mousesystems mice):
#OPT_DEFS += -DSERIAL_MOUSE_CENTER_SCROLL

# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax

M converter/ps2_usb/config.h => converter/ps2_usb/config.h +1 -39
@@ 69,7 69,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#define PS2_DATA_PORT   PORTD
#define PS2_DATA_PIN    PIND
#define PS2_DATA_DDR    DDRD
#define PS2_DATA_BIT    0
#define PS2_DATA_BIT    2
#define PS2_INT_INIT()  do {    \
    EICRA |= ((1<<ISC11) |      \
              (0<<ISC10));      \


@@ 170,42 170,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#endif
#endif

#ifdef SERIAL_MOUSE_MICROSOFT
    /*
     * Serial(USART) configuration (for Microsoft serial mice)
     *     asynchronous, positive logic, 1200baud, bit order: LSB first
     *     1-start bit, 7-data bit, no parity, 1-stop bit
     */
    #define SERIAL_UART_BAUD       1200
    #define SERIAL_UART_DATA       UDR1
    #define SERIAL_UART_UBRR       ((F_CPU/(16UL*SERIAL_UART_BAUD))-1)
    #define SERIAL_UART_RXD_VECT   USART1_RX_vect
    #define SERIAL_UART_TXD_READY  (UCSR1A&(1<<UDRE1))
    #define SERIAL_UART_INIT()     do { \
        UBRR1L = (uint8_t) SERIAL_UART_UBRR;       /* baud rate */ \
        UBRR1H = (uint8_t) (SERIAL_UART_UBRR>>8);  /* baud rate */ \
        UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \
        UCSR1C = (1<<UCSZ11) | (0<<UCSZ10);  /* no parity, 1 stop bit, 7-bit characters */ \
        sei(); \
    } while(0)
#elif defined(SERIAL_MOUSE_MOUSESYSTEMS)
    /*
     * Serial(USART) configuration (for Mousesystems serial mice)
     *     asynchronous, positive logic, 1200baud, bit order: LSB first
     *     1-start bit, 8-data bit, no parity, 1-stop bit
     */
    #define SERIAL_UART_BAUD       1200
    #define SERIAL_UART_DATA       UDR1
    #define SERIAL_UART_UBRR       ((F_CPU/(16UL*SERIAL_UART_BAUD))-1)
    #define SERIAL_UART_RXD_VECT   USART1_RX_vect
    #define SERIAL_UART_TXD_READY  (UCSR1A&(1<<UDRE1))
    #define SERIAL_UART_INIT()     do { \
        UBRR1L = (uint8_t) SERIAL_UART_UBRR;       /* baud rate */ \
        UBRR1H = (uint8_t) (SERIAL_UART_UBRR>>8);  /* baud rate */ \
        UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \
        UCSR1C = (1<<UCSZ11) | (1<<UCSZ10);  /* no parity, 1 stop bit, 8-bit characters */ \
        sei(); \
    } while(0)
#endif

#endif