From a8922dcc0e0e2865407374c3ebc9d5f54eccea53 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <ice@extreme.hu>
Date: Thu, 12 Dec 2013 00:27:55 +0100
Subject: [PATCH] Add MSP430.dll version as macros to chipinfo.db

Report the version of MSP430.dll that was used to generate
chipinfo.db in info texts.

Signed-off-by: Tamas TEVESZ <ice@extreme.hu>
---
 chipinfo.db     | 8 +++++++-
 ui/main.c       | 5 ++++-
 util/chipinfo.c | 6 ++++++
 util/chipinfo.h | 2 ++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/chipinfo.db b/chipinfo.db
index 9aa94b2..d5e0f12 100644
--- a/chipinfo.db
+++ b/chipinfo.db
@@ -1,6 +1,6 @@
 /* MSP430 chip database
  *
- * THIS FILE WAS GENERATED FROM MSP430.DLL v03.03.01.04
+ * THIS FILE WAS GENERATED FROM MSP430.DLL v3.3.1.4
  *
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
  *
@@ -33,6 +33,12 @@
  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define CI_DLL430_VERSION_MAJOR 3
+#define CI_DLL430_VERSION_MINOR 3
+#define CI_DLL430_VERSION_PATCH 1
+#define CI_DLL430_VERSION_BUILD 4
+#define CI_DLL430_VERSION_STRING "3.3.1.4"
+
 static const struct chipinfo_funclet erase_fll = {
 	.code_size	= 48,
 	.max_payload	= 4,
diff --git a/ui/main.c b/ui/main.c
index ddbe847..36b7e86 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -56,6 +56,7 @@
 #include "pif.h"
 #include "loadbsl.h"
 #include "fet3.h"
+#include "chipinfo.h"
 
 #ifdef __CYGWIN__
 #include <sys/cygwin.h>
@@ -326,6 +327,7 @@ static int parse_cmdline_args(int argc, char **argv,
 
 		case LOPT_VERSION:
 			printc("%s", version_text);
+			printc("%s", chipinfo_copyright());
 			exit(0);
 
 		case 'v':
@@ -447,7 +449,8 @@ int main(int argc, char **argv)
 		goto fail_sockets;
 	}
 
-	printc_dbg("%s\n", version_text);
+	printc_dbg("%s", version_text);
+	printc_dbg("%s\n", chipinfo_copyright());
 	if (setup_driver(&args) < 0) {
 		ret = -1;
 		goto fail_driver;
diff --git a/util/chipinfo.c b/util/chipinfo.c
index 81bc9e4..25dc387 100644
--- a/util/chipinfo.c
+++ b/util/chipinfo.c
@@ -96,3 +96,9 @@ const struct chipinfo_memory *chipinfo_find_mem_by_addr
 
 	return best;
 }
+
+const char *chipinfo_copyright(void)
+{
+	return "Chip info database from MSP430.dll v"
+		CI_DLL430_VERSION_STRING " Copyright (C) 2013 TI, Inc.\n";
+}
diff --git a/util/chipinfo.h b/util/chipinfo.h
index 62f0b57..139113a 100644
--- a/util/chipinfo.h
+++ b/util/chipinfo.h
@@ -166,4 +166,6 @@ const struct chipinfo_memory *chipinfo_find_mem_by_addr
 const struct chipinfo_memory *chipinfo_find_mem_by_name
 	(const struct chipinfo *info, const char *name);
 
+const char *chipinfo_copyright(void);
+
 #endif