RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-29 00:14:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

style

Browse source
This commit is contained in:
iceman1001 2019-04-08 12:38:32 +02:00
parent cfe793bd22
commit cd85c57e11
1 changed files with 13 additions and 12 deletions

25
client/hid-flasher/flash.c
View file

@ -47,7 +47,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
ctx->num_segs = 0; ctx->num_segs = 0;
seg = ctx->segments; seg = ctx->segments;
fprintf(stderr, "Loading usable ELF segments:\n"); fprintf(stdout, "Loading usable ELF segments:\n");
for (int i = 0; i < num_phdrs; i++) { for (int i = 0; i < num_phdrs; i++) {
if (le32(phdr->p_type) != PT_LOAD) { if (le32(phdr->p_type) != PT_LOAD) {
phdr++; phdr++;
@ -63,11 +63,11 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
phdr++; phdr++;
continue; continue;
} }
fprintf(stderr, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n", fprintf(stdout, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
i, vaddr, paddr, filesz, memsz, i, vaddr, paddr, filesz, memsz,
flags & PF_R ? 'R' : ' ', (flags & PF_R) ? 'R' : ' ',
flags & PF_W ? 'W' : ' ', (flags & PF_W) ? 'W' : ' ',
flags & PF_X ? 'X' : ' ', (flags & PF_X) ? 'X' : ' ',
offset); offset);
if (filesz != memsz) { if (filesz != memsz) {
fprintf(stderr, "Error: PHDR file size does not equal memory size\n" fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
@ -91,7 +91,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
// make extra space if we need to move the data forward // make extra space if we need to move the data forward
data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t)); data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
if (!data) { if (!data) {
fprintf(stderr, "Out of memory\n"); fprintf(stderr, "Error: Out of memory\n");
return -1; return -1;
} }
if (fseek(fd, offset, SEEK_SET) < 0 || fread(data, 1, filesz, fd) != filesz) { if (fseek(fd, offset, SEEK_SET) < 0 || fread(data, 1, filesz, fd) != filesz) {
@ -114,7 +114,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
uint32_t hole = this_offset - prev_seg->length; uint32_t hole = this_offset - prev_seg->length;
uint8_t *new_data = calloc(new_length, sizeof(uint8_t)); uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
if (!new_data) { if (!new_data) {
fprintf(stderr, "Out of memory\n"); fprintf(stderr, "Error: Out of memory\n");
free(data); free(data);
return -1; return -1;
} }
@ -405,7 +405,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
// Write a file's segments to Flash // Write a file's segments to Flash
int flash_write(flash_file_t *ctx) { int flash_write(flash_file_t *ctx) {
fprintf(stderr, "Writing segments for file: %s\n", ctx->filename); fprintf(stdout, "Writing segments for file: %s\n", ctx->filename);
for (int i = 0; i < ctx->num_segs; i++) { for (int i = 0; i < ctx->num_segs; i++) {
flash_seg_t *seg = &ctx->segments[i]; flash_seg_t *seg = &ctx->segments[i];
@ -413,9 +413,8 @@ int flash_write(flash_file_t *ctx) {
uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE; uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
uint32_t end = seg->start + length; uint32_t end = seg->start + length;
fprintf(stderr, " 0x%08x..0x%08x [0x%x / %u blocks]", fprintf(stdout, " 0x%08x..0x%08x [0x%x / %u blocks]", seg->start, end - 1, length, blocks);
seg->start, end - 1, length, blocks); fflush(stdout);
int block = 0; int block = 0;
uint8_t *data = seg->data; uint8_t *data = seg->data;
uint32_t baddr = seg->start; uint32_t baddr = seg->start;
@ -435,10 +434,11 @@ int flash_write(flash_file_t *ctx) {
baddr += block_size; baddr += block_size;
length -= block_size; length -= block_size;
block++; block++;
fprintf(stderr, "."); fprintf(stdout, ".");
fflush(stdout); fflush(stdout);
} }
fprintf(stderr, " OK\n"); fprintf(stderr, " OK\n");
fflush(stdout);
} }
return 0; return 0;
} }
@ -460,5 +460,6 @@ void flash_free(flash_file_t *ctx) {
int flash_stop_flashing(void) { int flash_stop_flashing(void) {
UsbCommand c = {CMD_HARDWARE_RESET}; UsbCommand c = {CMD_HARDWARE_RESET};
SendCommand(&c); SendCommand(&c);
msleep(100);
return 0; return 0;
} }