diff --git a/CHANGELOG b/CHANGELOG index 6f780576..dc6d5816 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +0.2.0.8 + - add aarch64 + 0.2.0.7 - loglimit was not used in airupnp diff --git a/aircast/Makefile.aarch64 b/aircast/Makefile.aarch64 new file mode 100644 index 00000000..34386142 --- /dev/null +++ b/aircast/Makefile.aarch64 @@ -0,0 +1,10 @@ +CC = aarch64-cross-linux-gnueabi-gcc +CFLAGS ?= -Wall -fPIC -ggdb -O2 $(OPTS) $(INCLUDE) $(DEFINES) +LDFLAGS ?= -s -lpthread -lssl -lcrypto -ldl -lm -lrt -L. +# for LD debug -s + +OBJ = bin/aarch64 +EXECUTABLE = ../bin/aircast-aarch64 + +include Makefile + diff --git a/aircast/src/aircast.c b/aircast/src/aircast.c index f4ef02e6..ebdb2e69 100644 --- a/aircast/src/aircast.c +++ b/aircast/src/aircast.c @@ -35,7 +35,7 @@ #include "raopcore.h" #include "config_cast.h" -#define VERSION "v0.2.0.7"" ("__DATE__" @ "__TIME__")" +#define VERSION "v0.2.0.8"" ("__DATE__" @ "__TIME__")" #define DISCOVERY_TIME 20 diff --git a/airupnp/Makefile.aarch64 b/airupnp/Makefile.aarch64 new file mode 100644 index 00000000..d5c6d909 --- /dev/null +++ b/airupnp/Makefile.aarch64 @@ -0,0 +1,11 @@ +CC = aarch64-cross-linux-gnueabi-gcc +CFLAGS ?= -Wall -fPIC -ggdb -O2 $(OPTS) $(INCLUDE) $(DEFINES) +LDFLAGS ?= -s -lpthread -lssl -lcrypto -ldl -lm -lrt -L. + +# for LD debug -s + +OBJ = bin/aarch64 +EXECUTABLE = ../bin/airupnp-aarch64 + +include Makefile + diff --git a/airupnp/src/airupnp.c b/airupnp/src/airupnp.c index e468a68c..2ee631ed 100644 --- a/airupnp/src/airupnp.c +++ b/airupnp/src/airupnp.c @@ -37,7 +37,7 @@ #include "mr_util.h" #include "log_util.h" -#define VERSION "v0.2.0.7"" ("__DATE__" @ "__TIME__")" +#define VERSION "v0.2.0.8"" ("__DATE__" @ "__TIME__")" #define AV_TRANSPORT "urn:schemas-upnp-org:service:AVTransport" #define RENDERING_CTRL "urn:schemas-upnp-org:service:RenderingControl" diff --git a/bin/aircast-aarch64 b/bin/aircast-aarch64 new file mode 100644 index 00000000..4d15b058 Binary files /dev/null and b/bin/aircast-aarch64 differ diff --git a/bin/aircast-arm b/bin/aircast-arm index b7250b91..3f14e585 100755 Binary files a/bin/aircast-arm and b/bin/aircast-arm differ diff --git a/bin/aircast-arm5 b/bin/aircast-arm5 index eaca36b1..09bac8ee 100755 Binary files a/bin/aircast-arm5 and b/bin/aircast-arm5 differ diff --git a/bin/aircast-bsd-x64 b/bin/aircast-bsd-x64 index 702fe69b..e2e4722f 100755 Binary files a/bin/aircast-bsd-x64 and b/bin/aircast-bsd-x64 differ diff --git a/bin/aircast-i86pc-solaris b/bin/aircast-i86pc-solaris index 938c2b8d..8d94bcbb 100755 Binary files a/bin/aircast-i86pc-solaris and b/bin/aircast-i86pc-solaris differ diff --git a/bin/aircast-osx-multi b/bin/aircast-osx-multi index d41e88cb..17139f95 100755 Binary files a/bin/aircast-osx-multi and b/bin/aircast-osx-multi differ diff --git a/bin/aircast-win.exe b/bin/aircast-win.exe index b9df8f5f..a984e726 100644 Binary files a/bin/aircast-win.exe and b/bin/aircast-win.exe differ diff --git a/bin/aircast-x86 b/bin/aircast-x86 index 6365dc6a..8988718b 100755 Binary files a/bin/aircast-x86 and b/bin/aircast-x86 differ diff --git a/bin/aircast-x86-64 b/bin/aircast-x86-64 index 3c4d1835..f8609b44 100755 Binary files a/bin/aircast-x86-64 and b/bin/aircast-x86-64 differ diff --git a/bin/airupnp-aarch64 b/bin/airupnp-aarch64 new file mode 100644 index 00000000..1a21de4a Binary files /dev/null and b/bin/airupnp-aarch64 differ diff --git a/bin/airupnp-arm b/bin/airupnp-arm index 4866e58e..a39ba996 100755 Binary files a/bin/airupnp-arm and b/bin/airupnp-arm differ diff --git a/bin/airupnp-arm5 b/bin/airupnp-arm5 index 47b6cab1..5ea424d0 100755 Binary files a/bin/airupnp-arm5 and b/bin/airupnp-arm5 differ diff --git a/bin/airupnp-bsd-x64 b/bin/airupnp-bsd-x64 index 7baa7e8e..ab9de270 100755 Binary files a/bin/airupnp-bsd-x64 and b/bin/airupnp-bsd-x64 differ diff --git a/bin/airupnp-i86pc-solaris b/bin/airupnp-i86pc-solaris index d12e21ab..0c88c158 100755 Binary files a/bin/airupnp-i86pc-solaris and b/bin/airupnp-i86pc-solaris differ diff --git a/bin/airupnp-osx-multi b/bin/airupnp-osx-multi index bfcb9eef..166abb98 100755 Binary files a/bin/airupnp-osx-multi and b/bin/airupnp-osx-multi differ diff --git a/bin/airupnp-win.exe b/bin/airupnp-win.exe index 81654d08..953c4396 100644 Binary files a/bin/airupnp-win.exe and b/bin/airupnp-win.exe differ diff --git a/bin/airupnp-x86 b/bin/airupnp-x86 index 63de5097..475df14f 100755 Binary files a/bin/airupnp-x86 and b/bin/airupnp-x86 differ diff --git a/bin/airupnp-x86-64 b/bin/airupnp-x86-64 index 640b1094..682b6e88 100755 Binary files a/bin/airupnp-x86-64 and b/bin/airupnp-x86-64 differ diff --git a/common/hairtunes.c b/common/hairtunes.c index d1726d8a..0ad9dc00 100644 --- a/common/hairtunes.c +++ b/common/hairtunes.c @@ -48,10 +48,10 @@ #include "util.h" #define NTP2MS(ntp) ((((ntp) >> 10) * 1000L) >> 22) -#define MS2NTP(ms) (((((__u64) (ms)) << 22) / 1000) << 10) +#define MS2NTP(ms) (((((u64_t) (ms)) << 22) / 1000) << 10) #define NTP2TS(ntp, rate) ((((ntp) >> 16) * (rate)) >> 16) -#define TS2NTP(ts, rate) (((((__u64) (ts)) << 16) / (rate)) << 16) -#define MS2TS(ms, rate) ((((__u64) (ms)) * (rate)) / 1000) +#define TS2NTP(ts, rate) (((((u64_t) (ts)) << 16) / (rate)) << 16) +#define MS2TS(ms, rate) ((((u64_t) (ms)) * (rate)) / 1000) #define TS2MS(ts, rate) NTP2MS(TS2NTP(ts,rate)) #define GAP_THRES 8 diff --git a/tools/platform.h b/tools/platform.h index b5de9a59..7032e5d6 100644 --- a/tools/platform.h +++ b/tools/platform.h @@ -148,17 +148,9 @@ int gettimeofday(struct timeval *tv, struct timezone *tz); #endif -typedef u8_t __u8; -typedef u16_t __u16; -typedef u32_t __u32; -typedef u64_t __u64; -typedef s16_t __s16; -typedef s32_t __s32; -typedef s64_t __s64; - typedef struct ntp_s { - __u32 seconds; - __u32 fraction; + u32_t seconds; + u32_t fraction; } ntp_t; u64_t timeval_to_ntp(struct timeval tv, struct ntp_s *ntp);