This is the mail archive of the
ecos-patches@sourceware.org
mailing list for the eCos project.
RedBoot: src/flash.c: fix the compiler warnings
- From: "Sergei Gavrikov" <sg at belvok dot com>
- To: ecos-patches at ecos dot sourceware dot org
- Date: Tue, 9 May 2006 22:59:30 +0300 (EEST)
- Subject: RedBoot: src/flash.c: fix the compiler warnings
- Reply-to: sg at belvok dot com
after last cvs checkout, I'd could not compile the redboot image. The
reason is just a typo.
Sergei Gavrikov
diff -urN ecos/packages/redboot/current/ChangeLog ecos.patched/packages/redboot/current/ChangeLog
--- ecos/packages/redboot/current/ChangeLog 2006-05-09 20:29:48.000000000 +0300
+++ ecos.patched/packages/redboot/current/ChangeLog 2006-05-09 21:32:40.000000000 +0300
@@ -1,3 +1,8 @@
+2006-05-09 Sergei Gavrikov <sg@belvok.com>
+
+ src/flash.c: (fis_start_update_directory): Fix a compiler warning;
+ (do_flash_init): same. (fis_update_directory): fix missed semicolon;
+
2006-04-19 Alexander Neundorf <alexander.neundorf@jenoptik.com>
* src/flash.c, src/main.c, src/fconfig.c:
* include/fis.h, include/redboot.h:
diff -urN ecos/packages/redboot/current/src/flash.c ecos.patched/packages/redboot/current/src/flash.c
--- ecos/packages/redboot/current/src/flash.c 2006-05-09 21:17:45.000000000 +0300
+++ ecos.patched/packages/redboot/current/src/flash.c 2006-05-09 21:18:56.000000000 +0300
@@ -247,6 +247,8 @@
int fis_start_update_directory(int autolock)
{
+#ifdef CYGOPT_REDBOOT_REDUNDANT_FIS
+
#ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL
// Ensure [quietly] that the directory is unlocked before trying to update and locked again afterwards
int do_autolock=1;
@@ -254,7 +256,6 @@
int do_autolock=autolock;
#endif
-#ifdef CYGOPT_REDBOOT_REDUNDANT_FIS
struct fis_image_desc* img=NULL;
void* err_addr=NULL;
void* tmp_fis_addr=NULL;
@@ -334,7 +335,7 @@
flash_lock((void *)fis_addr, fisdir_size, (void **)&err_addr);
#else // CYGOPT_REDBOOT_REDUNDANT_FIS
- int blk_size = fisdir_size
+ int blk_size = fisdir_size;
int stat;
fis_endian_fixup(fis_work_block);
@@ -1554,8 +1555,8 @@
{
int stat;
- void *err_addr;
#ifdef CYGOPT_REDBOOT_REDUNDANT_FIS
+ void *err_addr;
struct fis_image_desc img0;
struct fis_image_desc img1;
int fis_update_was_interrupted=0;