- unify defines in header files

Signed-off-by: Thilo Graf <dbt@novatux.de>

include/ca.h

@@ -1,5 +1,5 @@
-#ifndef __ca__
-#define __ca__
+#ifndef __CA_H__
+#define __CA_H__
 
 #include <stdint.h>
 #include "cs_types.h"
@@ -116,4 +116,4 @@ public:
 	virtual ~cCA();
 };
 
-#endif // __ca__
+#endif // __CA_H__

include/ca_ci.h

@@ -1,5 +1,5 @@
-#ifndef __ca_ci__
-#define __ca_ci__
+#ifndef __CA_CI_H__
+#define __CA_CI_H__
 
 #include <config.h>
 #include <stdint.h>
@@ -362,4 +362,4 @@ public:
 	virtual ~cCA();
 };
 
-#endif // __ca_ci__
+#endif // __CA_CI_H__

include/cs_api.h

@@ -1,7 +1,7 @@
 /* compatibility header for tripledragon. I'm lazy, so I just left it
    as "cs_api.h" so that I don't need too many ifdefs in the code */
 
-#ifndef __CS_API_H_
+#ifndef __CS_API_H__
 #define __CS_API_H_
 
 #include "init.h"
@@ -34,4 +34,5 @@ static inline void cs_deregister_messenger(void) { return; };
 static inline unsigned int cs_get_revision(void) { return 1; };
 static inline unsigned int cs_get_chip_type(void) { return 0; };
 extern int cnxt_debug;
-#endif //__CS_API_H_
+
+#endif // __CS_API_H__

include/cs_frontpanel.h

@@ -1,5 +1,5 @@
-#ifndef __CS_FRONTPANEL_H_
-#define __CS_FRONTPANEL_H_
+#ifndef __CS_FRONTPANEL_H__
+#define __CS_FRONTPANEL_H__
 
 #define VFDDISPLAYCHARS      0xc0425a00
 #define VFDWRITECGRAM        0x40425a01
@@ -317,4 +317,4 @@ typedef struct {
 	bool			number_support;
 } fp_display_caps_t;
 
-#endif // __CS_FRONTPANEL_H_
+#endif // __CS_FRONTPANEL_H__

include/cs_types.h

@@ -1,8 +1,8 @@
 /* pretty useless, but we don't need to work around this if
  * we just copy it over... */
 
-#ifndef __CS_TYPES_H_
-#define __CS_TYPES_H_
+#ifndef __CS_TYPES_H__
+#define __CS_TYPES_H__
 
 typedef enum
 {
@@ -20,4 +20,4 @@ typedef signed int		s32;
 typedef signed short		s16;
 typedef signed char		 s8;
 
-#endif // __CS_TYPES_H_
+#endif // __CS_TYPES_H__

include/dmx_hal.h

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __dmx_hal__
-#define __dmx_hal__
+#ifndef __DMX_HAL_H__
+#define __DMX_HAL_H__
 
 #include <config.h>
 #include <cstdlib>
@@ -99,4 +99,4 @@ class cDemux
 		void *pdata;
 };
 
-#endif //__dmx_hal__
+#endif // __DMX_HAL_H__

include/glfb.h

@@ -16,8 +16,9 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __glfb__
-#define __glfb__
+#ifndef __GLFB_H__
+#define __GLFB_H__
+
 #include <OpenThreads/Thread>
 #include <vector>
 #include <linux/fb.h> /* for screeninfo etc. */
@@ -39,4 +40,5 @@ private:
 	void blit_osd();
 	void *pdata;	/* not yet used */
 };
-#endif
+
+#endif // __GLFB_H__

include/hardware_caps.h

@@ -53,4 +53,5 @@ hw_caps_t *get_hwcaps(void);
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif // __HARDWARE_CAPS_H__

include/init.h

@@ -1,5 +1,7 @@
-#ifndef __init__
-#define __init__
+#ifndef __INIT_H__
+#define __INIT_H__
+
 void hal_api_init();
 void hal_api_exit();
-#endif // __init__
+
+#endif // __INIT_H__

include/mmi.h

@@ -1,5 +1,5 @@
-#ifndef __MMI_H_
-#define __MMI_H_
+#ifndef __MMI_H__
+#define __MMI_H__
 
 #define MAX_MMI_ITEMS			40
 #define MAX_MMI_TEXT_LEN		255
@@ -47,5 +47,5 @@ typedef struct {
 #define enguiryText      enquiryText
 #define MMI_ENGUIRY_INFO MMI_ENQUIRY_INFO
 
-#endif // __MMI_H_
+#endif // __MMI_H__
 

include/pwrmngr.h

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __pwrmngr_hal__
-#define __pwrmngr_hal__
+#ifndef __PWRMNGR_H__
+#define __PWRMNGR_H__
 
 class cCpuFreqManager
 {
@@ -44,4 +44,4 @@ public:
 	bool SetStandby(bool Active, bool Passive);
 };
 
-#endif
+#endif // __PWRMNGR_H__