From 8bb8f6043363e2319c87691ffd48bdd6269e13a4 Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Thu, 21 Nov 2019 08:38:45 +0100
Subject: [PATCH] lattice: honor verbose

---
 lattice.cpp | 21 +++++++++++++++++----
 lattice.hpp |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lattice.cpp b/lattice.cpp
index 24f9457..b024dec 100644
--- a/lattice.cpp
+++ b/lattice.cpp
@@ -60,7 +60,8 @@ using namespace std;
 #	define REG_STATUS_FAIL		(1 << 13)
 #	define REG_STATUS_EXEC_ERR	(1 << 26)
 
-Lattice::Lattice(FtdiJtag *jtag, const string filename):Device(jtag, filename)
+Lattice::Lattice(FtdiJtag *jtag, const string filename, bool verbose):
+		Device(jtag, filename, verbose)
 {
 	if (_filename != "")
 		if (_file_extension == "jed")
@@ -129,11 +130,23 @@ void Lattice::program(unsigned int offset)
 	if (_mode != FLASH_MODE)
 		return;
 
-	JedParser _jed(_filename);
-	_jed.parse();
+	JedParser _jed(_filename, _verbose);
+
+	printInfo("Open file " + _filename + " ", false);
+	printSuccess("DONE");
+
+	if (_jed.parse() == EXIT_FAILURE) {
+		printInfo("Parse file ", false);
+		printError("FAIL");
+		return;
+	} else {
+		printInfo("Parse file ", false);
+		printSuccess("DONE");
+	}
 
 	/* read ID Code 0xE0 */
-	printf("IDCode : %x\n", idCode());
+	if (_verbose)
+		printf("IDCode : %x\n", idCode());
 
 	/* preload 0x1C */
 	uint8_t tx_buf[26];
diff --git a/lattice.hpp b/lattice.hpp
index b166481..56fd35f 100644
--- a/lattice.hpp
+++ b/lattice.hpp
@@ -29,7 +29,7 @@
 
 class Lattice: public Device {
 	public:
-		Lattice(FtdiJtag *jtag, std::string filename);
+		Lattice(FtdiJtag *jtag, std::string filename, bool verbose);
 		int idCode() override;
 		void reset() override {}
 		void program(unsigned int offset) override;