Added variants for each bootloader type

keyboards/converter/ibmpc_usb/atmega32u4_atmel_dfu/config.h

@@ -0,0 +1,88 @@
+/*
+Copyright 2012 Jun Wako <[email protected]>
+Copyright 2016 Priyadi Iman Nurcahyo <[email protected]>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/*
+ * Pin and interrupt configuration
+ */
+// clock requires External Interrupt pin(INT*)
+#define IBMPC_CLOCK_PORT  PORTD
+#define IBMPC_CLOCK_PIN   PIND
+#define IBMPC_CLOCK_DDR   DDRD
+#define IBMPC_DATA_PORT   PORTD
+#define IBMPC_DATA_PIN    PIND
+#define IBMPC_DATA_DDR    DDRD
+
+// primary interface
+#define IBMPC_CLOCK_BIT   1
+#define IBMPC_DATA_BIT    0
+
+#define IBMPC_INT_INIT()  do {  \
+    EICRA |= ((1<<ISC11) |      \
+              (0<<ISC10));      \
+} while (0)
+#define IBMPC_INT_ON()  do {    \
+    EIFR  |= (1<<INTF1);        \
+    EIMSK |= (1<<INT1);         \
+} while (0)
+#define IBMPC_INT_OFF() do {    \
+    EIMSK &= ~(1<<INT1);        \
+} while (0)
+#define IBMPC_INT_VECT    INT1_vect
+
+// secondary interface
+#ifdef IBMPC_SECONDARY
+#define IBMPC_CLOCK_BIT1  3
+#define IBMPC_DATA_BIT1   2
+
+#define IBMPC_INT_INIT1()  do { \
+    EICRA |= ((1<<ISC31) |      \
+              (0<<ISC30));      \
+} while (0)
+#define IBMPC_INT_ON1()  do {   \
+    EIFR  |= (1<<INTF3);        \
+    EIMSK |= (1<<INT3);         \
+} while (0)
+#define IBMPC_INT_OFF1() do {   \
+    EIMSK &= ~(1<<INT3);        \
+} while (0)
+#define IBMPC_INT_VECT1   INT3_vect
+#endif
+
+/* reset line */
+#define IBMPC_RST_PORT    PORTB
+#define IBMPC_RST_PIN     PINB
+#define IBMPC_RST_DDR     DDRB
+#define IBMPC_RST_BIT0    6
+#define IBMPC_RST_BIT1    7
+
+/* reset for XT Type-1 keyboard: low pulse for 500ms */
+#define IBMPC_RST_HIZ() do { \
+    IBMPC_RST_PORT &= ~(1<<IBMPC_RST_BIT0);  \
+    IBMPC_RST_DDR  &= ~(1<<IBMPC_RST_BIT0);  \
+    IBMPC_RST_PORT &= ~(1<<IBMPC_RST_BIT1);  \
+    IBMPC_RST_DDR  &= ~(1<<IBMPC_RST_BIT1);  \
+} while (0)
+
+#define IBMPC_RST_LO() do { \
+    IBMPC_RST_PORT &= ~(1<<IBMPC_RST_BIT0);  \
+    IBMPC_RST_DDR  |=  (1<<IBMPC_RST_BIT0);  \
+    IBMPC_RST_PORT &= ~(1<<IBMPC_RST_BIT1);  \
+    IBMPC_RST_DDR  |=  (1<<IBMPC_RST_BIT1);  \
+} while (0)

keyboards/converter/ibmpc_usb/atmega32u4_atmel_dfu/ibmpc.h

