From f9890d91d3eea7161ae2b709c3c2e8b82680d2c1 Mon Sep 17 00:00:00 2001 From: Christina Quast Date: Tue, 27 Jan 2015 14:27:38 +0100 Subject: [PATCH] Fix address evaluates always as true warnings This was an example of a compiler warning when the switch -Waddress was passed: atmel_softpack_libraries/usb/device/core/USBD.c: In function 'USBD_RequestHandler': atmel_softpack_libraries/usb/device/core/USBD.c:149:14: warning: the address of 'USBDCallbacks_RequestReceived' will always evaluate as 'true' [-Waddress] else if (USBDCallbacks_RequestReceived) { The test for existense of USBDCallbacks_RequestReceived is removed since there is always a default implementation of these function. --- .../atmel_softpack_libraries/usb/device/core/USBD.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c b/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c index cdd668f4..36130076 100644 --- a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c +++ b/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c @@ -91,8 +91,7 @@ void USBD_SuspendHandler(void) USBD_HAL_Suspend(); /* Invoke the User Suspended callback (Suspend System?) */ - if (USBDCallbacks_Suspended) - USBDCallbacks_Suspended(); + USBDCallbacks_Suspended(); } } @@ -130,8 +129,7 @@ void USBD_ResetHandler() USBD_HAL_ResetEPs(0xFFFFFFFF, USBD_STATUS_RESET, 0); USBD_ConfigureEndpoint(0); /* Invoke the Reset callback */ - if (USBDCallbacks_Reset) - USBDCallbacks_Reset(); + USBDCallbacks_Reset(); } /** @@ -148,7 +146,7 @@ void USBD_RequestHandler(uint8_t bEndpoint, TRACE_WARNING("EP%d request not supported, default EP only", bEndpoint); } - else if (USBDCallbacks_RequestReceived) { + else { USBDCallbacks_RequestReceived(pRequest); } } @@ -365,8 +363,7 @@ void USBD_Init(void) previousDeviceState = USBD_STATE_POWERED; /* Upper Layer Initialize */ - if (USBDCallbacks_Initialized) - USBDCallbacks_Initialized(); + USBDCallbacks_Initialized(); TRACE_DEBUG("%s\n\r", ".."); }