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

Merge pull request #13 from Martoni/english_error 

english error message debug
This commit is contained in:
Gwenhael Goavec-Merou 2020-01-06 07:58:32 +01:00 committed by GitHub
parent b54ff1cfc0 a2e5c115ae
commit db0bc008b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epcq.cpp
View File

@ -109,7 +109,7 @@ int EPCQ::erase_sector(char start_sector, char nb_sectors)
printf("%d %d %x %x %x %x ", nb_sectors, base_addr, buffer[0], buffer[1], buffer[2], buffer[3]); printf("%d %d %x %x %x %x ", nb_sectors, base_addr, buffer[0], buffer[1], buffer[2], buffer[3]);
if (_spi.ft2232_spi_wr_and_rd(4, buffer, NULL) < 0) { if (_spi.ft2232_spi_wr_and_rd(4, buffer, NULL) < 0) {
printf("erreur de write dans erase_sector\n"); cout << "Write error in erase_sector\n" << endl;
return -1; return -1;
} }
@ -139,7 +139,7 @@ void EPCQ::program(unsigned int start_offset, string filename, bool reverse)
*/ */
fd = fopen(filename.c_str(), "r"); fd = fopen(filename.c_str(), "r");
if (!fd) { if (!fd) {
cout << "erreur d'ouverture de " << filename << endl; cout << "Error opening " << filename << endl;
return; return;
} }
fseek(fd, 0, SEEK_END); fseek(fd, 0, SEEK_END);

16
ftdipp_mpsse.cpp
View File

@ -89,7 +89,7 @@ void FTDIpp_MPSSE::open_device(unsigned int baudrate)
throw std::exception(); throw std::exception();
} }
if (ftdi_set_baudrate(_ftdi, baudrate) < 0) { if (ftdi_set_baudrate(_ftdi, baudrate) < 0) {
fprintf(stderr, "erreur baudrate\n"); fprintf(stderr, "baudrate error\n");
close_device(); close_device();
throw std::exception(); throw std::exception();
} }
@ -143,25 +143,25 @@ int FTDIpp_MPSSE::init(unsigned char latency, unsigned char bitmask_mode,
}; };
if (ftdi_usb_reset(_ftdi) != 0) { if (ftdi_usb_reset(_ftdi) != 0) {
cout << "erreur de reset" << endl; cout << "reset error" << endl;
return -1; return -1;
} }
if (ftdi_set_bitmode(_ftdi, 0x00, BITMODE_RESET) < 0) { if (ftdi_set_bitmode(_ftdi, 0x00, BITMODE_RESET) < 0) {
cout << "erreur de bitmode_reset" << endl; cout << "bitmode_reset error" << endl;
return -1; return -1;
} }
if (ftdi_usb_purge_buffers(_ftdi) != 0) { if (ftdi_usb_purge_buffers(_ftdi) != 0) {
cout << "erreur de reset" << endl; cout << "reset error" << endl;
return -1; return -1;
} }
if (ftdi_set_latency_timer(_ftdi, latency) != 0) { if (ftdi_set_latency_timer(_ftdi, latency) != 0) {
cout << "erreur de reset" << endl; cout << "reset error" << endl;
return -1; return -1;
} }
/* enable MPSSE mode */ /* enable MPSSE mode */
if (ftdi_set_bitmode(_ftdi, bitmask_mode, BITMODE_MPSSE) < 0) { if (ftdi_set_bitmode(_ftdi, bitmask_mode, BITMODE_MPSSE) < 0) {
cout << "erreur de bitmode_mpsse" << endl; cout << "bitmode_mpsse error" << endl;
return -1; return -1;
} }
@ -241,7 +241,7 @@ int FTDIpp_MPSSE::mpsse_store(unsigned char *buff, int len)
if (_num + len + 1 >= _buffer_size) { if (_num + len + 1 >= _buffer_size) {
if (mpsse_write() < 0) { if (mpsse_write() < 0) {
cout << "erreur de write_data dans " << __func__ << endl; cout << "write_data error in " << __func__ << endl;
return -1; return -1;
} }
} }
@ -263,7 +263,7 @@ int FTDIpp_MPSSE::mpsse_write()
#endif #endif
if (ftdi_write_data(_ftdi, _buffer, _num) != _num) { if (ftdi_write_data(_ftdi, _buffer, _num) != _num) {
cout << "erreur de write" << endl; cout << "write error" << endl;
return -1; return -1;
} }

32
ftdispi.cpp
View File

