change log for examples-v2 (2011-03-11)

rtems-vc at rtems.org rtems-vc at rtems.org
Fri Mar 11 18:10:03 UTC 2011


 *joel*:
2011-03-11	Joel Sherrill <joel.sherrill at oarcorp.com>

	* Makefile: Add new example of untar to load initial contents of IMFS.
	* crc/.cvsignore, crc/LICENSE, crc/Makefile, crc/README, crc/crc.h,
	crc/crc_32.c, crc/init.c, crc/sniptype.h, crc/rootfs/image.img: New
	files.

M    1.5  file_io/ChangeLog
M    1.2  file_io/Makefile
A    1.1  file_io/crc/.cvsignore
A    1.1  file_io/crc/LICENSE
A    1.1  file_io/crc/Makefile
A    1.1  file_io/crc/README
A    1.1  file_io/crc/crc.h
A    1.1  file_io/crc/crc_32.c
A    1.1  file_io/crc/init.c
A    1.1  file_io/crc/rootfs/image.img
A    1.1  file_io/crc/sniptype.h

diff -u examples-v2/file_io/ChangeLog:1.4 examples-v2/file_io/ChangeLog:1.5
--- examples-v2/file_io/ChangeLog:1.4	Mon Apr 12 15:06:56 2010
+++ examples-v2/file_io/ChangeLog	Fri Mar 11 11:35:58 2011
@@ -1,3 +1,10 @@
+2011-03-11	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	* Makefile: Add new example of untar to load initial contents of IMFS.
+	* crc/.cvsignore, crc/LICENSE, crc/Makefile, crc/README, crc/crc.h,
+	crc/crc_32.c, crc/init.c, crc/sniptype.h, crc/rootfs/image.img: New
+	files.
+
 2010-04-12	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	* fdopen/test.c: Add include of unistd.h for close().

diff -u examples-v2/file_io/Makefile:1.1 examples-v2/file_io/Makefile:1.2
--- examples-v2/file_io/Makefile:1.1	Thu Aug  6 16:25:41 2009
+++ examples-v2/file_io/Makefile	Fri Mar 11 11:35:58 2011
@@ -6,4 +6,4 @@
 include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUBDIRS = fdopen filerdback repeated_opens
+SUBDIRS = fdopen filerdback repeated_opens crc

diff -u /dev/null examples-v2/file_io/crc/.cvsignore:1.1
--- /dev/null	Fri Mar 11 12:10:03 2011
+++ examples-v2/file_io/crc/.cvsignore	Fri Mar 11 11:35:58 2011
@@ -0,0 +1,4 @@
+o-optimize
+FilesystemImage
+FilesystemImage.c
+FilesystemImage.h

diff -u /dev/null examples-v2/file_io/crc/LICENSE:1.1
--- /dev/null	Fri Mar 11 12:10:03 2011
+++ examples-v2/file_io/crc/LICENSE	Fri Mar 11 11:35:58 2011
@@ -0,0 +1,11 @@
+#
+#  $Id$
+#
+
+The CRC32 code is from http://www.snippets.org/.  This is the following files:
+
+crc_32.c
+crc.h
+sniptype.h
+
+This code is FREE with no restrictions.

