Index: firmware/App/Drivers/BatteryDriver.h
===================================================================
diff -u -rf65325ed47c1d70a3abf8a6f853f858b57228734 -r365cfa9529a444e02ecc928dea87e97bca95c193
--- firmware/App/Drivers/BatteryDriver.h	(.../BatteryDriver.h)	(revision f65325ed47c1d70a3abf8a6f853f858b57228734)
+++ firmware/App/Drivers/BatteryDriver.h	(.../BatteryDriver.h)	(revision 365cfa9529a444e02ecc928dea87e97bca95c193)
@@ -15,8 +15,8 @@
 *
 ***************************************************************************/
 
-#ifndef APP_DRIVERS_BATTERYDRIVER_H_
-#define APP_DRIVERS_BATTERYDRIVER_H_
+#ifndef __BATTERY_DRIVER_H__
+#define __BATTERY_DRIVER_H__
 
 #include "TDCommon.h"
 #include "Utilities.h"
@@ -47,24 +47,25 @@
     BATTERY_CHARGER_FAULT,                                                  ///< Battery charger fault status
     BATTERY_CHARGER_CURRENT,                                                ///< Battery charger current (in mA)
     BATTERY_END_OF_LIST_TIME_TO_PUBLISH,                                    ///< End of battery data list
-    NUM_OF_BATTERY_REGISTERS                                               ///< Number of battery registers
+    NUM_OF_BATTERY_REGISTERS                                                ///< Number of battery registers
 } BATTERY_MANAGEMENT_ENUM_T;
 
 typedef enum BatteryDevicesEnum
 {
     BATTERY_CHARGER_ADDRESS = 0,                                            ///< Battery charger at I2C address
     BATTERY_PACK_ADDRESS,                                                   ///< Battery pack at SMBus address
-    NUM_OF_BATTERY_DEVICES                                                 ///< Number of battery devices
+    NUM_OF_BATTERY_DEVICES                                                  ///< Number of battery devices
 } BATTERY_DEVICE_ADDRESS_ENUM_T;
 
 // ********** public function prototypes **********
 
 void initSetupI2cDriver( void );
 BOOL enableBatteryChargerAdc( void );
-BOOL getBatteryData( BATTERY_DEVICE_ADDRESS_ENUM_T deviceSel, BATTERY_MANAGEMENT_ENUM_T registerSel, U32 *dataPtr );
+BOOL getBatteryData( BATTERY_DEVICE_ADDRESS_ENUM_T deviceSel,
+                     BATTERY_MANAGEMENT_ENUM_T registerSel, U32 *dataPtr );
 U32 getI2cStatusRegister( BOOL resetOverride );
 BOOL testBatteryI2cStatusOverride( MESSAGE_T *message );
 
 /**@}*/
 
-#endif /* APP_DRIVERS_BATTERYDRIVER_H_ */
+#endif /* __BATTERY_DRIVER_H__ */