From 051575d911ac3ee1257b0c60c9786b5ca5cc37cd Mon Sep 17 00:00:00 2001 From: Robert May Date: Wed, 18 Nov 2015 23:13:57 +0000 Subject: [PATCH] Tidy up gcc -Wall fixes. --- source/MicroBit.cpp | 5 +---- source/MicroBitFiber.cpp | 4 +--- source/MicroBitThermometer.cpp | 14 +++++++------- .../ble-services/MicroBitAccelerometerService.cpp | 3 +-- source/ble-services/MicroBitDFUService.cpp | 6 ++---- .../ble-services/MicroBitMagnetometerService.cpp | 8 ++------ source/ble-services/MicroBitTemperatureService.cpp | 4 +--- 7 files changed, 15 insertions(+), 29 deletions(-) diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp index b3367b2..1d82965 100644 --- a/source/MicroBit.cpp +++ b/source/MicroBit.cpp @@ -31,11 +31,8 @@ microbit_reset() /** * Callback when a BLE GATT disconnect occurs. */ -void bleDisconnectionCallback(Gap::Handle_t handle, Gap::DisconnectionReason_t reason) +void bleDisconnectionCallback(Gap::Handle_t, Gap::DisconnectionReason_t) { - (void) handle; /* -Wunused-param */ - (void) reason; /* -Wunused-param */ - uBit.ble->startAdvertising(); } diff --git a/source/MicroBitFiber.cpp b/source/MicroBitFiber.cpp index 461da33..26816de 100644 --- a/source/MicroBitFiber.cpp +++ b/source/MicroBitFiber.cpp @@ -533,10 +533,8 @@ Fiber *create_fiber(void (*entry_fn)(void *), void *param, void (*completion_fn) * Default exit point for all parameterised fibers. * Any fiber reaching the end of its entry function will return here for recycling. */ -void release_fiber(void * param) +void release_fiber(void *) { - (void)param; /* -Wunused-parameter */ - release_fiber(); } diff --git a/source/MicroBitThermometer.cpp b/source/MicroBitThermometer.cpp index 2619f69..e730289 100644 --- a/source/MicroBitThermometer.cpp +++ b/source/MicroBitThermometer.cpp @@ -1,13 +1,13 @@ #include "MicroBit.h" /** - * Turn off warnings under gcc -Wall - * We turn off unused-function for the entire compilation - * unit as the compiler can't tell if a function is - * unused until the end of the unit. The macro - * expansion for SVCALL() in nrf_soc.h and nrf_srv.h - * tries to leave unused-function turned off, but - * It might be leaner to add + * Turn off warnings under gcc -Wall. We turn off unused-function for the + * entire compilation unit as the compiler can't tell if a function is + * unused until the end of the unit. The macro expansion for SVCALL() + * in nrf_soc.h and nrf_srv.h tries to leave unused-function turned off, + * but we restore the state from before the include with our diagnostics + * pop. + * It might be cleaner to add * #pragram GCC system header * as the first line of nrf_soc.h, but that's a different * module ... diff --git a/source/ble-services/MicroBitAccelerometerService.cpp b/source/ble-services/MicroBitAccelerometerService.cpp index 46d299a..d1d2631 100644 --- a/source/ble-services/MicroBitAccelerometerService.cpp +++ b/source/ble-services/MicroBitAccelerometerService.cpp @@ -65,9 +65,8 @@ void MicroBitAccelerometerService::onDataWritten(const GattWriteCallbackParams * /** * Accelerometer update callback */ -void MicroBitAccelerometerService::accelerometerUpdate(MicroBitEvent e) +void MicroBitAccelerometerService::accelerometerUpdate(MicroBitEvent) { - (void) e; /* -Wunused-parameter */ if (ble.getGapState().connected) { accelerometerDataCharacteristicBuffer[0] = uBit.accelerometer.getX(); diff --git a/source/ble-services/MicroBitDFUService.cpp b/source/ble-services/MicroBitDFUService.cpp index 96277fa..53b3eb0 100644 --- a/source/ble-services/MicroBitDFUService.cpp +++ b/source/ble-services/MicroBitDFUService.cpp @@ -49,9 +49,8 @@ MicroBitDFUService::MicroBitDFUService(BLEDevice &_ble) : ble.gattServer().onDataWritten(this, &MicroBitDFUService::onDataWritten); } -void MicroBitDFUService::onButtonA(MicroBitEvent e) +void MicroBitDFUService::onButtonA(MicroBitEvent) { - (void) e; /* -Wunused-parameter */ if (flashCodeRequested) { releaseFlashCode(); @@ -62,9 +61,8 @@ void MicroBitDFUService::onButtonA(MicroBitEvent e) } } -void MicroBitDFUService::onButtonB(MicroBitEvent e) +void MicroBitDFUService::onButtonB(MicroBitEvent) { - (void) e; /* -Wunused-parameter */ uBit.display.scroll("VERSION: TODO"); showNameHistogram(); } diff --git a/source/ble-services/MicroBitMagnetometerService.cpp b/source/ble-services/MicroBitMagnetometerService.cpp index 3ee4647..067b7bd 100644 --- a/source/ble-services/MicroBitMagnetometerService.cpp +++ b/source/ble-services/MicroBitMagnetometerService.cpp @@ -67,10 +67,8 @@ void MicroBitMagnetometerService::onDataWritten(const GattWriteCallbackParams *p /** * Magnetometer update callback */ -void MicroBitMagnetometerService::magnetometerUpdate(MicroBitEvent e) +void MicroBitMagnetometerService::magnetometerUpdate(MicroBitEvent) { - (void) e; /* -Wunused-parameter */ - if (ble.getGapState().connected) { magnetometerDataCharacteristicBuffer[0] = uBit.compass.getX(); @@ -90,10 +88,8 @@ void MicroBitMagnetometerService::magnetometerUpdate(MicroBitEvent e) * Reconfiguring the magnetometer can to a REALLY long time (sometimes even seconds to complete) * So we do this in the background when necessary, through this event handler. */ -void MicroBitMagnetometerService::samplePeriodUpdateNeeded(MicroBitEvent e) +void MicroBitMagnetometerService::samplePeriodUpdateNeeded(MicroBitEvent) { - (void) e; /* -Wunused-parameter */ - // Reconfigure the compass. This might take a while... uBit.compass.setPeriod(magnetometerPeriodCharacteristicBuffer); diff --git a/source/ble-services/MicroBitTemperatureService.cpp b/source/ble-services/MicroBitTemperatureService.cpp index 0b97cb7..241c9c5 100644 --- a/source/ble-services/MicroBitTemperatureService.cpp +++ b/source/ble-services/MicroBitTemperatureService.cpp @@ -45,10 +45,8 @@ MicroBitTemperatureService::MicroBitTemperatureService(BLEDevice &_ble) : /** * Temperature update callback */ -void MicroBitTemperatureService::temperatureUpdate(MicroBitEvent e) +void MicroBitTemperatureService::temperatureUpdate(MicroBitEvent) { - (void) e; /* -Wunused-parameter */ - if (ble.getGapState().connected) { temperatureDataCharacteristicBuffer = uBit.thermometer.getTemperature();