From c1c6301ce358bb9b8f5b8a10c2e0de4d61a247a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 26 Sep 2016 01:00:14 +0200 Subject: [PATCH] Remove unused code, mostly board macros and BOARD_InitDebugConsole() --- right/include/board/board.c | 49 ------------------------- right/include/board/board.h | 66 ---------------------------------- right/include/board/pin_mux.c | 6 ---- right/main.c | 1 - right/usb_interface_keyboard.c | 2 +- 5 files changed, 1 insertion(+), 123 deletions(-) diff --git a/right/include/board/board.c b/right/include/board/board.c index f7b78a9..e69de29 100644 --- a/right/include/board/board.c +++ b/right/include/board/board.c @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2015, Freescale Semiconductor, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * o Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * o 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. - * - * o Neither the name of Freescale Semiconductor, Inc. nor the names of its - * 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 HOLDER 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. - */ - -#include -#include "fsl_common.h" -#include "fsl_debug_console.h" -#include "board.h" - -/******************************************************************************* - * Variables - ******************************************************************************/ - -/******************************************************************************* - * Code - ******************************************************************************/ -/* Initialize debug console. */ -void BOARD_InitDebugConsole(void) -{ - uint32_t uartClkSrcFreq = BOARD_DEBUG_UART_CLK_FREQ; - - DbgConsole_Init(BOARD_DEBUG_UART_BASEADDR, BOARD_DEBUG_UART_BAUDRATE, BOARD_DEBUG_UART_TYPE, uartClkSrcFreq); -} diff --git a/right/include/board/board.h b/right/include/board/board.h index 7ba7187..5c72185 100644 --- a/right/include/board/board.h +++ b/right/include/board/board.h @@ -37,61 +37,14 @@ /******************************************************************************* * Definitions ******************************************************************************/ -/*! @brief The board name */ -#define BOARD_NAME "FRDM-K22F" - -/*! @brief The UART to use for debug messages. */ -#define BOARD_USE_UART -#define BOARD_DEBUG_UART_TYPE DEBUG_CONSOLE_DEVICE_TYPE_UART -#define BOARD_DEBUG_UART_BASEADDR (uint32_t) UART1 -#define BOARD_DEBUG_UART_CLKSRC SYS_CLK -#define BOARD_DEBUG_UART_CLK_FREQ CLOCK_GetCoreSysClkFreq() -#define BOARD_UART_IRQ UART1_RX_TX_IRQn -#define BOARD_UART_IRQ_HANDLER UART1_RX_TX_IRQHandler - -#ifndef BOARD_DEBUG_UART_BAUDRATE -#define BOARD_DEBUG_UART_BAUDRATE 115200 -#endif /* BOARD_DEBUG_UART_BAUDRATE */ - -/*! @brief The Flextimer instance/channel used for board */ -#define BOARD_FTM_BASEADDR FTM0 -#define BOARD_FTM_CHANNEL 5U -#define BOARD_FTM_X_CHANNEL 0U -#define BOARD_FTM_Y_CHANNEL 1U -#define BOARD_FTM_PERIOD_HZ 100U -#define BOARD_FTM_IRQ_HANDLER FTM0_IRQHandler -#define BOARD_FTM_IRQ_VECTOR FTM0_IRQn - -/*! @brief The bubble level demo information */ -#define BOARD_FXOS8700_ADDR 0x1C -#define BOARD_ACCEL_ADDR BOARD_FXOS8700_ADDR -#define BOARD_ACCEL_BAUDRATE 100 -#define BOARD_ACCEL_I2C_BASEADDR I2C0 - -/*! @brief The i2c instance used for i2c connection by default */ -#define BOARD_I2C_BASEADDR I2C0 - -/*! @brief The CMP instance/channel used for board. */ -#define BOARD_CMP_BASEADDR CMP0 -#define BOARD_CMP_CHANNEL 0U - -/*! @brief The rtc instance used for board. */ -#define BOARD_RTC_FUNC_BASEADDR RTC /*! @brief Define the port interrupt number for the board switches */ -#define BOARD_SW3_GPIO GPIOB -#define BOARD_SW3_PORT PORTB -#define BOARD_SW3_GPIO_PIN 17 -#define BOARD_SW3_IRQ PORTB_IRQn -#define BOARD_SW3_IRQ_HANDLER PORTB_IRQHandler -#define BOARD_SW3_NAME "SW3" #define BOARD_SW2_GPIO GPIOC #define BOARD_SW2_PORT PORTC #define BOARD_SW2_GPIO_PIN 1 #define BOARD_SW2_IRQ PORTC_IRQn #define BOARD_SW2_IRQ_HANDLER PORTC_IRQHandler -#define BOARD_SW2_NAME "SW2" /* Board led color mapping */ #define LOGIC_LED_ON 0U @@ -110,23 +63,4 @@ #define LED_RED_TOGGLE() \ GPIO_TogglePinsOutput(BOARD_LED_RED_GPIO, 1U << BOARD_LED_RED_GPIO_PIN) /*!< Toggle on target LED_RED */ -/* @brief FreeRTOS tickless timer configuration. */ -#define vPortLptmrIsr LPTMR0_IRQHandler /*!< Timer IRQ handler. */ -#define TICKLESS_LPTMR_BASE_PTR LPTMR0 /*!< Tickless timer base address. */ -#define TICKLESS_LPTMR_IRQn LPTMR0_IRQn /*!< Tickless timer IRQ number. */ - -#if defined(__cplusplus) -extern "C" { -#endif /* __cplusplus */ - -/******************************************************************************* - * API - ******************************************************************************/ - -void BOARD_InitDebugConsole(void); - -#if defined(__cplusplus) -} -#endif /* __cplusplus */ - #endif /* _BOARD_H_ */ diff --git a/right/include/board/pin_mux.c b/right/include/board/pin_mux.c index ca52103..5704dec 100644 --- a/right/include/board/pin_mux.c +++ b/right/include/board/pin_mux.c @@ -51,17 +51,11 @@ void BOARD_InitPins(void) .mux = kPORT_MuxAsGpio, }; PORT_SetPinConfig(BOARD_SW2_PORT, BOARD_SW2_GPIO_PIN, &switchConfig); - PORT_SetPinConfig(BOARD_SW3_PORT, BOARD_SW3_GPIO_PIN, &switchConfig); // Initialize LEDs. PORT_SetPinMux(BOARD_LED_RED_GPIO_PORT, BOARD_LED_RED_GPIO_PIN, kPORT_MuxAsGpio); - gpio_pin_config_t led_config = { - .pinDirection = kGPIO_DigitalOutput, - .outputLogic = 0, - }; - LED_RED_INIT(LOGIC_LED_ON); GPIO_SetPinsOutput(BOARD_LED_RED_GPIO, 1 << BOARD_LED_RED_GPIO_PIN); diff --git a/right/main.c b/right/main.c index 8ba0722..2d5c40f 100644 --- a/right/main.c +++ b/right/main.c @@ -62,7 +62,6 @@ void InitLedDisplay() void main() { BOARD_InitPins(); BOARD_BootClockRUN(); - BOARD_InitDebugConsole(); i2c_master_config_t masterConfig; uint32_t sourceClock; diff --git a/right/usb_interface_keyboard.c b/right/usb_interface_keyboard.c index 8868033..a78db9f 100644 --- a/right/usb_interface_keyboard.c +++ b/right/usb_interface_keyboard.c @@ -44,7 +44,7 @@ static usb_status_t UsbKeyboardAction(void) UsbKeyboardReport.scancodes[scancode_idx] = 0; } - if (!GPIO_ReadPinInput(BOARD_SW3_GPIO, BOARD_SW3_GPIO_PIN)) { + if (!GPIO_ReadPinInput(BOARD_SW2_GPIO, BOARD_SW2_GPIO_PIN)) { UsbKeyboardReport.scancodes[0] = HID_KEYBOARD_SC_A; }