This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Redboot using CRC package
- From: Andrew Lunn <andrew dot lunn at ascom dot ch>
- To: eCos Patches <ecos-patches at sources dot redhat dot com>
- Date: Fri, 9 Aug 2002 17:54:42 +0200
- Subject: Redboot using CRC package
Here are the changes needed for RedBoot to use the CRC package.
Andrew
Index: redboot/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.68
diff -u -r1.68 ChangeLog
--- redboot/current/ChangeLog 9 Aug 2002 13:20:32 -0000 1.68
+++ redboot/current/ChangeLog 9 Aug 2002 15:49:44 -0000
@@ -1,3 +1,12 @@
+2002-08-09 Andrew Lunn <andrew.lunn@ascom.ch>
+
+ * src/crc.c: Removed. Replaced with the CRC package.
+ * src/cksum.c: Removed the posix_crc function.
+ * src/flash.c: Use the crc package crc functions.
+ * src/xyzModem.c: Ditto
+ * include/redboot.h: Use the crc package include file.
+ * cdl/redboot.cdl: removed crc.c
+
2002-08-09 Jani Monoses <jani@iv.ro>
* src/net/http_client.c: use standard HTTP GET request ('/'
Index: redboot/current/cdl/redboot.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/cdl/redboot.cdl,v
retrieving revision 1.40
diff -u -r1.40 redboot.cdl
--- redboot/current/cdl/redboot.cdl 6 Aug 2002 14:29:12 -0000 1.40
+++ redboot/current/cdl/redboot.cdl 9 Aug 2002 15:49:44 -0000
@@ -186,7 +186,7 @@
stripping before being converted to a binary image.
This is handled by a rule in the target CDL."
- compile main.c crc.c
+ compile main.c
compile misc_funs.c io.c parse.c ticks.c syscall.c alias.c
compile -library=libextras.a load.c
Index: redboot/current/include/redboot.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/include/redboot.h,v
retrieving revision 1.25
diff -u -r1.25 redboot.h
--- redboot/current/include/redboot.h 18 Jul 2002 20:05:22 -0000 1.25
+++ redboot/current/include/redboot.h 9 Aug 2002 15:49:44 -0000
@@ -61,6 +61,7 @@
#include <cyg/hal/hal_if.h>
#include <cyg/hal/hal_tables.h>
#include <cyg/infra/diag.h>
+#include <cyg/crc/crc.h>
#include <string.h>
#ifdef CYGPKG_REDBOOT_NETWORKING
@@ -138,10 +139,6 @@
// "console" selection
externC int start_console(void);
externC void end_console(int old_console);
-
-// CRC support
-unsigned short crc16(unsigned char *buf, int len);
-unsigned long crc32(unsigned char *buf, int len);
// Alias functions
#ifdef CYGSEM_REDBOOT_FLASH_ALIASES
Index: redboot/current/src/cksum.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/cksum.c,v
retrieving revision 1.1
diff -u -r1.1 cksum.c
--- redboot/current/src/cksum.c 6 Aug 2002 14:29:12 -0000 1.1
+++ redboot/current/src/cksum.c 9 Aug 2002 15:49:44 -0000
@@ -63,65 +63,6 @@
do_cksum
);
-// Same basic algorithm as CRC-16, but the bits are defined in the
-// opposite order. This computation matches the output of the
-// Linux 'cksum' program.
-
-static const unsigned long posix_crc32_tab[] = {
- 0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B, 0x1A864DB2, 0x1E475005,
- 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61, 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD,
- 0x4C11DB70, 0x48D0C6C7, 0x4593E01E, 0x4152FDA9, 0x5F15ADAC, 0x5BD4B01B, 0x569796C2, 0x52568B75,
- 0x6A1936C8, 0x6ED82B7F, 0x639B0DA6, 0x675A1011, 0x791D4014, 0x7DDC5DA3, 0x709F7B7A, 0x745E66CD,
- 0x9823B6E0, 0x9CE2AB57, 0x91A18D8E, 0x95609039, 0x8B27C03C, 0x8FE6DD8B, 0x82A5FB52, 0x8664E6E5,
- 0xBE2B5B58, 0xBAEA46EF, 0xB7A96036, 0xB3687D81, 0xAD2F2D84, 0xA9EE3033, 0xA4AD16EA, 0xA06C0B5D,
- 0xD4326D90, 0xD0F37027, 0xDDB056FE, 0xD9714B49, 0xC7361B4C, 0xC3F706FB, 0xCEB42022, 0xCA753D95,
- 0xF23A8028, 0xF6FB9D9F, 0xFBB8BB46, 0xFF79A6F1, 0xE13EF6F4, 0xE5FFEB43, 0xE8BCCD9A, 0xEC7DD02D,
- 0x34867077, 0x30476DC0, 0x3D044B19, 0x39C556AE, 0x278206AB, 0x23431B1C, 0x2E003DC5, 0x2AC12072,
- 0x128E9DCF, 0x164F8078, 0x1B0CA6A1, 0x1FCDBB16, 0x018AEB13, 0x054BF6A4, 0x0808D07D, 0x0CC9CDCA,
- 0x7897AB07, 0x7C56B6B0, 0x71159069, 0x75D48DDE, 0x6B93DDDB, 0x6F52C06C, 0x6211E6B5, 0x66D0FB02,
- 0x5E9F46BF, 0x5A5E5B08, 0x571D7DD1, 0x53DC6066, 0x4D9B3063, 0x495A2DD4, 0x44190B0D, 0x40D816BA,
- 0xACA5C697, 0xA864DB20, 0xA527FDF9, 0xA1E6E04E, 0xBFA1B04B, 0xBB60ADFC, 0xB6238B25, 0xB2E29692,
- 0x8AAD2B2F, 0x8E6C3698, 0x832F1041, 0x87EE0DF6, 0x99A95DF3, 0x9D684044, 0x902B669D, 0x94EA7B2A,
- 0xE0B41DE7, 0xE4750050, 0xE9362689, 0xEDF73B3E, 0xF3B06B3B, 0xF771768C, 0xFA325055, 0xFEF34DE2,
- 0xC6BCF05F, 0xC27DEDE8, 0xCF3ECB31, 0xCBFFD686, 0xD5B88683, 0xD1799B34, 0xDC3ABDED, 0xD8FBA05A,
- 0x690CE0EE, 0x6DCDFD59, 0x608EDB80, 0x644FC637, 0x7A089632, 0x7EC98B85, 0x738AAD5C, 0x774BB0EB,
- 0x4F040D56, 0x4BC510E1, 0x46863638, 0x42472B8F, 0x5C007B8A, 0x58C1663D, 0x558240E4, 0x51435D53,
- 0x251D3B9E, 0x21DC2629, 0x2C9F00F0, 0x285E1D47, 0x36194D42, 0x32D850F5, 0x3F9B762C, 0x3B5A6B9B,
- 0x0315D626, 0x07D4CB91, 0x0A97ED48, 0x0E56F0FF, 0x1011A0FA, 0x14D0BD4D, 0x19939B94, 0x1D528623,
- 0xF12F560E, 0xF5EE4BB9, 0xF8AD6D60, 0xFC6C70D7, 0xE22B20D2, 0xE6EA3D65, 0xEBA91BBC, 0xEF68060B,
- 0xD727BBB6, 0xD3E6A601, 0xDEA580D8, 0xDA649D6F, 0xC423CD6A, 0xC0E2D0DD, 0xCDA1F604, 0xC960EBB3,
- 0xBD3E8D7E, 0xB9FF90C9, 0xB4BCB610, 0xB07DABA7, 0xAE3AFBA2, 0xAAFBE615, 0xA7B8C0CC, 0xA379DD7B,
- 0x9B3660C6, 0x9FF77D71, 0x92B45BA8, 0x9675461F, 0x8832161A, 0x8CF30BAD, 0x81B02D74, 0x857130C3,
- 0x5D8A9099, 0x594B8D2E, 0x5408ABF7, 0x50C9B640, 0x4E8EE645, 0x4A4FFBF2, 0x470CDD2B, 0x43CDC09C,
- 0x7B827D21, 0x7F436096, 0x7200464F, 0x76C15BF8, 0x68860BFD, 0x6C47164A, 0x61043093, 0x65C52D24,
- 0x119B4BE9, 0x155A565E, 0x18197087, 0x1CD86D30, 0x029F3D35, 0x065E2082, 0x0B1D065B, 0x0FDC1BEC,
- 0x3793A651, 0x3352BBE6, 0x3E119D3F, 0x3AD08088, 0x2497D08D, 0x2056CD3A, 0x2D15EBE3, 0x29D4F654,
- 0xC5A92679, 0xC1683BCE, 0xCC2B1D17, 0xC8EA00A0, 0xD6AD50A5, 0xD26C4D12, 0xDF2F6BCB, 0xDBEE767C,
- 0xE3A1CBC1, 0xE760D676, 0xEA23F0AF, 0xEEE2ED18, 0xF0A5BD1D, 0xF464A0AA, 0xF9278673, 0xFDE69BC4,
- 0x89B8FD09, 0x8D79E0BE, 0x803AC667, 0x84FBDBD0, 0x9ABC8BD5, 0x9E7D9662, 0x933EB0BB, 0x97FFAD0C,
- 0xAFB010B1, 0xAB710D06, 0xA6322BDF, 0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4
- };
-
-static unsigned long
-posix_crc32(unsigned char *s, int len)
-{
- int i;
- unsigned long crc32val;
- unsigned long length;
-
- crc32val = 0;
- for (i = 0; i < len; i++) {
- crc32val = (crc32val << 8) ^ posix_crc32_tab[((crc32val >> 24) ^ *s++) & 0xFF];
- }
- length = len;
- while (length > 0) {
- crc32val = (crc32val << 8) ^ posix_crc32_tab[((crc32val >> 24) ^ length) & 0xFF];
- length >>= 8;
- }
- crc32val = ~crc32val;
- return crc32val;
-}
-
void
do_cksum(int argc, char *argv[])
{
@@ -149,7 +90,7 @@
return;
}
}
- crc = posix_crc32((unsigned char *)base, len);
+ crc = cyg_posix_crc32((unsigned char *)base, len);
diag_printf("POSIX cksum = %lu %lu (0x%08lx 0x%08lx)\n", crc, len, crc, len);
}
Index: redboot/current/src/flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/flash.c,v
retrieving revision 1.38
diff -u -r1.38 flash.c
--- redboot/current/src/flash.c 9 Aug 2002 13:20:33 -0000 1.38
+++ redboot/current/src/flash.c 9 Aug 2002 15:49:45 -0000
@@ -773,7 +773,7 @@
img->size = length;
img->data_length = img_size;
#ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK
- img->file_cksum = crc32((unsigned char *)flash_addr, img_size);
+ img->file_cksum = cyg_crc32((unsigned char *)flash_addr, img_size);
#endif
fis_update_directory();
}
@@ -927,7 +927,7 @@
entry_address = (unsigned long)img->entry_point;
#ifdef CYGPKG_REDBOOT_FIS_CRC_CHECK
- cksum = crc32((unsigned char *)mem_addr, img->data_length);
+ cksum = cyg_crc32((unsigned char *)mem_addr, img->data_length);
if (show_cksum) {
diag_printf("Checksum: 0x%08lx\n", cksum);
}
@@ -1804,7 +1804,7 @@
config->len = sizeof(struct _config);
config->key1 = CONFIG_KEY1;
config->key2 = CONFIG_KEY2;
- config->cksum = crc32((unsigned char *)config, sizeof(struct _config)-sizeof(config->cksum));
+ config->cksum = cyg_crc32((unsigned char *)config, sizeof(struct _config)-sizeof(config->cksum));
if (verify_action("Update RedBoot non-volatile configuration")) {
#ifdef CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG
memcpy(fis_work_block, fis_addr, fisdir_size);
@@ -1904,13 +1904,13 @@
// Check to see if the config data is valid, if not, revert to
// readonly mode, by setting config to readonly_config. We
// will set it back before we leave this function.
- if ( (config != readonly_config) && ((crc32((unsigned char *)config,
+ if ( (config != readonly_config) && ((cyg_crc32((unsigned char *)config,
sizeof(struct _config)-sizeof(config->cksum)) != config->cksum) ||
(config->key1 != CONFIG_KEY1)|| (config->key2 != CONFIG_KEY2))) {
save_config = config;
config = readonly_config;
- if ((crc32((unsigned char *)config,
- sizeof(struct _config)-sizeof(config->cksum)) != config->cksum) ||
+ if ((cyg_crc32((unsigned char *)config,
+ sizeof(struct _config)-sizeof(config->cksum)) != config->cksum) ||
(config->key1 != CONFIG_KEY1)|| (config->key2 != CONFIG_KEY2)) {
diag_printf("FLASH configuration checksum error or invalid key\n");
config = save_config;
@@ -2079,8 +2079,8 @@
readonly_config = cfg_base;
#endif
memcpy(config, cfg_base, sizeof(struct _config));
- if ((crc32((unsigned char *)config,
- sizeof(struct _config)-sizeof(config->cksum)) != config->cksum) ||
+ if ((cyg_crc32((unsigned char *)config,
+ sizeof(struct _config)-sizeof(config->cksum)) != config->cksum) ||
(config->key1 != CONFIG_KEY1)|| (config->key2 != CONFIG_KEY2)) {
diag_printf("FLASH configuration checksum error or invalid key\n");
config_init();
Index: redboot/current/src/xyzModem.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/xyzModem.c,v
retrieving revision 1.16
diff -u -r1.16 xyzModem.c
--- redboot/current/src/xyzModem.c 18 Jul 2002 20:05:23 -0000 1.16
+++ redboot/current/src/xyzModem.c 9 Aug 2002 15:49:45 -0000
@@ -296,7 +296,7 @@
}
// Verify checksum/CRC
if (xyz.crc_mode) {
- cksum = crc16(xyz.pkt, xyz.len);
+ cksum = cyg_crc16(xyz.pkt, xyz.len);
if (cksum != ((xyz.crc1 << 8) | xyz.crc2)) {
ZM_DEBUG(zm_dprintf("CRC error - recvd: %02x%02x, computed: %x\n",
xyz.crc1, xyz.crc2, cksum & 0xFFFF));
Index: templates/all/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/templates/all/ChangeLog,v
retrieving revision 1.12
diff -u -r1.12 ChangeLog
--- templates/all/ChangeLog 23 May 2002 23:08:47 -0000 1.12
+++ templates/all/ChangeLog 9 Aug 2002 15:49:45 -0000
@@ -1,3 +1,7 @@
+2002-08-09 Andrew Lunn <andrew.lunn@ascom.ch>
+
+ * current.ect: Added CYGPKG_CRC
+
2002-01-29 Jesper Skov <jskov@redhat.com>
* current.ect: Added CYGPKG_NET_OPENBSD_STACK.
Index: templates/all/current.ect
===================================================================
RCS file: /cvs/ecos/ecos/packages/templates/all/current.ect,v
retrieving revision 1.10
diff -u -r1.10 current.ect
--- templates/all/current.ect 20 May 2002 22:25:53 -0000 1.10
+++ templates/all/current.ect 9 Aug 2002 15:49:45 -0000
@@ -36,6 +36,7 @@
package CYGPKG_NET_OPENBSD_STACK current ;
package CYGPKG_NS_DNS current ;
package CYGPKG_IO_ETH_DRIVERS current ;
+ package CYGPKG_CRC current ;
};
cdl_option CYGBLD_ISO_CTYPE_HEADER {
Index: templates/redboot/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/templates/redboot/ChangeLog,v
retrieving revision 1.9
diff -u -r1.9 ChangeLog
--- templates/redboot/ChangeLog 23 May 2002 23:08:48 -0000 1.9
+++ templates/redboot/ChangeLog 9 Aug 2002 15:49:45 -0000
@@ -1,3 +1,7 @@
+2002-08-09 Andrew Lunn <andrew.lunn@ascom.ch>
+
+ * current.ect: Added CYGPKG_CRC
+
2001-11-27 Jonathan Larmour <jlarmour@redhat.com>
current.ect: Provide default for CYGBLD_ISO_STRING_BSD_FUNCS_HEADER
Index: templates/redboot/current.ect
===================================================================
RCS file: /cvs/ecos/ecos/packages/templates/redboot/current.ect,v
retrieving revision 1.8
diff -u -r1.8 current.ect
--- templates/redboot/current.ect 20 May 2002 22:25:56 -0000 1.8
+++ templates/redboot/current.ect 9 Aug 2002 15:49:45 -0000
@@ -16,6 +16,7 @@
package CYGPKG_ISOINFRA current ;
package CYGPKG_LIBC_STRING current ;
package CYGPKG_NS_DNS current ;
+ package CYGPKG_CRC current ;
};
cdl_option CYGBLD_BUILD_REDBOOT {