- 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__

libarmbox/audio_lib.h

@@ -1,7 +1,7 @@
 /* public header file */
 
-#ifndef _AUDIO_LIB_H_
-#define _AUDIO_LIB_H_
+#ifndef __AUDIO_LIB_H__
+#define __AUDIO_LIB_H__
 
 #include "cs_types.h"
 
@@ -98,4 +98,4 @@ class cAudio
 		void EnableAnalogOut(bool enable);
 };
 
-#endif
+#endif // __AUDIO_LIB_H__

libarmbox/hdmi_cec.h

@@ -1,3 +1,6 @@
+#ifndef __HDMI_CEC_H__
+#define __HDMI_CEC_H__
+
 /*
 	Copyright (C) 2018 TangoCash
 
@@ -92,3 +95,5 @@ public:
 		return muted;
 	};
 };
+
+#endif // __HDMI_CEC_H__

libarmbox/hdmi_cec_types.h

@@ -1,3 +1,6 @@
+#ifndef __HDMI_CEC_TYPES_H__
+#define __HDMI_CEC_TYPES_H__
+
 typedef enum cec_vendor_id
 {
 	CEC_VENDOR_TOSHIBA        = 0x000039,
@@ -706,3 +709,5 @@ static cec_opcode GetResponseOpcode(cec_opcode opcode)
 
 	return CEC_OPCODE_NONE;
 }
+
+#endif // __HDMI_CEC_TYPES_H__

libarmbox/playback_gst.h

@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef __PLAYBACK_CS_H
-#define __PLAYBACK_CS_H
+#ifndef __PLAYBACK_GST_H__
+#define __PLAYBACK_GST_H__
 
 #include <string>
 #include <stdint.h>
@@ -104,5 +104,4 @@ public:
 	void getMeta();
 };
 
-#endif
-
+#endif // __PLAYBACK_GST_H__

libarmbox/playback_libeplayer3.h

@@ -1,5 +1,5 @@
-#ifndef __HAL_PLAYBACK_H
-#define __HAL_PLAYBACK_H
+#ifndef __PLAYBACK_LIBEPLAYER3_H__
+#define __PLAYBACK_LIBEPLAYER3_H__
 
 #include <string>
 #include <vector>
@@ -86,4 +86,5 @@ class cPlayback
 		void DMNotify(int Event, void *pTsBuf, void *Tag);
 #endif
 };
-#endif
+
+#endif // __PLAYBACK_LIBEPLAYER3_H__

libarmbox/record_lib.h

@@ -1,5 +1,5 @@
-#ifndef __record_hal__
-#define __record_hal__
+#ifndef __RECORD_LIB_H__
+#define __RECORD_LIB_H__
 
 #include <semaphore.h>
 #include "dmx_hal.h"
@@ -53,4 +53,5 @@ class cRecord
 		void RecordThread();
 		void WriterThread();
 };
-#endif
+
+#endif // __RECORD_LIB_H__

libarmbox/video_lib.h

@@ -1,5 +1,5 @@
-#ifndef _VIDEO_LIB_H
-#define _VIDEO_LIB_H
+#ifndef __VIDEO_LIB_H__
+#define __VIDEO_LIB_H__
 
 #include <linux/dvb/video.h>
 #include "cs_types.h"
@@ -254,4 +254,4 @@ class cVideo
 		bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
 };
 
-#endif
+#endif // __VIDEO_LIB_H__

libazbox/audio_lib.h

@@ -1,7 +1,7 @@
 /* public header file */
 
-#ifndef _AUDIO_LIB_H_
-#define _AUDIO_LIB_H_
+#ifndef __AUDIO_LIB_H__
+#define __AUDIO_LIB_H__
 
 #include "../common/cs_types.h"
 
@@ -94,5 +94,4 @@ class cAudio
 		void EnableAnalogOut(bool enable);
 };
 
-#endif
-
+#endif // __AUDIO_LIB_H__

libazbox/playback_lib.h

@@ -1,5 +1,5 @@
-#ifndef __PLAYBACK_LIB_H_
-#define __PLAYBACK_LIB_H_
+#ifndef __PLAYBACK_LIB_H__
+#define __PLAYBACK_LIB_H__
 
 #include <string>
 #include <stdint.h>
@@ -59,4 +59,4 @@ class cPlayback
 		void DMNotify(int Event, void *pTsBuf, void *Tag);
 #endif
 };
