projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash/nor/efm32: fixed BG1x identification
[fw/openocd]
/
src
/
pld
/
xilinx_bit.c
diff --git
a/src/pld/xilinx_bit.c
b/src/pld/xilinx_bit.c
index 5dacdac392e118d1c39918d4eca048893119dd7f..fe3faefc9ea8141312754515d53e0246b007c8bd 100644
(file)
--- a/
src/pld/xilinx_bit.c
+++ b/
src/pld/xilinx_bit.c
@@
-13,53
+13,47
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xilinx_bit.h"
#include "pld.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xilinx_bit.h"
#include "pld.h"
-#include
"log.h"
+#include
<helper/log.h>
#include <sys/stat.h>
#include <sys/stat.h>
-
+#include <helper/system.h>
static int read_section(FILE *input_file, int length_size, char section,
static int read_section(FILE *input_file, int length_size, char section,
-
u32
*buffer_length, uint8_t **buffer)
+
uint32_t
*buffer_length, uint8_t **buffer)
{
uint8_t length_buffer[4];
int length;
char section_char;
int read_count;
{
uint8_t length_buffer[4];
int length;
char section_char;
int read_count;
- if ((length_size != 2) && (length_size != 4))
- {
+ if ((length_size != 2) && (length_size != 4)) {
LOG_ERROR("BUG: length_size neither 2 nor 4");
return ERROR_PLD_FILE_LOAD_FAILED;
}
LOG_ERROR("BUG: length_size neither 2 nor 4");
return ERROR_PLD_FILE_LOAD_FAILED;
}
- if ((read_count = fread(§ion_char, 1, 1, input_file)) != 1)
- {
+ read_count = fread(§ion_char, 1, 1, input_file);
+ if (read_count != 1)
return ERROR_PLD_FILE_LOAD_FAILED;
return ERROR_PLD_FILE_LOAD_FAILED;
- }
if (section_char != section)
if (section_char != section)
- {
return ERROR_PLD_FILE_LOAD_FAILED;
return ERROR_PLD_FILE_LOAD_FAILED;
- }
- if ((read_count = fread(length_buffer, 1, length_size, input_file)) != length_size)
- {
+ read_count = fread(length_buffer, 1, length_size, input_file);
+ if (read_count != length_size)
return ERROR_PLD_FILE_LOAD_FAILED;
return ERROR_PLD_FILE_LOAD_FAILED;
- }
if (length_size == 4)
length = be_to_h_u32(length_buffer);
if (length_size == 4)
length = be_to_h_u32(length_buffer);
- else /* (length_size == 2) */
+ else
/* (length_size == 2) */
length = be_to_h_u16(length_buffer);
if (buffer_length)
length = be_to_h_u16(length_buffer);
if (buffer_length)
@@
-67,48
+61,45
@@
static int read_section(FILE *input_file, int length_size, char section,
*buffer = malloc(length);
*buffer = malloc(length);
- if ((read_count = fread(*buffer, 1, length, input_file)) != length)
- {
+ read_count = fread(*buffer, 1, length, input_file);
+ if (read_count != length)
return ERROR_PLD_FILE_LOAD_FAILED;
return ERROR_PLD_FILE_LOAD_FAILED;
- }
return ERROR_OK;
}
return ERROR_OK;
}
-int xilinx_read_bit_file(
xilinx_bit_file_t *bit_file,
char *filename)
+int xilinx_read_bit_file(
struct xilinx_bit_file *bit_file, const
char *filename)
{
FILE *input_file;
struct stat input_stat;
int read_count;
if (!filename || !bit_file)
{
FILE *input_file;
struct stat input_stat;
int read_count;
if (!filename || !bit_file)
- return ERROR_
INVALID_ARGUMENTS
;
+ return ERROR_
COMMAND_SYNTAX_ERROR
;
- if (stat(filename, &input_stat) == -1)
- {
+ if (stat(filename, &input_stat) == -1) {
LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
return ERROR_PLD_FILE_LOAD_FAILED;
}
LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
return ERROR_PLD_FILE_LOAD_FAILED;
}
- if (S_ISDIR(input_stat.st_mode))
- {
+ if (S_ISDIR(input_stat.st_mode)) {
LOG_ERROR("%s is a directory", filename);
return ERROR_PLD_FILE_LOAD_FAILED;
}
LOG_ERROR("%s is a directory", filename);
return ERROR_PLD_FILE_LOAD_FAILED;
}
- if (input_stat.st_size == 0){
+ if (input_stat.st_size == 0)
{
LOG_ERROR("Empty file %s", filename);
return ERROR_PLD_FILE_LOAD_FAILED;
}
LOG_ERROR("Empty file %s", filename);
return ERROR_PLD_FILE_LOAD_FAILED;
}
- i
f (!(input_file = fopen(filename, "rb")))
- {
+ i
nput_file = fopen(filename, "rb");
+
if (!input_file)
{
LOG_ERROR("couldn't open %s: %s", filename, strerror(errno));
return ERROR_PLD_FILE_LOAD_FAILED;
}
LOG_ERROR("couldn't open %s: %s", filename, strerror(errno));
return ERROR_PLD_FILE_LOAD_FAILED;
}
- if ((read_count = fread(bit_file->unknown_header, 1, 13, input_file)) != 13)
- {
+ read_count = fread(bit_file->unknown_header, 1, 13, input_file);
+
if (read_count != 13)
{
LOG_ERROR("couldn't read unknown_header from file '%s'", filename);
return ERROR_PLD_FILE_LOAD_FAILED;
}
LOG_ERROR("couldn't read unknown_header from file '%s'", filename);
return ERROR_PLD_FILE_LOAD_FAILED;
}
@@
-128,7
+119,7
@@
int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, char *filename)
if (read_section(input_file, 4, 'e', &bit_file->length, &bit_file->data) != ERROR_OK)
return ERROR_PLD_FILE_LOAD_FAILED;
if (read_section(input_file, 4, 'e', &bit_file->length, &bit_file->data) != ERROR_OK)
return ERROR_PLD_FILE_LOAD_FAILED;
- LOG_DEBUG("bit_file: %s %s %s,%s %
i
", bit_file->source_file, bit_file->part_name,
+ LOG_DEBUG("bit_file: %s %s %s,%s %
" PRIu32 "
", bit_file->source_file, bit_file->part_name,
bit_file->date, bit_file->time, bit_file->length);
fclose(input_file);
bit_file->date, bit_file->time, bit_file->length);
fclose(input_file);