From e44af8077630581be404a5250e30005a8e7e37fc Mon Sep 17 00:00:00 2001
From: balika011 <balika011@gmail.com>
Date: Sun, 24 Jul 2022 17:31:36 +0200
Subject: [PATCH] use RawParser for gowin mcu flashing

---
 src/gowin.cpp | 49 +++++++++++++++++++++----------------------------
 src/gowin.hpp |  2 +-
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/src/gowin.cpp b/src/gowin.cpp
index f49f187..1677dd6 100644
--- a/src/gowin.cpp
+++ b/src/gowin.cpp
@@ -83,7 +83,9 @@ Gowin::Gowin(Jtag *jtag, const string filename, const string &file_type, std::st
 		_spi_msk(BSCAN_SPI_MSK)
 {
 	_fs = NULL;
-	uint32_t idcode = _jtag->get_target_device_id();;
+	_mcufw = NULL;
+
+	uint32_t idcode = _jtag->get_target_device_id();
 
 	if (prg_type == Device::WR_FLASH)
 		_mode = Device::FLASH_MODE;
@@ -159,23 +161,16 @@ Gowin::Gowin(Jtag *jtag, const string filename, const string &file_type, std::st
 		if (idcode != 0x0100981b)
 			throw std::runtime_error("Microcontroller firmware flashing only supported on GW1NSR-4C");
 		
-		
-		FILE *fd = fopen(mcufw.c_str(), "rb");
-		if (!fd)
-			throw std::runtime_error("Error: fail to open " + filename);
-		
-		fseek(fd, 0, SEEK_END);
-		int file_size = ftell(fd);
-		fseek(fd, 0, SEEK_SET);
+		_mcufw = new RawParser(mcufw, false);
 
-		mcufwdata.resize(file_size);
+		if (_mcufw->parse() == EXIT_FAILURE) {
+			printError("FAIL");
+			delete _mcufw;
+			throw std::runtime_error("can't parse file");
+		} else {
+			printSuccess("DONE");
+		}
 
-		int ret = fread((char *) mcufwdata.data(), sizeof(char), file_size, fd);
-		fclose(fd);
-		if (ret != file_size)
-			throw std::runtime_error("Error: fail to read " + mcufw);
-
-		/* FIXME: implement checksum calculation */
 		skip_checksum = true;
 	}
 }
@@ -184,6 +179,8 @@ Gowin::~Gowin()
 {
 	if (_fs)
 		delete _fs;
+	if (_mcufw)
+		delete _mcufw;
 }
 
 void Gowin::reset()
@@ -195,20 +192,16 @@ void Gowin::reset()
 void Gowin::programFlash()
 {
 	int status;
-	uint8_t *data;
-	int length;
-	uint8_t *mcu_data;
-	int mcu_length;
 
-	data = _fs->getData();
-	length = _fs->getLength();
+	uint8_t *data = _fs->getData();
+	int length = _fs->getLength();
 	
-	if (mcufwdata.size() == 0) {
-		mcu_data = nullptr;
-		mcu_length = 0;
-	} else {
-		mcu_data = (uint8_t *) mcufwdata.data();
-		mcu_length = mcufwdata.size() * 8;
+	uint8_t *mcu_data = nullptr;
+	int mcu_length = 0;
+	
+	if (_mcufw) {
+		mcu_data = _mcufw->getData();
+		mcu_length = _mcufw->getLength();
 	}
 
 	/* erase SRAM */
diff --git a/src/gowin.hpp b/src/gowin.hpp
index 707a081..c628505 100644
--- a/src/gowin.hpp
+++ b/src/gowin.hpp
@@ -62,6 +62,6 @@ class Gowin: public Device, SPIInterface {
 		uint8_t _spi_di;      /**< di signal (mosi) offset in bscan SPI */
 		uint8_t _spi_do;      /**< do signal (miso) offset in bscan SPI */
 		uint8_t _spi_msk;     /** default spi msk with only do out */
-		std::string mcufwdata;
+		ConfigBitstreamParser *_mcufw;
 };
 #endif  // GOWIN_HPP_