diff -u /dev/null examples-v2/file_io/crc/Makefile:1.1
--- /dev/null	Fri Mar 11 12:10:03 2011
+++ examples-v2/file_io/crc/Makefile	Fri Mar 11 11:35:59 2011
@@ -0,0 +1,41 @@
+#
+#  $Id$
+#
+
+#
+#  RTEMS_MAKEFILE_PATH is typically set in an environment variable
+#
+
+PGM=${ARCH}/crc.exe
+
+# optional managers required
+MANAGERS=all
+
+# C source names
+CSRCS = crc_32.c init.c FilesystemImage.c
+COBJS = $(CSRCS:%.c=${ARCH}/%.o)
+
+CLEAN_ADDITIONS += stamp-fs-image
+CLEAN_ADDITIONS += FilesystemImage FilesystemImage.c FilesystemImage.h
+
+include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
+include $(RTEMS_CUSTOM)
+include $(PROJECT_ROOT)/make/leaf.cfg
+
+OBJS= $(COBJS) $(CXXOBJS) $(ASOBJS)
+
+all:    ${ARCH} $(OBJS) $(PGM)
+
+$(ARCH)/init.o: init.c stamp-fs-image
+
+FilesystemImage: $(ARCH) rootfs/image.img
+	cd rootfs ; \
+	    tar cf ../FilesystemImage --exclude CVS --exclude .cvsignore .
+
+stamp-fs-image: $(ARCH) FilesystemImage
+	$(PROJECT_ROOT)/bin/rtems-bin2c FilesystemImage FilesystemImage
+	ls -l Filesystem*
+	touch stamp-fs-image
+
+$(PGM): $(OBJS)
+	$(make-exe)

diff -u /dev/null examples-v2/file_io/crc/README:1.1
--- /dev/null	Fri Mar 11 12:10:03 2011
+++ examples-v2/file_io/crc/README	Fri Mar 11 11:35:59 2011
@@ -0,0 +1,9 @@
+#
+#  $Id$
+#
+
+This is a simple example which illustrates how to use the
+In-Memory File System (IMFS) in conjunction with "untar" to
+load the initial contents.
+
+Thanks to Gedare Bloom for the code this is based upon.

diff -u /dev/null examples-v2/file_io/crc/crc.h:1.1
--- /dev/null	Fri Mar 11 12:10:03 2011
+++ examples-v2/file_io/crc/crc.h	Fri Mar 11 11:35:59 2011
@@ -0,0 +1,57 @@
+/* +++Date last modified: 05-Jul-1997 */
+
+/*
+**  CRC.H - header file for SNIPPETS CRC and checksum functions
+*/
+
+#ifndef CRC__H
+#define CRC__H
+
+#include <stdlib.h>           /* For size_t                 */
+#include "sniptype.h"         /* For BYTE, WORD, DWORD      */
+
+/*
+**  File: ARCCRC16.C
+*/
+
+void init_crc_table(void);
+WORD crc_calc(WORD crc, char *buf, unsigned nbytes);
+void do_file(char *fn);
+
+/*
+**  File: CRC-16.C
+*/
+
+WORD crc16(char *data_p, WORD length);
+
+/*
+**  File: CRC-16F.C
+*/
+
+WORD updcrc(WORD icrc, BYTE *icp, size_t icnt);
+
+/*
+**  File: CRC_32.C
+*/
+
+#define UPDC32(octet,crc) (crc_32_tab[((crc)^((BYTE)octet)) & 0xff] ^ ((crc) >> 8))
+
+DWORD updateCRC32(unsigned char ch, DWORD crc);
+Boolean_T crc32file(char *name, DWORD *crc, long *charcnt);
+DWORD crc32buf(char *buf, size_t len);
+
+/*
+**  File: CHECKSUM.C
+*/
+
+unsigned checksum(void *buffer, size_t len, unsigned int seed);
+
+/*
+**  File: CHECKEXE.C
+*/
+
+void checkexe(char *fname);
+
+
+
+#endif /* CRC__H */

