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

main,spiFlash,xilinx: fix warnings

This commit is contained in:
Gwenhael Goavec-Merou 2024-11-09 11:24:16 +01:00
parent 023e7b772d
commit 543be23d03
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@ -505,7 +505,7 @@ int main(int argc, char **argv)
} }
if (found != 0) { if (found != 0) {
if (args.index_chain == -1) { if (args.index_chain < 0) {
for (size_t i = 0; i < found; i++) { for (size_t i = 0; i < found; i++) {
if (fpga_list.find(listDev[i]) != fpga_list.end()) { if (fpga_list.find(listDev[i]) != fpga_list.end()) {
index = i; index = i;
@ -523,7 +523,7 @@ int main(int argc, char **argv)
} }
} else { } else {
index = args.index_chain; index = args.index_chain;
if (index > found || index < 0) { if (index > found) {
printError("wrong index for device in JTAG chain"); printError("wrong index for device in JTAG chain");
delete(jtag); delete(jtag);
return EXIT_FAILURE; return EXIT_FAILURE;

7
src/spiFlash.cpp
View File

@ -944,7 +944,7 @@ bool SPIFlash::set_quad_bit(bool set_quad)
/* Micron: enable 0, disable 1 */ /* Micron: enable 0, disable 1 */
if (_jedec_id == 0x20BA) if (_jedec_id == 0x20BA)
set_quad = ~set_quad; set_quad = !set_quad;
if (set_quad) // set quad_bit when required if (set_quad) // set quad_bit when required
quad_bit = _flash_model->quad_mask; quad_bit = _flash_model->quad_mask;
@ -962,8 +962,9 @@ bool SPIFlash::set_quad_bit(bool set_quad)
*/ */
switch (_flash_model->quad_register) { switch (_flash_model->quad_register) {
case CONFR: case CONFR:
uint8_t status = read_status_reg(); reg_val = ((reg_val & 0xff) << 8) | read_status_reg();
reg_val = ((reg_val & 0xff) << 8) | status; break;
default: /* -Wswitch */
break; break;
} }

18
src/xilinx.cpp
View File

@ -850,19 +850,7 @@ void Xilinx::program_mem(ConfigBitstreamParser *bitfile)
} }
} }
static const uint32_t reverseByte(uint32_t in) { static uint32_t reverseWord(uint32_t in) {
uint8_t out [4];
for (int i = 0; i < 4; i++) {
uint8_t tmp = (in >> (i*8)) & 0xff;
out[i] = BitParser::reverseByte(tmp);
}
return ((((uint32_t)out[0]) << 24) |
(((uint32_t)out[1]) << 16) |
(((uint32_t)out[2]) << 8) |
(((uint32_t)out[3]) << 0));
}
static const uint32_t reverseWord(uint32_t in) {
uint32_t out = 0; uint32_t out = 0;
for (int i = 0; i < 32; i++) { for (int i = 0; i < 32; i++) {
out <<= 1; out <<= 1;
@ -871,7 +859,7 @@ static const uint32_t reverseWord(uint32_t in) {
return out; return out;
} }
static const uint32_t char_array_to_word(uint8_t *in) static uint32_t char_array_to_word(uint8_t *in)
{ {
return (((uint32_t)in[3] << 24) | return (((uint32_t)in[3] << 24) |
((uint32_t)in[2] << 16) | ((uint32_t)in[2] << 16) |
@ -1808,7 +1796,7 @@ void Xilinx::xc2c_init(uint32_t idcode)
{ {
_fpga_family = XC2C_FAMILY; _fpga_family = XC2C_FAMILY;
std::string model = fpga_list[idcode].model; std::string model = fpga_list[idcode].model;
int underscore_pos = model.find_first_of('_', 0); size_t underscore_pos = model.find_first_of('_', 0);
if (underscore_pos == model.npos) { if (underscore_pos == model.npos) {
underscore_pos = model.length(); underscore_pos = model.length();
} }