lattice: simplify code for ECP3 family

Author: trabucayre

src/lattice.cpp

@@ -428,30 +428,8 @@ bool Lattice::program_mem()
 	}
 
 	if (_fpga_family == ECP3_FAMILY) {
-		// ! Erase the device
-
-		// ! Shift in ISC PROGRAM USERCODE(0x1A) instruction
-		// SIR 8   TDI  (1A);
-		// SDR 32  TDI  (FFFFFFFF);
-		// RUNTEST IDLE    5 TCK   2,00E-03 SEC;
-		// ! Shift in READ USERCODE(0x17) instruction
-		// SIR 8   TDI  (17);
-		// SDR 32  TDI  (FFFFFFFF)
-		//         TDO  (FFFFFFFF);
-		uint32_t dummy = 0xffffffff;
-		wr_rd(ECP3_ISC_PROGRAM_USERCODE, (uint8_t *)&dummy, 4, NULL, 0);
-		_jtag->set_state(Jtag::RUN_TEST_IDLE);
-		_jtag->toggleClk(5, 1);
-		usleep_ecp3(2000); // 2ms
-
-		uint32_t rx = 0;
-		wr_rd(ECP3_READ_USERCODE, (uint8_t *)&dummy, 4, (uint8_t *)&rx, 4);
-		if (rx != 0xffffffff) {
-			char message[256];
-			snprintf(message, 256, "failed: 0x%08x instead of 0xffffffff", rx);
-			printError(message);
+		if (!write_userCode(0xffffffff))
 			return false;
-		}
 	}
 
 	/* ISC ERASE
@@ -526,7 +504,7 @@ bool Lattice::program_mem()
 		for (int ii = 0; ii < size; ii++)
 			tmp[ii] = ConfigBitstreamParser::reverseByte(data[i+ii]);
 
-		_jtag->shiftDR(tmp, NULL, size*8, next_state);
+		_jtag->shiftDR(tmp, NULL, size * 8, next_state);
 	}
 
 	_jtag->set_state(Jtag::RUN_TEST_IDLE);
@@ -536,15 +514,15 @@ bool Lattice::program_mem()
 		usleep_ecp3(2000);
 
 		/* Verifiy User Code register */
-		uint32_t rx = 0;
-		uint8_t dummy[] = {0xff, 0xff, 0xff, 0xff};
-		wr_rd(ECP3_READ_USERCODE, dummy, 4, (uint8_t *)&rx, 4);
+		uint32_t rx = userCode();
 		if (rx != 0x00000000) {
+			progress.fail();
 			char message[256];
 			snprintf(message, 256, "failed: 0x%08x instead of 0x00000000", rx);
 			printError(message);
 			return false;
 		}
+		progress.done();
 	} else {
 		_jtag->toggleClk(1000);
 	}
@@ -590,9 +568,14 @@ bool Lattice::program_mem()
 
 		// Verify STATUS Register
 		uint64_t status = readStatusReg();
-		printf("status %08x %08x\n", status, status & 0x60007);
-		displayReadReg(status);
 		_jtag->toggleClk(5, 1);
+		if (status & 0x60007 != 0x20000) {
+			char message[256];
+			snprintf(message, 256, "Programming failed: status 0x%08x instead of 0x20000", status);
+			printError(message);
+			displayReadReg(status);
+			return false;
+		}
 	}
 
 	if (_verbose)
@@ -1086,13 +1069,40 @@ uint32_t Lattice::idCode()
 int Lattice::userCode()
 {
 	uint8_t usercode[4];
-	wr_rd(0xC0, NULL, 0, usercode, 4);
+	wr_rd((_fpga_family == ECP3_FAMILY) ? ECP3_READ_USERCODE : 0xC0,
+		NULL, 0, usercode, 4);
 	return usercode[3] << 24 |
 					usercode[2] << 16 |
 					usercode[1] << 8  |
 					usercode[0];
 }
 
+bool Lattice::write_userCode(uint32_t usercode)
+{
+	// ! Shift in ISC PROGRAM USERCODE(0x1A) instruction
+	// SIR 8   TDI  (1A);
+	// SDR 32  TDI  (FFFFFFFF);
+	// RUNTEST IDLE    5 TCK   2,00E-03 SEC;
+	// ! Shift in READ USERCODE(0x17) instruction
+	// SIR 8   TDI  (17);
+	// SDR 32  TDI  (FFFFFFFF)
+	//         TDO  (FFFFFFFF);
+	wr_rd(ECP3_ISC_PROGRAM_USERCODE, (uint8_t *)&usercode, 4, NULL, 0);
+	_jtag->set_state(Jtag::RUN_TEST_IDLE);
+	_jtag->toggleClk(5, 1);
+	usleep_ecp3(2000); // 2ms
+
+	uint32_t rd_usercode = userCode();
+	if (rd_usercode != usercode) {
+		char message[256];
+		snprintf(message, 256, "failed: 0x%08x instead of 0x%08x",
+			rd_usercode, usercode);
+		printError(message);
+		return false;
+	}
+	return true;
+}
+
 bool Lattice::checkID()
 {
 	printf("\n");

src/lattice.hpp

@@ -25,6 +25,7 @@ class Lattice: public Device, SPIInterface {
 			int8_t verbose, bool skip_load_bridge, bool skip_reset);
 		uint32_t idCode() override;
 		int userCode();
+		bool write_userCode(uint32_t usercode);
 		void reset() override {}
 		void program(unsigned int offset, bool unprotect_flash) override;
 		bool program_mem();