@ -91,7 +91,7 @@ int ftdi_spi_init_by_name(struct ftdi_spi *spi, char *devname,
{ {
spi->ftdic = open_device_by_name(devname, interface, 115200); spi->ftdic = open_device_by_name(devname, interface, 115200);
if (spi->ftdic == NULL) { if (spi->ftdic == NULL) {
printf("erreur d'ouverture\n"); printf("opening error\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
return ftdi_spi_init_internal(spi, clk_freq_hz); return ftdi_spi_init_internal(spi, clk_freq_hz);
@ -102,7 +102,7 @@ int ftdi_spi_init(struct ftdi_spi *spi, uint32_t vid, uint32_t pid,
{ {
spi->ftdic = open_device(vid, pid, interface, 115200); spi->ftdic = open_device(vid, pid, interface, 115200);
if (spi->ftdic == NULL) { if (spi->ftdic == NULL) {
printf("erreur d'ouverture\n"); printf("opening error\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
return ftdi_spi_init_internal(spi, clk_freq_hz); return ftdi_spi_init_internal(spi, clk_freq_hz);
@ -116,35 +116,35 @@ int ftdi_spi_init_internal(struct ftdi_spi *spi, uint32_t clock_freq_hz)
spi->tx_buff = (uint8_t *)malloc(sizeof(uint8_t) * TX_BUFS); spi->tx_buff = (uint8_t *)malloc(sizeof(uint8_t) * TX_BUFS);
if (ftdi_usb_reset(spi->ftdic) != 0) { if (ftdi_usb_reset(spi->ftdic) != 0) {
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
if (ftdi_usb_purge_rx_buffer(spi->ftdic) != 0) { if (ftdi_usb_purge_rx_buffer(spi->ftdic) != 0) {
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
if (ftdi_usb_purge_tx_buffer(spi->ftdic) != 0) { if (ftdi_usb_purge_tx_buffer(spi->ftdic) != 0) {
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
if (ftdi_read_data_set_chunksize(spi->ftdic, SIZE) != 0) { if (ftdi_read_data_set_chunksize(spi->ftdic, SIZE) != 0) {
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
if (ftdi_write_data_set_chunksize(spi->ftdic, SIZE) != 0) { if (ftdi_write_data_set_chunksize(spi->ftdic, SIZE) != 0) {
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
if (ftdi_set_latency_timer(spi->ftdic, LATENCY) != 0) { if (ftdi_set_latency_timer(spi->ftdic, LATENCY) != 0) {
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
if (ftdi_set_event_char(spi->ftdic, 0x00, 0) != 0) { if (ftdi_set_event_char(spi->ftdic, 0x00, 0) != 0) {
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
if (ftdi_set_error_char(spi->ftdic, 0x00, 0) != 0) { if (ftdi_set_error_char(spi->ftdic, 0x00, 0) != 0) {
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
// set the read timeouts in ms for the ft2232H // set the read timeouts in ms for the ft2232H
@ -152,12 +152,12 @@ int ftdi_spi_init_internal(struct ftdi_spi *spi, uint32_t clock_freq_hz)
// set the write timeouts in ms for the ft2232H // set the write timeouts in ms for the ft2232H
spi->ftdic->usb_write_timeout = 5000; spi->ftdic->usb_write_timeout = 5000;
if (ftdi_set_bitmode(spi->ftdic, 0x00, 0x00) != 0) { // reset controller if (ftdi_set_bitmode(spi->ftdic, 0x00, 0x00) != 0) { // reset controller
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
if (ftdi_set_bitmode(spi->ftdic, 0x00, 0x02) != 0) { // enable mpsse mode if (ftdi_set_bitmode(spi->ftdic, 0x00, 0x02) != 0) { // enable mpsse mode
printf("erreur de reset\n"); printf("reset error\n");
return -1; return -1;
} }
@ -169,13 +169,13 @@ int ftdi_spi_init_internal(struct ftdi_spi *spi, uint32_t clock_freq_hz)
// devrait etre 8C pour enable et non 8D // devrait etre 8C pour enable et non 8D
spi->tx_buff[spi->tx_size++] = 0x8d; //disable tri phase data clocking spi->tx_buff[spi->tx_size++] = 0x8d; //disable tri phase data clocking
if (ftdi_write_data(spi->ftdic, spi->tx_buff, spi->tx_size) != spi->tx_size) { if (ftdi_write_data(spi->ftdic, spi->tx_buff, spi->tx_size) != spi->tx_size) {
printf("erreur de write pour dis clock, adaptive, tri phase\n"); printf("write error for dis clock, adaptive, tri phase\n");
return -1; return -1;
} }
spi->tx_size = 0; spi->tx_size = 0;
spi->tx_buff[spi->tx_size++] = 0x85; // disable loopback spi->tx_buff[spi->tx_size++] = 0x85; // disable loopback
if (ftdi_write_data(spi->ftdic, spi->tx_buff, spi->tx_size) != spi->tx_size) { if (ftdi_write_data(spi->ftdic, spi->tx_buff, spi->tx_size) != spi->tx_size) {
printf("erreur disable loopback\n"); printf("disable loopback error\n");
return -1; return -1;
} }
@ -184,7 +184,7 @@ int ftdi_spi_init_internal(struct ftdi_spi *spi, uint32_t clock_freq_hz)
spi->tx_buff[spi->tx_size++] = 0x08; spi->tx_buff[spi->tx_size++] = 0x08;
spi->tx_buff[spi->tx_size++] = 0x0B; spi->tx_buff[spi->tx_size++] = 0x0B;
if (ftdi_write_data(spi->ftdic, spi->tx_buff, spi->tx_size) != spi->tx_size) { if (ftdi_write_data(spi->ftdic, spi->tx_buff, spi->tx_size) != spi->tx_size) {
printf("erreur de write pour set bit\n"); printf("write set bit error\n");
return -1; return -1;
} }
spi->tx_size = 0; spi->tx_size = 0;
@ -276,7 +276,7 @@ void FtdiSpi::confCs(char stat)
tx_buf[4] |= (stat) ? cs_bits : 0; tx_buf[4] |= (stat) ? cs_bits : 0;
if (mpsse_store(tx_buf, 6) != 0) if (mpsse_store(tx_buf, 6) != 0)
printf("erreur\n"); printf("error\n");
} }
void FtdiSpi::setCs() void FtdiSpi::setCs()