More en masse cleanup (whitespace/newlines/headers/etc)

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 40c38439fc9f2454d1da428bc1bd973e33f0fb6c..b4e4c8918b21e82df6ad8638ff005ae4f685f21d 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -3,18 +3,17 @@
 #include <setupapi.h>
 #define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
 BOOL UsbConnect(void);
 #include <setupapi.h>
 #define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
 BOOL UsbConnect(void);

-#else
-#include <proxusb.h>

 #endif
 #endif

+#include <proxusb.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

+#include <stdlib.h>

 #include "flash.h"
 #include "elf.h"
 
 static uint32_t ExpectedAddr;
 static uint8_t QueuedToSend[256];
 #include "flash.h"
 #include "elf.h"
 
 static uint32_t ExpectedAddr;
 static uint8_t QueuedToSend[256];

-static bool AllWritten;

 #define PHYSICAL_FLASH_START 0x100000
 #define PHYSICAL_FLASH_END   0x200000
 
 #define PHYSICAL_FLASH_START 0x100000
 #define PHYSICAL_FLASH_END   0x200000
 


@@ -63,8 +62,6 @@ void WriteBlock(unsigned int block_start, unsigned int len, unsigned char *buf)
   memcpy(c.d.asBytes, temp_buf+240, 16);
   SendCommand(&c);
   WaitForAck();
   memcpy(c.d.asBytes, temp_buf+240, 16);
   SendCommand(&c);
   WaitForAck();

-
-  AllWritten = true;

 }
 
 void LoadFlashFromFile(const char *file, int start_addr, int end_addr)
 }
 
 void LoadFlashFromFile(const char *file, int start_addr, int end_addr)