-1

bootloader/fat32format.c

··· 44 44 #include "storage.h" 45 45 #include "button.h" 46 46 #include "disk.h" 47 47 - #include "crc32-mi4.h" 48 47 #include <string.h> 49 48 #include "i2c.h" 50 49 #include "backlight-target.h"

+2 -2

bootloader/main-e200r-installer.c

··· 35 35 #include "file.h" 36 36 #include "button.h" 37 37 #include "disk.h" 38 38 - #include "crc32-mi4.h" 38 38 + #include "crc32.h" 39 39 #include <string.h> 40 40 #include "i2c.h" 41 41 #include "backlight-target.h" ··· 138 138 139 139 storage_read_sectors(pinfo.start + START_SECTOR_OF_ROM + ROMSECTOR_TO_HACK, 140 140 1 , sector); 141 141 - crc32 = chksum_crc32 (sector, 512); 141 141 + crc32 = crc_32r (sector, 512, 0); 142 142 143 143 #if 0 /* not needed in release builds */ 144 144 printf("--- Hack Status ---");

+2 -2

bootloader/main-pp.c

··· 37 37 #include "adc.h" 38 38 #include "button.h" 39 39 #include "disk.h" 40 40 - #include "crc32-mi4.h" 40 40 + #include "crc32.h" 41 41 #include "mi4-loader.h" 42 42 #include "loader_strerror.h" 43 43 #include <string.h> ··· 169 169 (mi4header.mi4size-MI4_HEADER_SIZE)/512, buf); 170 170 171 171 /* Check CRC32 to see if we have a valid file */ 172 172 - sum = chksum_crc32 (buf,mi4header.mi4size-MI4_HEADER_SIZE); 172 172 + sum = crc_32r (buf,mi4header.mi4size-MI4_HEADER_SIZE,0); 173 173 174 174 printf("Calculated CRC32: %x", sum); 175 175

-3

firmware/SOURCES

··· 242 242 #ifdef MODEL_NUMBER 243 243 common/loader_strerror.c 244 244 #endif 245 245 - #ifdef MI4_FORMAT 246 246 - common/crc32-mi4.c 247 247 - #endif 248 245 #ifdef RKW_FORMAT 249 246 common/crc32-rkw.c 250 247 #endif

-110

firmware/common/crc32-mi4.c

··· 1 1 - /*************************************************************************** 2 2 - * __________ __ ___. 3 3 - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ 4 4 - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / 5 5 - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < 6 6 - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ 7 7 - * \/ \/ \/ \/ \/ 8 8 - * $Id: crc32.c 10464 2006-08-05 20:19:10Z miipekk $ 9 9 - * 10 10 - * Copyright (C) 2007 Barry Wardell 11 11 - * 12 12 - * This program is free software; you can redistribute it and/or 13 13 - * modify it under the terms of the GNU General Public License 14 14 - * as published by the Free Software Foundation; either version 2 15 15 - * of the License, or (at your option) any later version. 16 16 - * 17 17 - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY 18 18 - * KIND, either express or implied. 19 19 - * 20 20 - ****************************************************************************/ 21 21 - 22 22 - /* 23 23 - * We can't use the CRC32 implementation in the firmware library as it uses a 24 24 - * different polynomial. The polynomial needed is 0xEDB88320L 25 25 - * 26 26 - * CRC32 implementation taken from: 27 27 - * 28 28 - * efone - Distributed internet phone system. 29 29 - * 30 30 - * (c) 1999,2000 Krzysztof Dabrowski 31 31 - * (c) 1999,2000 ElysiuM deeZine 32 32 - * 33 33 - * This program is free software; you can redistribute it and/or 34 34 - * modify it under the terms of the GNU General Public License 35 35 - * as published by the Free Software Foundation; either version 36 36 - * 2 of the License, or (at your option) any later version. 37 37 - * 38 38 - */ 39 39 - 40 40 - /* based on implementation by Finn Yannick Jacobs */ 41 41 - 42 42 - #include "crc32-mi4.h" 43 43 - 44 44 - /* crc_tab[] -- this crcTable is being build by chksum_crc32GenTab(). 45 45 - * so make sure, you call it before using the other 46 46 - * functions! 47 47 - */ 48 48 - static const unsigned int crc_tab[256] = { 49 49 - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 50 50 - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 51 51 - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 52 52 - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 53 53 - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 54 54 - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 55 55 - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, 56 56 - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 57 57 - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 58 58 - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 59 59 - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, 60 60 - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, 61 61 - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 62 62 - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 63 63 - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 64 64 - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 65 65 - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 66 66 - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 67 67 - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 68 68 - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, 69 69 - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 70 70 - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 71 71 - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 72 72 - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 73 73 - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 74 74 - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 75 75 - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, 76 76 - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 77 77 - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 78 78 - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 79 79 - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 80 80 - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 81 81 - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 82 82 - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 83 83 - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 84 84 - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 85 85 - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 86 86 - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 87 87 - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 88 88 - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 89 89 - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 90 90 - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 91 91 - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, 92 92 - }; 93 93 - 94 94 - /* chksum_crc() -- to a given block, this one calculates the 95 95 - * crc32-checksum until the length is 96 96 - * reached. the crc32-checksum will be 97 97 - * the result. 98 98 - */ 99 99 - unsigned int chksum_crc32 (unsigned char *block, unsigned int length) 100 100 - { 101 101 - register unsigned long crc; 102 102 - unsigned long i; 103 103 - 104 104 - crc = 0; 105 105 - for (i = 0; i < length; i++) 106 106 - { 107 107 - crc = ((crc >> 8) & 0x00FFFFFF) ^ crc_tab[(crc ^ *block++) & 0xFF]; 108 108 - } 109 109 - return (crc); 110 110 - }

