luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xilinx: lint more happy

This commit is contained in:
Gwenhael Goavec-Merou 2023-11-25 15:14:32 +01:00
parent 234f7f5a35
commit 8007ffe263
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/xilinx.cpp
View File

@ -7,29 +7,28 @@
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#include <memory>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory>
#include "jtag.hpp"
#include "bitparser.hpp" #include "bitparser.hpp"
#include "common.hpp" #include "common.hpp"
#include "configBitstreamParser.hpp" #include "configBitstreamParser.hpp"
#include "jedParser.hpp"
#include "mcsParser.hpp"
#include "spiFlash.hpp"
#include "rawParser.hpp"
#include "display.hpp" #include "display.hpp"
#include "spiInterface.hpp" #include "jedParser.hpp"
#include "xilinx.hpp" #include "jtag.hpp"
#include "xilinxMapParser.hpp" #include "mcsParser.hpp"
#include "part.hpp" #include "part.hpp"
#include "progressBar.hpp" #include "progressBar.hpp"
#if defined (_WIN64) || defined (_WIN32) #if defined (_WIN64) || defined (_WIN32)
#include "pathHelper.hpp" #include "pathHelper.hpp"
#endif #endif
#include "rawParser.hpp"
#include "spiFlash.hpp"
#include "spiInterface.hpp"
#include "xilinx.hpp"
#include "xilinxMapParser.hpp"
/* Used for xc3s */ /* Used for xc3s */
#define USER1 0x02 #define USER1 0x02
@ -149,7 +148,7 @@ static std::map<std::string, std::map<std::string, std::vector<uint8_t>>>
{ {
{ "USER1", {0b00100100, 0b00101001, 0b00} }, { "USER1", {0b00100100, 0b00101001, 0b00} },
{ "USER2", {0b00100100, 0b00111001, 0b00} }, { "USER2", {0b00100100, 0b00111001, 0b00} },
{ "CFG_IN", {0b00100100, 0b01011001, 0b00} }, // CFG_IN_SLR1 { "CFG_IN", {0b00100100, 0b01011001, 0b00} }, // CFG_IN_SLR1
{ "USERCODE", {0b00100100, 0b10001001, 0b00} }, { "USERCODE", {0b00100100, 0b10001001, 0b00} },
{ "IDCODE", {0b01001001, 0b10010010, 0b00} }, { "IDCODE", {0b01001001, 0b10010010, 0b00} },
{ "ISC_ENABLE", {0b00010000, 0b00000100, 0b01} }, { "ISC_ENABLE", {0b00010000, 0b00000100, 0b01} },
@ -195,21 +194,21 @@ static void open_bitfile(
#define FUSE_DNA 0x32 #define FUSE_DNA 0x32
unsigned long long Xilinx::fuse_dna_read(void) uint64_t Xilinx::fuse_dna_read(void)
{ {
unsigned char tx_data[8] = {0,0,0,0,0,0,0,0}; unsigned char tx_data[8] = {0, 0, 0, 0, 0, 0, 0, 0};
unsigned char rx_data[8]; unsigned char rx_data[8];
_jtag->go_test_logic_reset(); _jtag->go_test_logic_reset();
_jtag->shiftIR(FUSE_DNA, 6); _jtag->shiftIR(FUSE_DNA, 6);
_jtag->shiftDR((unsigned char *)&tx_data, (unsigned char *)&rx_data, 64); _jtag->shiftDR((unsigned char *)&tx_data, (unsigned char *)&rx_data, 64);
unsigned long long dna = 0; uint64_t dna = 0;
for(int i = 0; i < 8; i++) { for(int i = 0; i < 8; i++) {
unsigned char rev = 0; unsigned char rev = 0;
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
rev |= ((rx_data[i]>>j)&1)<<(7-j); rev |= ((rx_data[i] >> j) & 1) << (7 - j);
} }
dna = (dna << 8ULL) | rev; dna = (dna << 8ULL) | rev;
} }
@ -217,7 +216,7 @@ unsigned long long Xilinx::fuse_dna_read(void)
return dna & 0x1ffffffffffffff; return dna & 0x1ffffffffffffff;
} }
unsigned int Xilinx::xadc_read(unsigned short addr) unsigned int Xilinx::xadc_read(uint16_t addr)
{ {
unsigned int tx_data = (1 << 26) | (addr << 16); unsigned int tx_data = (1 << 26) | (addr << 16);
unsigned int rx_data = 0; unsigned int rx_data = 0;
@ -232,7 +231,7 @@ unsigned int Xilinx::xadc_read(unsigned short addr)
return rx_data; return rx_data;
} }
void Xilinx::xadc_write(unsigned short addr, unsigned short data) void Xilinx::xadc_write(uint16_t addr, uint16_t data)
{ {
unsigned int tx_data = (1 << 26) | (addr << 16) | data; unsigned int tx_data = (1 << 26) | (addr << 16) | data;
unsigned int rx_data = 0; unsigned int rx_data = 0;
@ -242,13 +241,13 @@ void Xilinx::xadc_write(unsigned short addr, unsigned short data)
_jtag->shiftDR((unsigned char *)&tx_data, (unsigned char *)&rx_data, 32); _jtag->shiftDR((unsigned char *)&tx_data, (unsigned char *)&rx_data, 32);
} }
unsigned int Xilinx::xadc_single(unsigned short ch) unsigned int Xilinx::xadc_single(uint16_t ch)
{ {
_jtag->go_test_logic_reset(); _jtag->go_test_logic_reset();
// single channel, disable the sequencer // single channel, disable the sequencer
xadc_write(XADC_CFG1,0x3000); xadc_write(XADC_CFG1, 0x3000);
// set channel, no averaging, additional settling time // set channel, no averaging, additional settling time
xadc_write(XADC_CFG0,(1<<15) | (1<<8) | ch); xadc_write(XADC_CFG0, (1 << 15) | (1 << 8) | ch);
// leave some time (1ms) for the conversion // leave some time (1ms) for the conversion
usleep(1000); usleep(1000);
unsigned int ret = xadc_read(ch); unsigned int ret = xadc_read(ch);
@ -385,7 +384,7 @@ Xilinx::Xilinx(Jtag *jtag, const std::string &filename,
if (read_dna) { if (read_dna) {
if (_fpga_family == ARTIX_FAMILY || _fpga_family == KINTEXUS_FAMILY) { if (_fpga_family == ARTIX_FAMILY || _fpga_family == KINTEXUS_FAMILY) {
unsigned long long dna = Xilinx::fuse_dna_read(); uint64_t dna = Xilinx::fuse_dna_read();
printf("{\"dna\": \"0x%016lx\"}\n", dna); printf("{\"dna\": \"0x%016lx\"}\n", dna);
} else { } else {
throw std::runtime_error("Error: read_xadc only supported for Artix 7"); throw std::runtime_error("Error: read_xadc only supported for Artix 7");
@ -425,10 +424,10 @@ Xilinx::Xilinx(Jtag *jtag, const std::string &filename,
std::cout << "\"raw\": {"; std::cout << "\"raw\": {";
for (int ch = 0; ch < MAX_CHANNEL; ch++) { for (int ch = 0; ch < MAX_CHANNEL; ch++) {
std::cout << "\"" << ch << "\": " << channel_values[ch] std::cout << "\"" << ch << "\": " << channel_values[ch]
<< ((ch==MAX_CHANNEL-1)? "}" : ", "); << ((ch == MAX_CHANNEL - 1)? "}" : ", ");
} }
std::cout << "}" << std::endl; std::cout << "}" << std::endl;
} else { } else {
throw std::runtime_error("Error: read_xadc only supported for Artix 7"); throw std::runtime_error("Error: read_xadc only supported for Artix 7");
} }
@ -557,7 +556,7 @@ void Xilinx::program(unsigned int offset, bool unprotect_flash)
if (_fpga_family != XC95_FAMILY && _fpga_family != XC2C_FAMILY) if (_fpga_family != XC95_FAMILY && _fpga_family != XC2C_FAMILY)
throw std::runtime_error("Error: jed only supported for xc95 and xc2c"); throw std::runtime_error("Error: jed only supported for xc95 and xc2c");
printInfo("Open file ", false); printInfo("Open file ", false);
std::unique_ptr<JedParser> jed(new JedParser(_filename, _verbose)); std::unique_ptr<JedParser> jed(new JedParser(_filename, _verbose));
if (jed->parse() == EXIT_FAILURE) { if (jed->parse() == EXIT_FAILURE) {
printError("FAIL"); printError("FAIL");
@ -927,7 +926,7 @@ bool Xilinx::xc3s_flow_program(ConfigBitstreamParser *bit)
do { do {
if (_jtag->shiftIR(&tx_buf, &rx_buf, _irlen) < 0) if (_jtag->shiftIR(&tx_buf, &rx_buf, _irlen) < 0)
return false; return false;
} while (!(rx_buf & 0x10)); // wait until INIT } while (!(rx_buf & 0x10)); // wait until INIT
if (_jtag->shiftIR(JSHUTDOWN, _irlen) < 0) if (_jtag->shiftIR(JSHUTDOWN, _irlen) < 0)
return false; return false;
@ -935,7 +934,7 @@ bool Xilinx::xc3s_flow_program(ConfigBitstreamParser *bit)
if (_jtag->shiftIR(CFG_IN, _irlen) < 0) if (_jtag->shiftIR(CFG_IN, _irlen) < 0)
return false; return false;
for (int i = 0;byte_length > 0; byte_length-=burst_len, data+=burst_len) { for (int i = 0; byte_length > 0; byte_length-=burst_len, data+=burst_len) {
if (burst_len > byte_length) { if (burst_len > byte_length) {
tx_len = byte_length * 8; tx_len = byte_length * 8;
tx_end = Jtag::RUN_TEST_IDLE; tx_end = Jtag::RUN_TEST_IDLE;
@ -955,17 +954,16 @@ bool Xilinx::xc3s_flow_program(ConfigBitstreamParser *bit)
_jtag->toggleClk(32); _jtag->toggleClk(32);
if (_jtag->shiftIR(BYPASS, _irlen) < 0) if (_jtag->shiftIR(BYPASS, _irlen) < 0)
return false; return false;
//data[0] = 0x00;
uint8_t d = 0; uint8_t d = 0;
if (_jtag->shiftDR(&d, NULL, 1) < 0) if (_jtag->shiftDR(&d, NULL, 1) < 0)
return false; return false;
_jtag->toggleClk(1); _jtag->toggleClk(1);
flow_disable(); flow_disable();
uint8_t mask = 0x20; // Done bit uint8_t mask = 0x20; // Done bit
uint32_t idcode = _jtag->get_target_device_id(); uint32_t idcode = _jtag->get_target_device_id();
if (fpga_list[idcode].family == "spartan3e") { if (fpga_list[idcode].family == "spartan3e") {
mask = 0x10; // ISC done dit mask = 0x10; // ISC done dit
} }
int retry = 100; int retry = 100;
do { do {
@ -973,7 +971,7 @@ bool Xilinx::xc3s_flow_program(ConfigBitstreamParser *bit)
return false; return false;
if (_jtag->shiftDR(data, NULL, 1) < 0) if (_jtag->shiftDR(data, NULL, 1) < 0)
return false; return false;
} while (!(rx_buf & mask) && (retry-- > 0)); // wait until mask } while (!(rx_buf & mask) && (retry-- > 0)); // wait until mask
return true; return true;
} }

22
src/xilinx.hpp
View File

@ -3,16 +3,18 @@
* Copyright (C) 2019 Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> * Copyright (C) 2019 Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
*/ */
#ifndef XILINX_HPP #ifndef SRC_XILINX_HPP_
#define XILINX_HPP #define SRC_XILINX_HPP_
#include <map>
#include <string> #include <string>
#include <vector>
#include "configBitstreamParser.hpp" #include "configBitstreamParser.hpp"
#include "device.hpp" #include "device.hpp"
#include "jedParser.hpp"
#include "jtag.hpp" #include "jtag.hpp"
#include "spiInterface.hpp" #include "spiInterface.hpp"
#include "jedParser.hpp"
class Xilinx: public Device, SPIInterface { class Xilinx: public Device, SPIInterface {
public: public:
@ -145,11 +147,11 @@ class Xilinx: public Device, SPIInterface {
/*! /*!
* \brief prepare SPI flash access (need to have bridge in RAM) * \brief prepare SPI flash access (need to have bridge in RAM)
*/ */
virtual bool prepare_flash_access() override; bool prepare_flash_access() override;
/*! /*!
* \brief end of SPI flash access * \brief end of SPI flash access
*/ */
virtual bool post_flash_access() override; bool post_flash_access() override;
private: private:
/* list of xilinx family devices */ /* list of xilinx family devices */
@ -193,12 +195,12 @@ class Xilinx: public Device, SPIInterface {
}; };
/* XADC */ /* XADC */
unsigned int xadc_read(unsigned short addr); unsigned int xadc_read(uint16_t addr);
void xadc_write(unsigned short addr, unsigned short data); void xadc_write(uint16_t addr, uint16_t data);
unsigned int xadc_single(unsigned short ch); unsigned int xadc_single(uint16_t ch);
/* DNA */ /* DNA */
unsigned long long fuse_dna_read(void); uint64_t fuse_dna_read(void);
/*! /*!
* \brief Starting from UltraScale, Xilinx devices can support dual * \brief Starting from UltraScale, Xilinx devices can support dual
@ -223,4 +225,4 @@ class Xilinx: public Device, SPIInterface {
std::string _user_instruction; /* which USER bscan instruction to interface with SPI */ std::string _user_instruction; /* which USER bscan instruction to interface with SPI */
}; };
#endif #endif // SRC_XILINX_HPP_