1
0
Fork 0

clang-format changes

This commit is contained in:
skullY 2019-08-30 11:19:03 -07:00 committed by skullydazed
parent 61af76a10d
commit b624f32f94
502 changed files with 32259 additions and 39062 deletions

View file

@ -1,7 +1,7 @@
/*
NeXT non-ADB Keyboard Protocol
Copyright 2013, Benjamin Gould (bgould@github.com)
Based on:
@ -53,10 +53,10 @@ POSSIBILITY OF SUCH DAMAGE.
#include "next_kbd.h"
#include "debug.h"
static inline void out_lo(void);
static inline void out_hi(void);
static inline void query(void);
static inline void reset(void);
static inline void out_lo(void);
static inline void out_hi(void);
static inline void query(void);
static inline void reset(void);
static inline uint32_t response(void);
/* The keyboard sends signal with 50us pulse width on OUT line
@ -65,53 +65,65 @@ static inline uint32_t response(void);
* but it works well with 51us(+1us) on TMK converter(ATMeaga32u2) at least.
* TODO: test on Teensy and Pro Micro configuration
*/
#define out_hi_delay(intervals) do { out_hi(); _delay_us((NEXT_KBD_TIMING+1) * intervals); } while (0);
#define out_lo_delay(intervals) do { out_lo(); _delay_us((NEXT_KBD_TIMING+1) * intervals); } while (0);
#define query_delay(intervals) do { query(); _delay_us((NEXT_KBD_TIMING+1) * intervals); } while (0);
#define reset_delay(intervals) do { reset(); _delay_us((NEXT_KBD_TIMING+1) * intervals); } while (0);
#define out_hi_delay(intervals) \
do { \
out_hi(); \
_delay_us((NEXT_KBD_TIMING + 1) * intervals); \
} while (0);
#define out_lo_delay(intervals) \
do { \
out_lo(); \
_delay_us((NEXT_KBD_TIMING + 1) * intervals); \
} while (0);
#define query_delay(intervals) \
do { \
query(); \
_delay_us((NEXT_KBD_TIMING + 1) * intervals); \
} while (0);
#define reset_delay(intervals) \
do { \
reset(); \
_delay_us((NEXT_KBD_TIMING + 1) * intervals); \
} while (0);
void next_kbd_init(void)
{
void next_kbd_init(void) {
out_hi();
NEXT_KBD_IN_DDR &= ~(1<<NEXT_KBD_IN_BIT); // KBD_IN to input
NEXT_KBD_IN_PORT |= (1<<NEXT_KBD_IN_BIT); // KBD_IN pull up
NEXT_KBD_IN_DDR &= ~(1 << NEXT_KBD_IN_BIT); // KBD_IN to input
NEXT_KBD_IN_PORT |= (1 << NEXT_KBD_IN_BIT); // KBD_IN pull up
query_delay(5);
reset_delay(8);
query_delay(5);
reset_delay(8);
}
void next_kbd_set_leds(bool left, bool right)
{
void next_kbd_set_leds(bool left, bool right) {
cli();
out_lo_delay(9);
out_hi_delay(3);
out_lo_delay(1);
if (left) {
out_hi_delay(1);
} else {
out_lo_delay(1);
}
if (right) {
out_hi_delay(1);
} else {
out_lo_delay(1);
}
out_lo_delay(7);
out_hi();
sei();
}
#define NEXT_KBD_READ (NEXT_KBD_IN_PIN&(1<<NEXT_KBD_IN_BIT))
uint32_t next_kbd_recv(void)
{
#define NEXT_KBD_READ (NEXT_KBD_IN_PIN & (1 << NEXT_KBD_IN_BIT))
uint32_t next_kbd_recv(void) {
// First check to make sure that the keyboard is actually connected;
// if not, just return
// TODO: reflect the status of the keyboard in a return code
@ -122,22 +134,23 @@ uint32_t next_kbd_recv(void)
query();
uint32_t resp = response();
return resp;
}
static inline uint32_t response(void)
{
static inline uint32_t response(void) {
cli();
// try a 5ms read; this should be called after the query method has
// been run so if a key is pressed we should get a response within
// 5ms; if not then send a reset and exit
uint8_t i = 0;
uint32_t data = 0;
uint8_t i = 0;
uint32_t data = 0;
uint16_t reset_timeout = 50000;
while (NEXT_KBD_READ && reset_timeout) {
asm(""); _delay_us(1); reset_timeout--;
while (NEXT_KBD_READ && reset_timeout) {
asm("");
_delay_us(1);
reset_timeout--;
}
if (!reset_timeout) {
reset();
@ -145,64 +158,58 @@ static inline uint32_t response(void)
return 0;
}
_delay_us(NEXT_KBD_TIMING / 2);
for (; i < 22; i++)
{
if (NEXT_KBD_READ)
{
data |= ((uint32_t) 1 << i);
for (; i < 22; i++) {
if (NEXT_KBD_READ) {
data |= ((uint32_t)1 << i);
/* Note:
* My testing with the ATmega32u4 showed that there might
* something wrong with the timing here; by the end of the
* second data byte some of the modifiers can get bumped out
* to the next bit over if we just cycle through the data
* based on the expected interval. There is a bit (i = 10)
* in the middle of the data that is always on followed by
* one that is always off - so we'll use that to reset our
* based on the expected interval. There is a bit (i = 10)
* in the middle of the data that is always on followed by
* one that is always off - so we'll use that to reset our
* timing in case we've gotten ahead of the keyboard;
*/
if (i == 10)
{
if (i == 10) {
i++;
while (NEXT_KBD_READ) ;
while (NEXT_KBD_READ)
;
_delay_us(NEXT_KBD_TIMING / 2);
}
} else {
/* redundant - but I don't want to remove if it might screw
* up the timing
*/
data |= ((uint32_t) 0 << i);
data |= ((uint32_t)0 << i);
}
_delay_us(NEXT_KBD_TIMING);
}
sei();
return data;
}
static inline void out_lo(void)
{
NEXT_KBD_OUT_PORT &= ~(1<<NEXT_KBD_OUT_BIT);
NEXT_KBD_OUT_DDR |= (1<<NEXT_KBD_OUT_BIT);
static inline void out_lo(void) {
NEXT_KBD_OUT_PORT &= ~(1 << NEXT_KBD_OUT_BIT);
NEXT_KBD_OUT_DDR |= (1 << NEXT_KBD_OUT_BIT);
}
static inline void out_hi(void)
{
static inline void out_hi(void) {
/* input with pull up */
NEXT_KBD_OUT_DDR &= ~(1<<NEXT_KBD_OUT_BIT);
NEXT_KBD_OUT_PORT |= (1<<NEXT_KBD_OUT_BIT);
NEXT_KBD_OUT_DDR &= ~(1 << NEXT_KBD_OUT_BIT);
NEXT_KBD_OUT_PORT |= (1 << NEXT_KBD_OUT_BIT);
}
static inline void query(void)
{
static inline void query(void) {
out_lo_delay(5);
out_hi_delay(1);
out_lo_delay(3);
out_hi();
}
static inline void reset(void)
{
static inline void reset(void) {
out_lo_delay(1);
out_hi_delay(4);
out_lo_delay(1);