From 05c00430b3a5ca5c2108717bbc05aedc5ec4cdca Mon Sep 17 00:00:00 2001 From: Thad House Date: Wed, 13 Jul 2016 20:16:45 -0700 Subject: [PATCH] Fixes CPP lint errors added to HAL. (#173) --- hal/lib/athena/PCMInternal.cpp | 2 +- hal/lib/athena/PWM.cpp | 4 ++-- hal/lib/athena/SPI.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hal/lib/athena/PCMInternal.cpp b/hal/lib/athena/PCMInternal.cpp index 25dce802c9..a2da8c3811 100644 --- a/hal/lib/athena/PCMInternal.cpp +++ b/hal/lib/athena/PCMInternal.cpp @@ -23,4 +23,4 @@ void initializePCM(int32_t module, int32_t* status) { PCM_modules[module] = new PCM(module); } } -} +} // namespace hal diff --git a/hal/lib/athena/PWM.cpp b/hal/lib/athena/PWM.cpp index 9635932166..bdd1ad2f07 100644 --- a/hal/lib/athena/PWM.cpp +++ b/hal/lib/athena/PWM.cpp @@ -75,7 +75,7 @@ HAL_DigitalHandle HAL_InitializePWMPort(HAL_PortHandle port_handle, port->pin = origPin; int32_t bitToSet = 1 << remapMXPPWMChannel(port->pin); - unsigned short specialFunctions = + uint16_t specialFunctions = digitalSystem->readEnableMXPSpecialFunction(status); digitalSystem->writeEnableMXPSpecialFunction(specialFunctions | bitToSet, status); @@ -91,7 +91,7 @@ void HAL_FreePWMPort(HAL_DigitalHandle pwm_port_handle, int32_t* status) { if (port->pin > tPWM::kNumHdrRegisters - 1) { int32_t bitToUnset = 1 << remapMXPPWMChannel(port->pin); - unsigned short specialFunctions = + uint16_t specialFunctions = digitalSystem->readEnableMXPSpecialFunction(status); digitalSystem->writeEnableMXPSpecialFunction(specialFunctions & ~bitToUnset, status); diff --git a/hal/lib/athena/SPI.cpp b/hal/lib/athena/SPI.cpp index 3f28315b12..a1e9aa7c2d 100644 --- a/hal/lib/athena/SPI.cpp +++ b/hal/lib/athena/SPI.cpp @@ -240,8 +240,8 @@ void HAL_SetSPISpeed(int32_t port, int32_t speed) { void HAL_SetSPIOpts(int32_t port, HAL_Bool msb_first, HAL_Bool sample_on_trailing, HAL_Bool clk_idle_high) { std::lock_guard sync(spiGetMutex(port)); - spilib_setopts(HAL_GetSPIHandle(port), (int)msb_first, - (int)sample_on_trailing, (int)clk_idle_high); + spilib_setopts(HAL_GetSPIHandle(port), msb_first, sample_on_trailing, + clk_idle_high); } /**