-25

firmware/include/crc32-mi4.h

··· 1 1 - /*************************************************************************** 2 2 - * __________ __ ___. 3 3 - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ 4 4 - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / 5 5 - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < 6 6 - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ 7 7 - * \/ \/ \/ \/ \/ 8 8 - * $Id: crc32.h 10464 2006-08-05 20:19:10Z miipekk $ 9 9 - * 10 10 - * Copyright (C) 2007 Barry Wardell 11 11 - * 12 12 - * This program is free software; you can redistribute it and/or 13 13 - * modify it under the terms of the GNU General Public License 14 14 - * as published by the Free Software Foundation; either version 2 15 15 - * of the License, or (at your option) any later version. 16 16 - * 17 17 - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY 18 18 - * KIND, either express or implied. 19 19 - * 20 20 - ****************************************************************************/ 21 21 - #ifndef _CRC32_MI4_H 22 22 - #define _CRC32_MI4_H 23 23 - 24 24 - unsigned int chksum_crc32 (unsigned char *block, unsigned int length); 25 25 - #endif

-1

firmware/rolo.c

··· 40 40 41 41 #include "loader_strerror.h" 42 42 #if defined(MI4_FORMAT) 43 43 - #include "crc32-mi4.h" 44 43 #include "mi4-loader.h" 45 44 #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) 46 45 #include "bootdata.h"

+2 -3

firmware/target/arm/pp/mi4-loader.c

··· 27 27 #include "config.h" 28 28 #include "mi4-loader.h" 29 29 #include "loader_strerror.h" 30 30 - #include "crc32-mi4.h" 30 30 + #include "crc32.h" 31 31 #include "file.h" 32 32 #if defined(HAVE_BOOTDATA) 33 33 #include "system.h" 34 34 #include "bootdata.h" 35 35 - #include "crc32.h" 36 35 37 36 /* Write bootdata into location in FIRMWARE marked by magic header 38 37 * Assumes buffer is already loaded with the firmware image ··· 293 292 return EREAD_IMAGE_FAILED; 294 293 295 294 /* Check CRC32 to see if we have a valid file */ 296 296 - sum = chksum_crc32 (buf, mi4header.mi4size - MI4_HEADER_SIZE); 295 295 + sum = crc_32r (buf, mi4header.mi4size - MI4_HEADER_SIZE, 0); 297 296 298 297 if(sum != mi4header.crc32) 299 298 return EBAD_CHKSUM;