aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Andersson <wraul@dbox.se>2013-05-01 11:30:01 +0200
committerMathias Andersson <wraul@dbox.se>2013-05-02 20:37:41 +0200
commit3f48b13f81f276dc8d0bd96607b70d13f9b5e883 (patch)
tree52483d6343a36b50491a6689b23a2c33daef278b
parent1e07b60d3ac6f9ad150bd9dab564af2583b97774 (diff)
downloadfirmware-3f48b13f81f276dc8d0bd96607b70d13f9b5e883.tar.gz
firmware-3f48b13f81f276dc8d0bd96607b70d13f9b5e883.tar.bz2
firmware-3f48b13f81f276dc8d0bd96607b70d13f9b5e883.zip
Code style fixes for Phantom matrix.
-rw-r--r--keyboard/phantom/matrix.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/keyboard/phantom/matrix.c b/keyboard/phantom/matrix.c
index e9606ef5d..386feea41 100644
--- a/keyboard/phantom/matrix.c
+++ b/keyboard/phantom/matrix.c
@@ -42,22 +42,22 @@ static void select_col(uint8_t col);
reaches the value in the output compare register,
and are turned on when it reaches TOP (=256). */
static
-void setup_leds(void) {
- TCCR1A |= // Timer control register 1A
- (1<<WGM10) | // Fast PWM 8-bit
- (1<<COM1B1)| // Clear OC1B on match, set at TOP
- (1<<COM1C1); // Clear OC1C on match, set at TOP
- TCCR1B |= // Timer control register 1B
- (1<<WGM12) | // Fast PWM 8-bit
- (1<<CS12); // Prescaler 256
- OCR1B = 250; // Output compare register 1B
- OCR1C = 250; // Output compare register 1C
- // LEDs: LED_A -> PORTB6, LED_B -> PORTB7
- DDRB &= 0x3F;
- PORTB &= 0x3F;
+void setup_leds(void)
+{
+ TCCR1A |= // Timer control register 1A
+ (1<<WGM10) | // Fast PWM 8-bit
+ (1<<COM1B1)| // Clear OC1B on match, set at TOP
+ (1<<COM1C1); // Clear OC1C on match, set at TOP
+ TCCR1B |= // Timer control register 1B
+ (1<<WGM12) | // Fast PWM 8-bit
+ (1<<CS12); // Prescaler 256
+ OCR1B = 250; // Output compare register 1B
+ OCR1C = 250; // Output compare register 1C
+ // LEDs: LED_A -> PORTB6, LED_B -> PORTB7
+ DDRB &= 0x3F;
+ PORTB &= 0x3F;
}
-
inline
uint8_t matrix_rows(void)
{
@@ -82,7 +82,7 @@ void matrix_init(void)
setup_leds();
// initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+ for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
matrix[i] = 0;
matrix_debouncing[i] = 0;
}