diff -u /dev/null examples-v2/file_io/crc/crc_32.c:1.1
--- /dev/null	Fri Mar 11 12:10:03 2011
+++ examples-v2/file_io/crc/crc_32.c	Fri Mar 11 11:35:59 2011
@@ -0,0 +1,173 @@
+/* +++Date last modified: 05-Jul-1997 */
+
+/* Crc - 32 BIT ANSI X3.66 CRC checksum files */
+
+#include <stdio.h>
+#include "crc.h"
+
+#ifdef __TURBOC__
+ #pragma warn -cln
+#endif
+
+/**********************************************************************\
+|* Demonstration program to compute the 32-bit CRC used as the frame  *|
+|* check sequence in ADCCP (ANSI X3.66, also known as FIPS PUB 71     *|
+|* and FED-STD-1003, the U.S. versions of CCITT's X.25 link-level     *|
+|* protocol).  The 32-bit FCS was added via the Federal Register,     *|
+|* 1 June 1982, p.23798.  I presume but don't know for certain that   *|
+|* this polynomial is or will be included in CCITT V.41, which        *|
+|* defines the 16-bit CRC (often called CRC-CCITT) polynomial.  FIPS  *|
+|* PUB 78 says that the 32-bit FCS reduces otherwise undetected       *|
+|* errors by a factor of 10^-5 over 16-bit FCS.                       *|
+\**********************************************************************/
+
+/* Need an unsigned type capable of holding 32 bits; */
+
+typedef DWORD UNS_32_BITS;
+
+/* Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+   code or tables extracted from it, as desired without restriction.*/
+
+/* First, the polynomial itself and its table of feedback terms.  The  */
+/* polynomial is                                                       */
+/* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */
+/* Note that we take it "backwards" and put the highest-order term in  */
+/* the lowest-order bit.  The X^32 term is "implied"; the LSB is the   */
+/* X^31 term, etc.  The X^0 term (usually shown as "+1") results in    */
+/* the MSB being 1.                                                    */
+
+/* Note that the usual hardware shift register implementation, which   */
+/* is what we're using (we're merely optimizing it by doing eight-bit  */
+/* chunks at a time) shifts bits into the lowest-order term.  In our   */
+/* implementation, that means shifting towards the right.  Why do we   */
+/* do it this way?  Because the calculated CRC must be transmitted in  */
+/* order from highest-order term to lowest-order term.  UARTs transmit */
+/* characters in order from LSB to MSB.  By storing the CRC this way,  */
+/* we hand it to the UART in the order low-byte to high-byte; the UART */
+/* sends each low-bit to hight-bit; and the result is transmission bit */
+/* by bit from highest- to lowest-order term without requiring any bit */
+/* shuffling on our part.  Reception works similarly.                  */
+
+/* The feedback terms table consists of 256, 32-bit entries.  Notes:   */
+/*                                                                     */
+/*  1. The table can be generated at runtime if desired; code to do so */
+/*     is shown later.  It might not be obvious, but the feedback      */
+/*     terms simply represent the results of eight shift/xor opera-    */
+/*     tions for all combinations of data and CRC register values.     */
+/*                                                                     */
+/*  2. The CRC accumulation logic is the same for all CRC polynomials, */
+/*     be they sixteen or thirty-two bits wide.  You simply choose the */
+/*     appropriate table.  Alternatively, because the table can be     */
+/*     generated at runtime, you can start by generating the table for */
+/*     the polynomial in question and use exactly the same "updcrc",   */
+/*     if your application needn't simultaneously handle two CRC       */
+/*     polynomials.  (Note, however, that XMODEM is strange.)          */
+/*                                                                     */
+/*  3. For 16-bit CRCs, the table entries need be only 16 bits wide;   */
+/*     of course, 32-bit entries work OK if the high 16 bits are zero. */
+/*                                                                     */
+/*  4. The values must be right-shifted by eight bits by the "updcrc"  */
+/*     logic; the shift must be unsigned (bring in zeroes).  On some   */
+/*     hardware you could probably optimize the shift in assembler by  */
+/*     using byte-swap instructions.                                   */
+
+static UNS_32_BITS crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
+0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+DWORD updateCRC32(unsigned char ch, DWORD crc)
+{
+      return UPDC32(ch, crc);
+}
+
+Boolean_T crc32file(char *name, DWORD *crc, long *charcnt)
+{
+      register FILE *fin;
+      register DWORD oldcrc32;
+      register int c;
+
+      oldcrc32 = 0xFFFFFFFF; *charcnt = 0;
+#ifdef MSDOS
+      if ((fin=fopen(name, "rb"))==NULL)
+#else
+      if ((fin=fopen(name, "r"))==NULL)
+#endif
+      {
+            perror(name);
+            return Error_;
+      }
+      while ((c=getc(fin))!=EOF)
+      {
+            ++*charcnt;
+            oldcrc32 = UPDC32(c, oldcrc32);
+      }
+
+      if (ferror(fin))
+      {
+            perror(name);
+            *charcnt = -1;
+      }
+      fclose(fin);
+
+      *crc = oldcrc32 = ~oldcrc32;
+      return Success_;
+}
+
+DWORD crc32buf(char *buf, size_t len)
+{
+      register DWORD oldcrc32;
+
+      oldcrc32 = 0xFFFFFFFF;
+
+      for ( ; len; --len, ++buf)
+      {
+            oldcrc32 = UPDC32(*buf, oldcrc32);
+      }
+
+      return ~oldcrc32;
+      
+}
+
+