-#endif // __PLAYBACK_LIB_H_
+#endif // __PLAYBACK_LIB_H__

libazbox/video_lib.h

@@ -1,5 +1,5 @@
-#ifndef _VIDEO_LIB_H
-#define _VIDEO_LIB_H
+#ifndef __VIDEO_LIB_H__
+#define __VIDEO_LIB_H__
 
 #include <linux/dvb/video.h>
 #include "cs_types.h"
@@ -193,4 +193,4 @@ class cVideo
 		void SetDemux(cDemux *dmx);
 };
 
-#endif
+#endif // __VIDEO_LIB_H__

libgeneric-pc/audio_lib.h

@@ -1,7 +1,7 @@
 /* public header file */
 
-#ifndef _AUDIO_LIB_H_
-#define _AUDIO_LIB_H_
+#ifndef __AUDIO_LIB_H__
+#define __AUDIO_LIB_H__
 
 #include <stdint.h>
 #include <OpenThreads/Thread>
@@ -102,4 +102,4 @@ class cAudio : public OpenThreads::Thread
 		int my_read(uint8_t *buf, int buf_size);
 };
 
-#endif
+#endif // __AUDIO_LIB_H__

libgeneric-pc/playback_gst.h

@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef __PLAYBACK_CS_H
-#define __PLAYBACK_CS_H
+#ifndef __PLAYBACK_GST_H__
+#define __PLAYBACK_GST_H__
 
 #include <string>
 #include <stdint.h>
@@ -103,5 +103,4 @@ public:
 	void getMeta();
 };
 
-#endif
-
+#endif // __PLAYBACK_GST_H__

libgeneric-pc/playback_lib.h

@@ -1,5 +1,5 @@
-#ifndef __PLAYBACK_H
-#define __PLAYBACK_H
+#ifndef __PLAYBACK_LIB_H__
+#define __PLAYBACK_LIB_H__
 
 #include <string>
 #include <stdint.h>
@@ -57,4 +57,5 @@ class cPlayback
 		AVFormatContext *GetAVFormatContext(){ return NULL; }
 		void ReleaseAVFormatContext() {}
 };
-#endif
+
+#endif // __PLAYBACK_LIB_H__

libgeneric-pc/video_lib.h

@@ -1,5 +1,5 @@
-#ifndef _VIDEO_LIB_H
-#define _VIDEO_LIB_H
+#ifndef __VIDEO_LIB_H__
+#define __VIDEO_LIB_H__
 
 #include <OpenThreads/Thread>
 #include <OpenThreads/Mutex>
@@ -224,4 +224,4 @@ class cVideo : public OpenThreads::Thread
 		bool stillpicture;
 };
 
-#endif
+#endif // __VIDEO_LIB_H__

libraspi/audio_lib.h

@@ -1,7 +1,7 @@
 /* public header file */
 
-#ifndef _AUDIO_LIB_H_
-#define _AUDIO_LIB_H_
+#ifndef __AUDIO_LIB_H__
+#define __AUDIO_LIB_H__
 
 #include <stdint.h>
 #include "cs_types.h"
@@ -100,5 +100,4 @@ class cAudio
 		int my_read(uint8_t *buf, int buf_size);
 };
 
-#endif
-
+#endif // __AUDIO_LIB_H__

libraspi/dmx_lib.h

@@ -1,5 +1,5 @@
-#ifndef __dmx_hal__
-#define __dmx_hal__
+#ifndef __DMX_LIB_H__
+#define __DMX_LIB_H__
 
 #include <cstdlib>
 #include <vector>
@@ -66,4 +66,4 @@ class cDemux
 		void *pdata;
 };
 
-#endif //__dmx_hal__
+#endif // __DMX_LIB_H__

libraspi/video_lib.h

@@ -1,5 +1,5 @@
-#ifndef _VIDEO_LIB_H
-#define _VIDEO_LIB_H
+#ifndef __VIDEO_LIB_H__
+#define __VIDEO_LIB_H__
 
 #include <vector>
 #include <linux/dvb/video.h>
@@ -213,4 +213,4 @@ class cVideo
 		int pig_h;
 };
 
-#endif
+#endif // __VIDEO_LIB_H__

libspark/audio_lib.h

@@ -1,7 +1,8 @@
 /* public header file */
 
