Skip to content

Commit

Permalink
Merge pull request DediProgSW#32 from jgstroud/master
Browse files Browse the repository at this point in the history
Fix new compile warnings
  • Loading branch information
Benwang217 authored Oct 21, 2020
2 parents 36eb532 + 722b44e commit ff2db59
Show file tree
Hide file tree
Showing 23 changed files with 4 additions and 3 deletions.
Empty file modified 60-dediprog.rules
100755 → 100644
Empty file.
Empty file modified ChipInfoDb.dedicfg
100755 → 100644
Empty file.
Empty file modified ChipInfoDb.h
100755 → 100644
Empty file.
Empty file modified FlashCommand.c
100755 → 100644
Empty file.
Empty file modified FlashCommand.h
100755 → 100644
Empty file.
Empty file modified IntelHexFile.c
100755 → 100644
Empty file.
Empty file modified IntelHexFile.h
100755 → 100644
Empty file.
Empty file modified LICENSE
100755 → 100644
Empty file.
Empty file modified Macro.h
100755 → 100644
Empty file.
Empty file modified Makefile
100755 → 100644
Empty file.
Empty file modified MotorolaFile.c
100755 → 100644
Empty file.
Empty file modified MotorolaFile.h
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion SerialFlash.c
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2019,7 +2019,7 @@ int SerialFlash_DieErase(int Index)
{
if (SerialFlash_protectBlock(false, Index) == SerialFlash_FALSE)
return false;
SerialFlash_Enable4ByteAddrMode(true, Index);
SerialFlash_Enable4ByteAddrMode(true, Index);
// printf("Die erase!\n");

// send request
Expand Down
Empty file modified SerialFlash.h
100755 → 100644
Empty file.
Empty file modified board.c
100755 → 100644
Empty file.
Empty file modified board.h
100755 → 100644
Empty file.
3 changes: 2 additions & 1 deletion dpcmd.c
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ int main(int argc, char *argv[])

if (iExitCode != EXCODE_PASS)
goto Exit;
iExitCode=Handler();
iExitCode=Handler();

Exit:
printf("\n\n");
Expand Down Expand Up @@ -1542,6 +1542,7 @@ bool Wait(const char* strOK,const char* strFail)
if (g_bDisplayTimer == true) {
timersub(&tv, &basetv, &diff);
printf("\r%0.1fs elapsed", diff.tv_sec + 0.000001 * diff.tv_usec);
Sleep(500);
}
}
printf("\n");
Expand Down
Empty file modified dpcmd.h
100755 → 100644
Empty file.
Empty file modified parse.c
100755 → 100644
Empty file.
Empty file modified project.c
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion project.h
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void PrepareProgramParameters(int Index);
bool ValidateProgramParameters(int Index);
bool IdentifyChipBeforeOperation(int Index);

inline int Sleep(unsigned int mSec)
static inline int Sleep(unsigned int mSec)
{
return usleep(mSec * 1000);
}
Expand Down
Empty file modified usbdriver.c
100755 → 100644
Empty file.
Empty file modified usbdriver.h
100755 → 100644
Empty file.

0 comments on commit ff2db59

Please sign in to comment.