From b4cd3fab9be4ce620298bc7ff5c0e0d299688860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Thu, 13 Jun 2019 14:37:14 +0200
Subject: [PATCH] Rename BLACKBERRY_TRACKBALL_{TOP,BOTTOM} to
 BLACKBERRY_TRACKBALL_{UP,DOWN}

---
 keycluster/src/blackberry_trackball.c | 24 ++++++++++++------------
 keycluster/src/blackberry_trackball.h | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/keycluster/src/blackberry_trackball.c b/keycluster/src/blackberry_trackball.c
index 59beeb6..7795a09 100644
--- a/keycluster/src/blackberry_trackball.c
+++ b/keycluster/src/blackberry_trackball.c
@@ -16,15 +16,15 @@ void BlackberryTrackball_Init(void)
     PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_RIGHT_PORT, BLACKBERRY_TRACKBALL_RIGHT_PIN, kPORT_InterruptEitherEdge);
     NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_RIGHT_IRQ);
 
-    CLOCK_EnableClock(BLACKBERRY_TRACKBALL_TOP_CLOCK);
-    PORT_SetPinMux(BLACKBERRY_TRACKBALL_TOP_PORT, BLACKBERRY_TRACKBALL_TOP_PIN, kPORT_MuxAsGpio);
-    PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_TOP_PORT, BLACKBERRY_TRACKBALL_TOP_PIN, kPORT_InterruptEitherEdge);
-    NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_TOP_IRQ);
+    CLOCK_EnableClock(BLACKBERRY_TRACKBALL_UP_CLOCK);
+    PORT_SetPinMux(BLACKBERRY_TRACKBALL_UP_PORT, BLACKBERRY_TRACKBALL_UP_PIN, kPORT_MuxAsGpio);
+    PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_UP_PORT, BLACKBERRY_TRACKBALL_UP_PIN, kPORT_InterruptEitherEdge);
+    NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_UP_IRQ);
 
-    CLOCK_EnableClock(BLACKBERRY_TRACKBALL_BOTTOM_CLOCK);
-    PORT_SetPinMux(BLACKBERRY_TRACKBALL_BOTTOM_PORT, BLACKBERRY_TRACKBALL_BOTTOM_PIN, kPORT_MuxAsGpio);
-    PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_BOTTOM_PORT, BLACKBERRY_TRACKBALL_BOTTOM_PIN, kPORT_InterruptEitherEdge);
-    NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_BOTTOM_IRQ);
+    CLOCK_EnableClock(BLACKBERRY_TRACKBALL_DOWN_CLOCK);
+    PORT_SetPinMux(BLACKBERRY_TRACKBALL_DOWN_PORT, BLACKBERRY_TRACKBALL_DOWN_PIN, kPORT_MuxAsGpio);
+    PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_DOWN_PORT, BLACKBERRY_TRACKBALL_DOWN_PIN, kPORT_InterruptEitherEdge);
+    NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_DOWN_IRQ);
 }
 
 void handleTrackball(void)
@@ -39,14 +39,14 @@ void handleTrackball(void)
         GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_RIGHT_GPIO, 1U << BLACKBERRY_TRACKBALL_RIGHT_PIN);
     }
 
-    if (PORT_GetPinsInterruptFlags(BLACKBERRY_TRACKBALL_TOP_PORT) & (1 << BLACKBERRY_TRACKBALL_TOP_PIN)) {
+    if (PORT_GetPinsInterruptFlags(BLACKBERRY_TRACKBALL_UP_PORT) & (1 << BLACKBERRY_TRACKBALL_UP_PIN)) {
         BlackBerryTrackball_PointerDelta.y++;
-        GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_TOP_GPIO, 1U << BLACKBERRY_TRACKBALL_TOP_PIN);
+        GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_UP_GPIO, 1U << BLACKBERRY_TRACKBALL_UP_PIN);
     }
 
-    if (PORT_GetPinsInterruptFlags(BLACKBERRY_TRACKBALL_BOTTOM_PORT) & (1 << BLACKBERRY_TRACKBALL_BOTTOM_PIN)) {
+    if (PORT_GetPinsInterruptFlags(BLACKBERRY_TRACKBALL_DOWN_PORT) & (1 << BLACKBERRY_TRACKBALL_DOWN_PIN)) {
         BlackBerryTrackball_PointerDelta.y--;
-        GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_BOTTOM_GPIO, 1U << BLACKBERRY_TRACKBALL_BOTTOM_PIN);
+        GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_DOWN_GPIO, 1U << BLACKBERRY_TRACKBALL_DOWN_PIN);
     }
 }
 
diff --git a/keycluster/src/blackberry_trackball.h b/keycluster/src/blackberry_trackball.h
index aedef7e..4d1a7e8 100644
--- a/keycluster/src/blackberry_trackball.h
+++ b/keycluster/src/blackberry_trackball.h
@@ -19,17 +19,17 @@
     #define BLACKBERRY_TRACKBALL_RIGHT_CLOCK kCLOCK_PortA
     #define BLACKBERRY_TRACKBALL_RIGHT_PIN 12
 
-    #define BLACKBERRY_TRACKBALL_TOP_PORT PORTB
-    #define BLACKBERRY_TRACKBALL_TOP_GPIO GPIOB
-    #define BLACKBERRY_TRACKBALL_TOP_IRQ PORTB_IRQn
-    #define BLACKBERRY_TRACKBALL_TOP_CLOCK kCLOCK_PortB
-    #define BLACKBERRY_TRACKBALL_TOP_PIN 2
+    #define BLACKBERRY_TRACKBALL_UP_PORT PORTB
+    #define BLACKBERRY_TRACKBALL_UP_GPIO GPIOB
+    #define BLACKBERRY_TRACKBALL_UP_IRQ PORTB_IRQn
+    #define BLACKBERRY_TRACKBALL_UP_CLOCK kCLOCK_PortB
+    #define BLACKBERRY_TRACKBALL_UP_PIN 2
 
-    #define BLACKBERRY_TRACKBALL_BOTTOM_PORT PORTB
-    #define BLACKBERRY_TRACKBALL_BOTTOM_GPIO GPIOB
-    #define BLACKBERRY_TRACKBALL_BOTTOM_IRQ PORTB_IRQn
-    #define BLACKBERRY_TRACKBALL_BOTTOM_CLOCK kCLOCK_PortB
-    #define BLACKBERRY_TRACKBALL_BOTTOM_PIN 0
+    #define BLACKBERRY_TRACKBALL_DOWN_PORT PORTB
+    #define BLACKBERRY_TRACKBALL_DOWN_GPIO GPIOB
+    #define BLACKBERRY_TRACKBALL_DOWN_IRQ PORTB_IRQn
+    #define BLACKBERRY_TRACKBALL_DOWN_CLOCK kCLOCK_PortB
+    #define BLACKBERRY_TRACKBALL_DOWN_PIN 0
 
     #define BLACKBERRY_TRACKBALL_IRQ_HANDLER1 PORTA_IRQHandler
     #define BLACKBERRY_TRACKBALL_IRQ_HANDLER2 PORTB_IRQHandler