flash_v2: packages/redboot/current/src/flash.c comparison

comparison packages/redboot/current/src/flash.c @ 195:67850532eebb

Merge from eCos master repository on 2001-11-02-06:43:03-GMT

author	jlarmour
date	Fri, 02 Nov 2001 16:12:33 +0000
parents	678094f34118
children	9b55e9c69693

comparison

equal deleted inserted replaced

-:feb0fcf83327
+:67850532eebb
 //==========================================================================
 #include <redboot.h>
 #include <cyg/io/flash.h>
 #include <fis.h>
+#include <sib.h>
 // CLI function
 static cmd_fun do_fis;
 RedBoot_cmd("fis",
 "Manage FLASH images",
 #define MIN_REDBOOT_IMAGE_SIZE CYGBLD_REDBOOT_MIN_IMAGE_SIZE
 redboot_image_size = block_size > MIN_REDBOOT_IMAGE_SIZE ? block_size : MIN_REDBOOT_IMAGE_SIZE;
 // Create a pseudo image for RedBoot
 img = (struct fis_image_desc *)fis_work_block;
+memset(img, 0xFF, block_size);  // Start with erased data
 #ifdef CYGOPT_REDBOOT_FIS_RESERVED_BASE
 memset(img, 0, sizeof(*img));
 strcpy(img->name, "(reserved)");
 img->flash_base = (CYG_ADDRESS)flash_start;
 img->mem_base = (CYG_ADDRESS)flash_start;
 strcpy(img->name, "FIS directory");
 img->flash_base = (CYG_ADDRESS)fis_addr;
 img->mem_base = (CYG_ADDRESS)fis_addr;
 img->size = block_size;
 img++;
+#ifdef CYGOPT_REDBOOT_FIS_DIRECTORY_ARM_SIB_ID
+// FIS gets the size of a full block - note, this should be changed
+// if support is added for multi-block FIS structures.
+img = (struct fis_image_desc *)((CYG_ADDRESS)fis_work_block + block_size);
+// Add a footer so the FIS will be recognized by the ARM Boot
+// Monitor as a reserved area.
+{
+tFooter* footer_p = (tFooter*)((CYG_ADDRESS)img - sizeof(tFooter));
+cyg_uint32 check = 0;
+cyg_uint32 *check_ptr = (cyg_uint32 *)footer_p;
+cyg_int32 count = (sizeof(tFooter) - 4) >> 2;
+// Prepare footer. Try to protect all but the reserved space
+// and the first RedBoot image (which is expected to be
+// bootable), but fall back to just protecting the FIS if it's
+// not at the default position in the flash.
+#if defined(CYGOPT_REDBOOT_FIS_RESERVED_BASE) && (-1 == CYGNUM_REDBOOT_FIS_DIRECTORY_BLOCK)
+footer_p->blockBase = (char*)_ADDR_REDBOOT_TO_ARM(flash_start);
+footer_p->blockBase += CYGNUM_REDBOOT_FLASH_RESERVED_BASE + redboot_image_size;
+#else
+footer_p->blockBase = _ADDR_REDBOOT_TO_ARM(fis_work_block);
+#endif
+footer_p->infoBase = NULL;
+footer_p->signature = FLASH_FOOTER_SIGNATURE;
+footer_p->type = TYPE_REDHAT_REDBOOT;
+// and compute its checksum
+for ( ; count > 0; count--) {
+if (*check_ptr > ~check)
+check++;
+check += *check_ptr++;
+}
+footer_p->checksum = ~check;
+}
+#endif
 // Do this after creating the initialized table because that inherently
 // calculates where the high water mark of default RedBoot images is.
 if (full_init) {
 struct fis_image_desc *img;
 int i;
 bool show_cksums = false;
 bool show_datalen = false;
 struct option_info opts[2];
+#ifdef CYGHWR_REDBOOT_ARM_FLASH_SIB
+// FIXME: this is somewhat half-baked
+extern void arm_fis_list(void);
+arm_fis_list();
+return;
+#endif
 init_opts(&opts[0], 'd', false, OPTION_ARG_TYPE_FLG,
 (void **)&show_datalen, (bool *)0, "display data length");
 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK
 init_opts(&opts[1], 'c', false, OPTION_ARG_TYPE_FLG,
 flash_lock((void *)fis_addr, block_size, (void **)&err_addr);
 #endif
 }
 }
+extern void arm_fis_delete(char *);
 static void
 fis_delete(int argc, char *argv[])
 {
 char *name;
 int num_reserved, i, stat;
 if (!scan_opts(argc, argv, 2, 0, 0, (void **)&name, OPTION_ARG_TYPE_STR, "image name"))
 {
 fis_usage("invalid arguments");
 return;
 }
+#ifdef CYGHWR_REDBOOT_ARM_FLASH_SIB
+// FIXME: this is somewhat half-baked
+arm_fis_delete(name);
+return;
+#endif
 slot_found = false;
 img = (struct fis_image_desc *)fis_work_block;
 num_reserved = 0;
 #ifdef CYGOPT_REDBOOT_FIS_RESERVED_BASE
 num_reserved++;
 static void config_init(void);
 static int
 get_config(unsigned char *dp, char *title, int list_opt, char *newvalue )
 {
-char line[256], *sp, *lp;
+char line[256], hold_line[256], *sp, *lp;
 int ret;
 bool hold_bool_val, new_bool_val, enable;
 unsigned long hold_int_val, new_int_val;
 #ifdef CYGPKG_REDBOOT_NETWORKING
 in_addr_t hold_ip_val, new_ip_val;
 if (((bool)CONFIG_OBJECT_ENABLE_SENSE(dp) && !enable) ||
 (!(bool)CONFIG_OBJECT_ENABLE_SENSE(dp) && enable)) {
 return CONFIG_OK;  // Disabled field
 }
 }
+lp = line;  *lp = '\0';
 val_ptr = (void *)CONFIG_OBJECT_VALUE(dp);
 if (LIST_OPT_NICKNAMES & list_opt)
 diag_printf("%s: ", CONFIG_OBJECT_KEY(dp));
 if (LIST_OPT_FULLNAMES & list_opt) {
 if (title != (char *)NULL) {
 }
 }
 switch (type = CONFIG_OBJECT_TYPE(dp)) {
 case CONFIG_BOOL:
 memcpy(&hold_bool_val, val_ptr, sizeof(bool));
-diag_printf("%s ", hold_bool_val ? "true" : "false");
+lp += diag_sprintf(lp, "%s", hold_bool_val ? "true" : "false");
 break;
 case CONFIG_INT:
 memcpy(&hold_int_val, val_ptr, sizeof(unsigned long));
-diag_printf("%ld ", hold_int_val);
+lp += diag_sprintf(lp, "%ld", hold_int_val);
 break;
 #ifdef CYGPKG_REDBOOT_NETWORKING
 case CONFIG_IP:
-diag_printf("%s ", inet_ntoa((in_addr_t *)val_ptr));
+lp += diag_sprintf(lp, "%s", inet_ntoa((in_addr_t *)val_ptr));
 break;
 case CONFIG_ESA:
 for (esa_ptr = 0;  esa_ptr < sizeof(enet_addr_t);  esa_ptr++) {
-diag_printf("0x%02X", ((unsigned char *)val_ptr)[esa_ptr]);
+lp += diag_sprintf(lp, "0x%02X", ((unsigned char *)val_ptr)[esa_ptr]);
-if (esa_ptr < (sizeof(enet_addr_t)-1)) diag_printf(":");
+if (esa_ptr < (sizeof(enet_addr_t)-1)) lp += diag_sprintf(lp, ":");
 }
-diag_printf(" ");
 break;
 #endif
 case CONFIG_STRING:
-diag_printf("%s ", (unsigned char *)val_ptr);
+lp += diag_sprintf(lp, "%s", (unsigned char *)val_ptr);
 break;
 case CONFIG_SCRIPT:
 diag_printf("\n");
 sp = lp = (unsigned char *)val_ptr;
 while (*sp) {
 sp = lp;
 }
 break;
 }
 if (LIST_OPT_LIST_ONLY & list_opt) {
-diag_printf("\n");
+diag_printf("%s\n", line);
 return CONFIG_OK;
 }
 if (type != CONFIG_SCRIPT) {
 if (NULL != newvalue) {
 ret = strlen(newvalue);
 if (ret > sizeof(line))
 return CONFIG_BAD;
 strcpy(line, newvalue);
+strcpy(hold_line, newvalue);
 diag_printf("Setting to %s\n", newvalue);
-}
+} else {
-else // read from terminal
+// read from terminal
-ret = _rb_gets(line, sizeof(line), 0);
+strcpy(hold_line, line);
+ret = _rb_gets_preloaded(line, sizeof(line), 0);
+}
 if (ret < 0) return CONFIG_ABORT;
-if (strlen(line) == 0) return CONFIG_OK;  // Just a CR - leave value untouched
+if (strcmp(line, hold_line) == 0) return CONFIG_OK;  // Just a CR - leave value untouched
-if (line[0] == '.') return CONFIG_DONE;
+lp = &line[strlen(line)-1];
-if (line[0] == '^') return CONFIG_BACK;
+if (*lp == '.') return CONFIG_DONE;
+if (*lp == '^') return CONFIG_BACK;
 }
 switch (type) {
 case CONFIG_BOOL:
 memcpy(&hold_bool_val, val_ptr, sizeof(bool));
 if (!parse_bool(line, &new_bool_val)) {
 }
 // Expand aliases, this is recursive. ie if one alias contains other
 // aliases, these will also be expanded from the insertion point
 // onwards.
+//
+// If 'iter' is zero, then quoted strings are not expanded
+//
 bool
-_expand_aliases(char *line, int len)
+_expand_aliases(char *line, int len, int iter)
 {
 char *lp = line;
 char *ms, *me, *ep;
 char *alias;
 char c;
 }
 } else {
 diag_printf("Alias '%s' not defined\n", ms);
 *me = '|';
 }
-} else if (c == '"') {
+} else if ((c == '"') && (iter == 0)) {
 // Skip quoted strings
 while (*lp && (*lp != '"')) lp++;
 }
 }
 }
 }
 void
 expand_aliases(char *line, int len)
 {
-while (_expand_aliases(line, len)) ;
+int iter = 0;
+while (_expand_aliases(line, len, iter++)) {
+}
 }
 #endif //  CYGSEM_REDBOOT_FLASH_ALIASES
 //
 // Write the in-memory copy of the configuration data to the flash device.

Mercurial > flash_v2

comparison packages/redboot/current/src/flash.c @ 195:67850532eebb