aboutsummaryrefslogtreecommitdiff
path: root/firmware.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware.c')
-rw-r--r--firmware.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/firmware.c b/firmware.c
index cbe72a3..46fa477 100644
--- a/firmware.c
+++ b/firmware.c
@@ -19,20 +19,20 @@
* USA
*/
-#include <stdio.h>
#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
#include <string.h>
-#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
-#include <fcntl.h>
#include "error.h"
-#include "lowlevel.h"
-#include "samba.h"
-#include "flash.h"
#include "firmware.h"
+#include "flash.h"
#include "flash_routine.h"
+#include "lowlevel.h"
+#include "samba.h"
static nxt_error_t
nxt_flash_prepare(nxt_t *nxt)
@@ -49,7 +49,6 @@ nxt_flash_prepare(nxt_t *nxt)
return NXT_OK;
}
-
static nxt_error_t
nxt_flash_block(nxt_t *nxt, nxt_word_t block_num, char *buf)
{
@@ -65,14 +64,12 @@ nxt_flash_block(nxt_t *nxt, nxt_word_t block_num, char *buf)
return NXT_OK;
}
-
static nxt_error_t
nxt_flash_finish(nxt_t *nxt)
{
return nxt_flash_wait_ready(nxt);
}
-
static nxt_error_t
nxt_firmware_validate_fd(int fd)
{
@@ -81,13 +78,12 @@ nxt_firmware_validate_fd(int fd)
if (fstat(fd, &s) < 0)
return NXT_FILE_ERROR;
- if (s.st_size > 256*1024)
+ if (s.st_size > 256 * 1024)
return NXT_INVALID_FIRMWARE;
return NXT_OK;
}
-
nxt_error_t
nxt_firmware_validate(char *fw_path)
{
@@ -104,7 +100,6 @@ nxt_firmware_validate(char *fw_path)
return err;
}
-
nxt_error_t
nxt_firmware_flash(nxt_t *nxt, char *fw_path)
{
@@ -123,7 +118,7 @@ nxt_firmware_flash(nxt_t *nxt, char *fw_path)
NXT_ERR(nxt_flash_prepare(nxt));
- for (i = 0; i < 1024; i++) //256*1024; i += 256)
+ for (i = 0; i < 1024; i++)
{
char buf[256];
int ret;