From 9f957a193701788cac66292daea2c89ed94a033f Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Tue, 6 May 2014 22:52:10 +1000 Subject: Updated copyright notices to 2014 --- heimdall/source/Heimdall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'heimdall/source/Heimdall.h') diff --git a/heimdall/source/Heimdall.h b/heimdall/source/Heimdall.h index 5a5b4c6..ce7aaea 100644 --- a/heimdall/source/Heimdall.h +++ b/heimdall/source/Heimdall.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2013 Benjamin Dobell, Glass Echidna +/* Copyright (c) 2010-2014 Benjamin Dobell, Glass Echidna Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal -- cgit v1.1 From b62d66b297ab0401818a4d723d5206d03e5f9bca Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Sat, 17 May 2014 04:36:51 +1000 Subject: Windows does not provide (or require) va_copy. --- heimdall/source/Heimdall.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'heimdall/source/Heimdall.h') diff --git a/heimdall/source/Heimdall.h b/heimdall/source/Heimdall.h index ce7aaea..5e348c4 100644 --- a/heimdall/source/Heimdall.h +++ b/heimdall/source/Heimdall.h @@ -26,6 +26,10 @@ #include #undef GetBinaryType +#ifndef va_copy +#define va_copy(d, s) ((d) = (s)) +#endif + #else #include "../config.h" -- cgit v1.1 From 082fb091f1a0cab9d00e82de54fee32b6a1c0c7b Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Sun, 1 Jun 2014 14:09:56 +1000 Subject: Fixed support for large files (up to 2^32 - 1 bytes) The Loke protocol supports 32-bit unsigned for the size of files being flashed. However, POSIX file commands only support 32-bit (signed). As such we now have platform specific support for larger files. --- heimdall/source/Heimdall.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'heimdall/source/Heimdall.h') diff --git a/heimdall/source/Heimdall.h b/heimdall/source/Heimdall.h index 5e348c4..3982dd4 100644 --- a/heimdall/source/Heimdall.h +++ b/heimdall/source/Heimdall.h @@ -30,6 +30,12 @@ #define va_copy(d, s) ((d) = (s)) #endif +#define FileOpen(FILE, MODE) fopen(FILE, MODE) +#define FileClose(FILE) fclose(FILE) +#define FileSeek(FILE, OFFSET, ORIGIN) _fseeki64(FILE, OFFSET, ORIGIN) +#define FileTell(FILE) _ftelli64(FILE) +#define FileRewind(FILE) rewind(FILE) + #else #include "../config.h" @@ -37,6 +43,13 @@ #if defined(OS_DARWIN) || defined(OS_LINUX) #include #define Sleep(t) usleep(1000*t) + +#define FileOpen(FILE, MODE) fopen(FILE, MODE) +#define FileClose(FILE) fclose(FILE) +#define FileSeek(FILE, OFFSET, ORIGIN) fseeko(FILE, OFFSET, ORIGIN) +#define FileTell(FILE) ftello(FILE) +#define FileRewind(FILE) rewind(FILE) + #else #error operating system not supported #endif -- cgit v1.1 From 1ddfdc1a880279ce07b2c43f60b7aa138d4ad315 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Mon, 17 Nov 2014 07:02:07 +1100 Subject: CMake files for Heimdall CLI and mingw support --- heimdall/source/Heimdall.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'heimdall/source/Heimdall.h') diff --git a/heimdall/source/Heimdall.h b/heimdall/source/Heimdall.h index 3982dd4..c5c11ef 100644 --- a/heimdall/source/Heimdall.h +++ b/heimdall/source/Heimdall.h @@ -21,7 +21,7 @@ #ifndef HEIMDALL_H #define HEIMDALL_H -#ifdef OS_WINDOWS +#ifdef _MSC_VER // Microsoft Visual C Standard Library #include #undef GetBinaryType @@ -36,24 +36,18 @@ #define FileTell(FILE) _ftelli64(FILE) #define FileRewind(FILE) rewind(FILE) -#else +#else // POSIX Standard Library -#include "../config.h" - -#if defined(OS_DARWIN) || defined(OS_LINUX) #include + #define Sleep(t) usleep(1000*t) #define FileOpen(FILE, MODE) fopen(FILE, MODE) #define FileClose(FILE) fclose(FILE) -#define FileSeek(FILE, OFFSET, ORIGIN) fseeko(FILE, OFFSET, ORIGIN) -#define FileTell(FILE) ftello(FILE) +#define FileSeek(FILE, OFFSET, ORIGIN) fseeko64(FILE, OFFSET, ORIGIN) +#define FileTell(FILE) ftello64(FILE) #define FileRewind(FILE) rewind(FILE) -#else -#error operating system not supported -#endif - #endif #if (!(defined _MSC_VER) || (_MSC_VER < 1700)) -- cgit v1.1 From ee53613ec16af1334516402a9ba99a92934fe01c Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Mon, 17 Nov 2014 16:05:25 +1100 Subject: Continue to support autotools... for now --- heimdall/source/Heimdall.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'heimdall/source/Heimdall.h') diff --git a/heimdall/source/Heimdall.h b/heimdall/source/Heimdall.h index c5c11ef..45d0cbd 100644 --- a/heimdall/source/Heimdall.h +++ b/heimdall/source/Heimdall.h @@ -38,6 +38,10 @@ #else // POSIX Standard Library +#ifdef AUTOCONF +#include "../config.h" +#endif + #include #define Sleep(t) usleep(1000*t) -- cgit v1.1 From 69c3aafd81e2804216361ac13eea4b157594ce24 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Wed, 10 Dec 2014 00:50:30 +1100 Subject: Fix UNIX CMake (and OS X autotools) builds for Heimdall CLI --- heimdall/source/Heimdall.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'heimdall/source/Heimdall.h') diff --git a/heimdall/source/Heimdall.h b/heimdall/source/Heimdall.h index 45d0cbd..205f01d 100644 --- a/heimdall/source/Heimdall.h +++ b/heimdall/source/Heimdall.h @@ -48,8 +48,8 @@ #define FileOpen(FILE, MODE) fopen(FILE, MODE) #define FileClose(FILE) fclose(FILE) -#define FileSeek(FILE, OFFSET, ORIGIN) fseeko64(FILE, OFFSET, ORIGIN) -#define FileTell(FILE) ftello64(FILE) +#define FileSeek(FILE, OFFSET, ORIGIN) fseeko(FILE, OFFSET, ORIGIN) +#define FileTell(FILE) ftello(FILE) #define FileRewind(FILE) rewind(FILE) #endif -- cgit v1.1