diff -u /dev/null examples-v2/file_io/crc/init.c:1.1
--- /dev/null	Fri Mar 11 12:10:03 2011
+++ examples-v2/file_io/crc/init.c	Fri Mar 11 11:35:59 2011
@@ -0,0 +1,69 @@
+/*
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+
+
+#include <rtems.h>
+#include <bsp.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "FilesystemImage.h"
+#include <rtems/untar.h>
+
+/* sha-specific includes */
+#include <string.h>
+#include <time.h>
+#include "crc.h"
+#include <errno.h>
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  char in_file[20] = "/image.img";
+  DWORD crc;
+  long charcnt;
+
+  puts( "\n\n*** untar/imfs/crc example ***" );
+
+  printf("Unpacking tar filesystem\nThis may take awhile...\n");
+  if(Untar_FromMemory(FilesystemImage, FilesystemImage_size) != 0) {
+    printf("Can't unpack tar filesystem\n");
+    exit(1);
+  }
+	
+  crc32file(in_file,&crc, &charcnt);
+  printf("%08lX %7ld %s\n", crc, charcnt, in_file);
+
+  printf( "*** end of demonstration ***\n" );
+  exit( 0 );
+}
+
+/* configuration */
+/* drivers */
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+/* filesystem */
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
+#define CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK 512
+
+/* tasks */
+#define CONFIGURE_MAXIMUM_TASKS             4
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_EXTRA_TASK_STACKS         (3 * RTEMS_MINIMUM_STACK_SIZE)
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+/* end of file */

*** DIFF FAILED:  ***
diff -u /dev/null examples-v2/file_io/crc/sniptype.h:1.1
--- /dev/null	Fri Mar 11 12:10:03 2011
+++ examples-v2/file_io/crc/sniptype.h	Fri Mar 11 11:35:59 2011
@@ -0,0 +1,37 @@
+/* +++Date last modified: 05-Jul-1997 */
+
+/*
+**  SNIPTYPE.H - Include file for SNIPPETS data types and commonly used macros
+*/
+
+#ifndef SNIPTYPE__H
+#define SNIPTYPE__H
+
+#include <stdlib.h>                             /* For free()           */
+#include <string.h>                             /* For NULL & strlen()  */
+
+typedef enum {Error_ = -1, Success_, False_ = 0, True_} Boolean_T;
+
+/*#if !defined(WIN32) && !defined(_WIN32) && !defined(__NT__) \
+      && !defined(_WINDOWS)
+      #if !defined(OS2)*/
+  typedef unsigned char  BYTE;
+  typedef unsigned long  DWORD;
+/* #endif*/
+ typedef unsigned short WORD;
+/*#else
+ #define WIN32_LEAN_AND_MEAN
+ #define NOGDI
+ #define NOSERVICE
+ #undef INC_OLE1
+ #undef INC_OLE2
+ #include <windows.h>
+ #define HUGE
+ #endif*/
+
+#define NUL '\0'
+#define LAST_CHAR(s) (((char *)s)[strlen(s) - 1])
+#define TOBOOL(x) (!(!(x)))
+#define FREE(p) (free(p),(p)=NULL)
+
+#endif /* SNIPTYPE__H */



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110311/8cc65675/attachment.html>


More information about the vc mailing list