From a2e8a1b534b7d8a8ba0f79b67f07b05e35b41882 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 9 Sep 2019 11:50:11 +0900 Subject: [PATCH] ps2_usb: Make build files clean --- converter/ps2_usb/Makefile.rev1 | 7 +- converter/ps2_usb/Makefile.rev2 | 7 +- converter/ps2_usb/Makefile.unimap.rev1 | 5 - converter/ps2_usb/Makefile.unimap.rev2 | 6 - converter/ps2_usb/config_rev1.h | 147 ------------------------- converter/ps2_usb/config_rev2.h | 95 ---------------- 6 files changed, 10 insertions(+), 257 deletions(-) delete mode 100644 converter/ps2_usb/Makefile.unimap.rev1 delete mode 100644 converter/ps2_usb/Makefile.unimap.rev2 delete mode 100644 converter/ps2_usb/config_rev1.h delete mode 100644 converter/ps2_usb/config_rev2.h diff --git a/converter/ps2_usb/Makefile.rev1 b/converter/ps2_usb/Makefile.rev1 index 0d607652..dfe14991 100644 --- a/converter/ps2_usb/Makefile.rev1 +++ b/converter/ps2_usb/Makefile.rev1 @@ -1,6 +1,6 @@ -TARGET ?= ps2_usb_rev1 +TARGET ?= ps2_usb_rev1_unimap MCU = atmega32u4 -CONFIG_H = config_rev1.h +CONFIG_H = config.h BOOTLOADER_SIZE = 4096 BOOTMAGIC_ENABLE ?= no @@ -14,4 +14,7 @@ PS2_USE_USART = yes PS2_USE_INT = no PS2_USE_BUSYWAIT = no +UNIMAP_ENABLE = yes +KEYMAP_SECTION_ENABLE = yes + include Makefile diff --git a/converter/ps2_usb/Makefile.rev2 b/converter/ps2_usb/Makefile.rev2 index 8b34d4fa..cd9874fd 100644 --- a/converter/ps2_usb/Makefile.rev2 +++ b/converter/ps2_usb/Makefile.rev2 @@ -1,6 +1,6 @@ -TARGET ?= ps2_usb_rev2 +TARGET ?= ps2_usb_rev2_unimap MCU = atmega32u2 -CONFIG_H = config_rev2.h +CONFIG_H = config.h BOOTLOADER_SIZE = 4096 BOOTMAGIC_ENABLE ?= no @@ -14,4 +14,7 @@ PS2_USE_USART = no PS2_USE_INT = yes PS2_USE_BUSYWAIT = no +UNIMAP_ENABLE = yes +KEYMAP_SECTION_ENABLE = yes + include Makefile diff --git a/converter/ps2_usb/Makefile.unimap.rev1 b/converter/ps2_usb/Makefile.unimap.rev1 deleted file mode 100644 index c62b1874..00000000 --- a/converter/ps2_usb/Makefile.unimap.rev1 +++ /dev/null @@ -1,5 +0,0 @@ -TARGET = ps2_usb_rev1_unimap -UNIMAP_ENABLE = yes -KEYMAP_SECTION_ENABLE = yes - -include Makefile.rev1 diff --git a/converter/ps2_usb/Makefile.unimap.rev2 b/converter/ps2_usb/Makefile.unimap.rev2 deleted file mode 100644 index a3bc6399..00000000 --- a/converter/ps2_usb/Makefile.unimap.rev2 +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = ps2_usb_rev2_unimap -UNIMAP_ENABLE = yes -KEYMAP_SECTION_ENABLE = yes -#LUFA_DEBUG_SUART = yes - -include Makefile.rev2 diff --git a/converter/ps2_usb/config_rev1.h b/converter/ps2_usb/config_rev1.h deleted file mode 100644 index ce670f50..00000000 --- a/converter/ps2_usb/config_rev1.h +++ /dev/null @@ -1,147 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#include - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6512 -#define DEVICE_VER 0x0001 -#define MANUFACTURER t.m.k. -#define PRODUCT PS/2 keyboard converter -#define DESCRIPTION convert PS/2 keyboard to USB - - -/* matrix size */ -#define MATRIX_ROWS 32 // keycode bit: 3-0 -#define MATRIX_COLS 8 // keycode bit: 6-4 - - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \ - keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \ -) - - -//#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 USART - */ -#ifdef PS2_USE_USART -#if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) -/* XCK for clock line and RXD for data line */ -#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 -/* 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 { \ - PS2_CLOCK_DDR &= ~(1< - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#include - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6512 -#define DEVICE_VER 0x0001 -#define MANUFACTURER t.m.k. -#define PRODUCT PS/2 keyboard converter -#define DESCRIPTION convert PS/2 keyboard to USB - - -/* matrix size */ -#define MATRIX_ROWS 32 // keycode bit: 3-0 -#define MATRIX_COLS 8 // keycode bit: 6-4 - - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \ - keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \ -) - - -//#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 1 -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 0 -#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 0 -#define PS2_INT_INIT() do { \ - EICRA |= ((1<