Cleaning up macros

Author: wberube

src/hal/macros.h

@@ -53,16 +53,23 @@
         fprintf(stderr, "\033[0m"); \
     } while (0)
 
+#ifndef ALIGN_BACK
+#define ALIGN_BACK(x, a) (((x) / (a)) * (a))
+#endif
+#ifndef ALIGN_UP
+#define ALIGN_UP(x, a) ((((x) + ((a)-1)) / a) * a)
+#endif
 #ifndef CEILING
 #define CEILING_POS(x) ((x - (int)(x)) > 0 ? (int)(x + 1) : (int)(x))
 #define CEILING_NEG(x) (int)(x)
 #define CEILING(x) (((x) > 0) ? CEILING_POS(x) : CEILING_NEG(x))
 #endif
-
+#ifndef CEILING_2_POWER
+#define CEILING_2_POWER(x, a) (((x) + ((a)-1)) & (~((a) - 1)))
+#endif
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #endif
-
 #ifndef MAX
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
@@ -73,4 +80,4 @@
     ((strlen(a) > strlen(b)) && !strcmp(a + strlen(a) - strlen(b), b))
 #define EQUALS(a, b) !strcmp(a, b)
 #define EQUALS_CASE(a, b) !strcasecmp(a, b)
-#define STARTS_WITH(a, b) !strncmp(a, b, strlen(b))
+#define STARTS_WITH(a, b) !strncmp(a, b, strlen(b))

src/hal/plus/ak_hal.h

@@ -6,6 +6,8 @@
 #include "ak_venc.h"
 #include "ak_vi.h"
 
+#include "../support.h"
+
 extern char audioOn, keepRunning;
 
 extern hal_chnstate ak_state[AK_VENC_CHN_NUM];
@@ -36,4 +38,4 @@ int ak_video_snapshot_grab(char index, hal_jpegdata *jpeg);
 void *ak_video_thread(void);
 
 void ak_system_deinit(void);
-int ak_system_init(char *snrConfig);
+int ak_system_init(char *snrConfig);

src/hal/types.h

@@ -2,22 +2,6 @@
 
 #include "macros.h"
 
-#ifndef ALIGN_BACK
-#define ALIGN_BACK(x, a) (((x) / (a)) * (a))
-#endif
-#ifndef ALIGN_UP
-#define ALIGN_UP(x, a) ((((x) + ((a)-1)) / a) * a)
-#endif
-#ifndef CEILING_2_POWER
-#define CEILING_2_POWER(x, a) (((x) + ((a)-1)) & (~((a) - 1)))
-#endif
-#ifndef MIN
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-#ifndef MAX
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
-#endif
-
 typedef enum {
     HAL_PLATFORM_UNK,
     HAL_PLATFORM_AK,
@@ -133,4 +117,4 @@ typedef struct {
     hal_vidpack *pack;
     unsigned int count;
     unsigned int seq;
-} hal_vidstream;
+} hal_vidstream;