-#ifndef _AUDIO_TD_H_
-#define _AUDIO_TD_H_
+#ifndef __AUDIO_LIB_H__
+#define __AUDIO_LIB_H__
+
 #include "cs_types.h"
 
 typedef enum
@@ -106,4 +107,4 @@ class cAudio
 		void muteMixers(bool m = true);
 };
 
-#endif
+#endif // __AUDIO_LIB_H__

libspark/audio_mixer.h

@@ -19,6 +19,7 @@
 
 #ifndef __AUDIO_MIXER_H__
 #define __AUDIO_MIXER_H__
+
 #include <alsa/asoundlib.h>
 
 class mixerVolume
@@ -32,5 +33,5 @@ class mixerVolume
 		~mixerVolume(void);
 		bool setVolume(long volume);
 };
-#endif
 
+#endif // __AUDIO_MIXER_H__

libspark/playback_libeplayer3.h

@@ -1,5 +1,5 @@
-#ifndef __HAL_PLAYBACK_H
-#define __HAL_PLAYBACK_H
+#ifndef __PLAYBACK_LIBEPLAYER3_H__
+#define __PLAYBACK_LIBEPLAYER3_H__
 
 #include <string>
 #include <vector>
@@ -89,4 +89,5 @@ class cPlayback
 		void DMNotify(int Event, void *pTsBuf, void *Tag);
 #endif
 };
-#endif
+
+#endif // __PLAYBACK_LIBEPLAYER3_H__

libspark/record_lib.h

@@ -1,5 +1,5 @@
-#ifndef __record_hal__
-#define __record_hal__
+#ifndef __RECORD_LIB_H__
+#define __RECORD_LIB_H__
 
 #include <semaphore.h>
 #include "dmx_hal.h"
@@ -53,4 +53,5 @@ class cRecord
 		void RecordThread();
 		void WriterThread();
 };
-#endif
+
+#endif // __RECORD_LIB_H__

libspark/video_lib.h

@@ -1,5 +1,5 @@
-#ifndef _VIDEO_LIB_H
-#define _VIDEO_LIB_H
+#ifndef __VIDEO_LIB_H__
+#define __VIDEO_LIB_H__
 
 #include <linux/dvb/video.h>
 #include "cs_types.h"
@@ -219,4 +219,4 @@ class cVideo
 		bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
 };
 
-#endif
+#endif // __VIDEO_LIB_H__

libtriple/audio_td.h

@@ -1,7 +1,7 @@
 /* public header file */
 
-#ifndef _AUDIO_TD_H_
-#define _AUDIO_TD_H_
+#ifndef __AUDIO_TD_H__
+#define __AUDIO_TD_H__
 
 #include <hardware/aud/aud_inf.h>
 #include "cs_types.h"
@@ -95,5 +95,4 @@ class cAudio
 		void EnableAnalogOut(bool enable);
 };
 
-#endif
-
+#endif // __AUDIO_TD_H__

libtriple/playback_td.h

@@ -1,5 +1,5 @@
-#ifndef __PLAYBACK_TD_H
-#define __PLAYBACK_TD_H
+#ifndef __PLAYBACK_TD_H__
+#define __PLAYBACK_TD_H__
 
 #include <inttypes.h>
 #include <string>
@@ -125,4 +125,5 @@ class cPlayback
 		void DMNotify(int Event, void *pTsBuf, void *Tag);
 #endif
 };
-#endif
+
+#endif // __PLAYBACK_TD_H__

libtriple/record_td.h

@@ -1,5 +1,5 @@
-#ifndef __RECORD_TD_H
-#define __RECORD_TD_H
+#ifndef __RECORD_TD_H__
+#define __RECORD_TD_H__
 
 #include <pthread.h>
 #include "dmx_hal.h"
@@ -40,4 +40,5 @@ class cRecord
 
 		void RecordThread();
 };
-#endif
+
+#endif // __RECORD_TD_H__

libtriple/video_td.h

@@ -1,5 +1,5 @@
-#ifndef _VIDEO_TD_H
-#define _VIDEO_TD_H
+#ifndef __VIDEO_TD_H__
+#define __VIDEO_TD_H__
 
 #include <hardware/vid/vid_inf.h>
 #define video_format_t          vidDispSize_t
@@ -193,4 +193,4 @@ class cVideo
 		bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
 };
 
-#endif
+#endif // __VIDEO_TD_H__