@@ -0,0 +1,208 @@
+/*
+Copyright 2010,2011,2012,2013,2019 Jun WAKO <[email protected]>
+
+This software is licensed with a Modified BSD License.
+All of this is supposed to be Free Software, Open Source, DFSG-free,
+GPL-compatible, and OK to use in both free and proprietary applications.
+Additions and corrections to this file are welcome.
+
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+
+* Neither the name of the copyright holders nor the names of
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#pragma once
+
+#include <stdbool.h>
+#include "wait.h"
+#include "print.h"
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <util/atomic.h>
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+
+
+/*
+ * IBM PC keyboard protocol
+ *
+ * PS/2 Resources
+ * --------------
+ * [1] The PS/2 Mouse/Keyboard Protocol
+ * http://www.computer-engineering.org/ps2protocol/
+ * Concise and thorough primer of PS/2 protocol.
+ *
+ * [2] Keyboard and Auxiliary Device Controller
+ * http://www.mcamafia.de/pdf/ibm_hitrc07.pdf
+ * Signal Timing and Format
+ *
+ * [3] Keyboards(101- and 102-key)
+ * http://www.mcamafia.de/pdf/ibm_hitrc11.pdf
+ * Keyboard Layout, Scan Code Set, POR, and Commands.
+ *
+ * [4] PS/2 Reference Manuals
+ * http://www.mcamafia.de/pdf/ibm_hitrc07.pdf
+ * Collection of IBM Personal System/2 documents.
+ *
+ * [5] TrackPoint Engineering Specifications for version 3E
+ * https://web.archive.org/web/20100526161812/http://wwwcssrv.almaden.ibm.com/trackpoint/download.html
+ */
+#define IBMPC_ACK         0xFA
+#define IBMPC_RESEND      0xFE
+#define IBMPC_SET_LED     0xED
+
+#define IBMPC_PROTOCOL_NO       0
+#define IBMPC_PROTOCOL_AT       0x10
+#define IBMPC_PROTOCOL_AT_Z150  0x11
+#define IBMPC_PROTOCOL_XT       0x20
+#define IBMPC_PROTOCOL_XT_IBM   0x21
+#define IBMPC_PROTOCOL_XT_CLONE 0x22
+#define IBMPC_PROTOCOL_XT_ERROR 0x23
+
+// Error numbers
+#define IBMPC_ERR_NONE        0
+#define IBMPC_ERR_RECV        0x00
+#define IBMPC_ERR_SEND        0x10
+#define IBMPC_ERR_TIMEOUT     0x20
+#define IBMPC_ERR_FULL        0x40
+#define IBMPC_ERR_ILLEGAL     0x80
+#define IBMPC_ERR_FF          0xF0
+
+#define IBMPC_LED_SCROLL_LOCK 0
+#define IBMPC_LED_NUM_LOCK    1
+#define IBMPC_LED_CAPS_LOCK   2
+
+
+extern volatile uint16_t ibmpc_isr_debug;
+extern volatile uint8_t ibmpc_protocol;
+extern volatile uint8_t ibmpc_error;
+
+void ibmpc_host_init(void);
+void ibmpc_host_enable(void);
+void ibmpc_host_disable(void);
+int16_t ibmpc_host_send(uint8_t data);
+int16_t ibmpc_host_recv_response(void);
+int16_t ibmpc_host_recv(void);
+void ibmpc_host_isr_clear(void);
+void ibmpc_host_set_led(uint8_t usb_led);
+
+
+/*--------------------------------------------------------------------
+ * static functions
+ *------------------------------------------------------------------*/
+#if defined(__AVR__)
+/*
+ * Clock
+ */
+static inline void clock_lo(void)
+{
+    IBMPC_CLOCK_PORT &= ~(1<<IBMPC_CLOCK_BIT);
+    IBMPC_CLOCK_DDR  |=  (1<<IBMPC_CLOCK_BIT);
+}
+
+static inline void clock_hi(void)
+{
+    /* input with pull up */
+    IBMPC_CLOCK_DDR  &= ~(1<<IBMPC_CLOCK_BIT);
+    IBMPC_CLOCK_PORT |=  (1<<IBMPC_CLOCK_BIT);
+}
+
+static inline bool clock_in(void)
+{
+    IBMPC_CLOCK_DDR  &= ~(1<<IBMPC_CLOCK_BIT);
+    IBMPC_CLOCK_PORT |=  (1<<IBMPC_CLOCK_BIT);
+    wait_us(1);
+    return IBMPC_CLOCK_PIN&(1<<IBMPC_CLOCK_BIT);
+}
+
+/*
+ * Data
+ */
+static inline void data_lo(void)
+{
+    IBMPC_DATA_PORT &= ~(1<<IBMPC_DATA_BIT);
+    IBMPC_DATA_DDR  |=  (1<<IBMPC_DATA_BIT);
+}
+
+static inline void data_hi(void)
+{
+    /* input with pull up */
+    IBMPC_DATA_DDR  &= ~(1<<IBMPC_DATA_BIT);
+    IBMPC_DATA_PORT |=  (1<<IBMPC_DATA_BIT);
+}
+
+static inline bool data_in(void)
+{
+    IBMPC_DATA_DDR  &= ~(1<<IBMPC_DATA_BIT);
+    IBMPC_DATA_PORT |=  (1<<IBMPC_DATA_BIT);
+    wait_us(1);
+    return IBMPC_DATA_PIN&(1<<IBMPC_DATA_BIT);
+}
+#endif
+
+
+static inline uint16_t wait_clock_lo(uint16_t us)
+{
+    while (clock_in()  && us) { asm(""); wait_us(1); us--; }
+    return us;
+}
+static inline uint16_t wait_clock_hi(uint16_t us)
+{
+    while (!clock_in() && us) { asm(""); wait_us(1); us--; }
+    return us;
+}
+static inline uint16_t wait_data_lo(uint16_t us)
+{
+    while (data_in() && us)  { asm(""); wait_us(1); us--; }
+    return us;
+}
+static inline uint16_t wait_data_hi(uint16_t us)
+{
+    while (!data_in() && us)  { asm(""); wait_us(1); us--; }
+    return us;
+}
+
+/* idle state that device can send */
+static inline void idle(void)
+{
+    clock_hi();
+    data_hi();
+}
+
+/* inhibit device to send(AT), soft reset(XT) */
+static inline void inhibit(void)
+{
+    clock_lo();
+    data_hi();
+}
+
+/* inhibit device to send(XT) */
+static inline void inhibit_xt(void)
+{
+    clock_hi();
+    data_lo();
+}

keyboards/converter/ibmpc_usb/atmega32u4_atmel_dfu/rules.mk

@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c ibmpc.c
+
+# EEPROM_DRIVER = i2c