diff --git a/src/Makefile b/src/Makefile index b3b6d9f..03c82a3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -55,7 +55,7 @@ TARGET = $(OBJDIR)/sd2snes # List C source files here. (C dependencies are automatically generated.) -SRC = main.c ff.c ccsbcs.c clock.c uart.c power.c led.c timer.c printf.c sdcard.c spi.c fileops.c rtc.c fpga.c fpga_spi.c snes.c smc.c memory.c filetypes.c faulthandler.c sort.c +SRC = main.c ff.c ccsbcs.c clock.c uart.c power.c led.c timer.c printf.c sdcard.c spi.c fileops.c rtc.c fpga.c fpga_spi.c snes.c smc.c memory.c filetypes.c faulthandler.c sort.c crc32.c # List Assembler source files here. diff --git a/src/crc32.c b/src/crc32.c new file mode 100644 index 0000000..9e20dd9 --- /dev/null +++ b/src/crc32.c @@ -0,0 +1,110 @@ +/** + * \file crc32.c + * Functions and types for CRC checks. + * + * Generated on Sat Sep 25 18:06:34 2010, + * by pycrc v0.7.1, http://www.tty1.net/pycrc/ + * using the configuration: + * Width = 32 + * Poly = 0x04c11db7 + * XorIn = 0xffffffff + * ReflectIn = True + * XorOut = 0xffffffff + * ReflectOut = True + * Algorithm = table-driven + * Direct = True + *****************************************************************************/ +#include "crc32.h" +#include "config.h" +#include +#include + +/** + * Static table used for the table_driven implementation. + *****************************************************************************/ +static const uint32_t crc32_table[256] IN_AHBRAM = { + 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 +}; + +/** + * Update the crc value with new data. + * + * \param crc The current crc value. + * \param data Pointer to a buffer of \a data_len bytes. + * \param data_len Number of bytes in the \a data buffer. + * \return The updated crc value. + *****************************************************************************/ +uint32_t crc32_update(uint32_t crc, const unsigned char data) +{ + unsigned int tbl_idx; + + tbl_idx = (crc ^ data) & 0xff; + crc = (crc32_table[tbl_idx] ^ (crc >> 8)) & 0xffffffff; + + return crc & 0xffffffff; +} + + diff --git a/src/crc32.h b/src/crc32.h new file mode 100644 index 0000000..9da3054 --- /dev/null +++ b/src/crc32.h @@ -0,0 +1,68 @@ +/** + * \file crc32.h + * Functions and types for CRC checks. + * + * Generated on Sat Sep 25 18:06:37 2010, + * by pycrc v0.7.1, http://www.tty1.net/pycrc/ + * using the configuration: + * Width = 32 + * Poly = 0x04c11db7 + * XorIn = 0xffffffff + * ReflectIn = True + * XorOut = 0xffffffff + * ReflectOut = True + * Algorithm = table-driven + * Direct = True + *****************************************************************************/ +#ifndef __CRC___H__ +#define __CRC___H__ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * The definition of the used algorithm. + *****************************************************************************/ +#define CRC_ALGO_TABLE_DRIVEN 1 + +/** + * Calculate the initial crc value. + * + * \return The initial crc value. + *****************************************************************************/ +static inline uint32_t crc_init(void) +{ + return 0xffffffff; +} + +/** + * Update the crc value with new data. + * + * \param crc The current crc value. + * \param data Pointer to a buffer of \a data_len bytes. + * \param data_len Number of bytes in the \a data buffer. + * \return The updated crc value. + *****************************************************************************/ +uint32_t crc32_update(uint32_t crc, const unsigned char data); + +/** + * Calculate the final crc value. + * + * \param crc The current crc value. + * \return The final crc value. + *****************************************************************************/ +static inline uint32_t crc32_finalize(uint32_t crc) +{ + return crc ^ 0xffffffff; +} + + +#ifdef __cplusplus +} /* closing brace for extern "C" */ +#endif + +#endif /* __CRC___H__ */ diff --git a/src/filetypes.c b/src/filetypes.c index f9c678a..9ea8a84 100644 --- a/src/filetypes.c +++ b/src/filetypes.c @@ -32,7 +32,7 @@ #include "ff.h" #include "smc.h" #include "fileops.h" -#include "crc.h" +#include "crc32.h" #include "memory.h" #include "led.h" #include "sort.h" @@ -54,14 +54,14 @@ uint16_t scan_flat(const char* path) { return numentries; } -uint16_t scan_dir(char* path, char mkdb, uint32_t this_dir_tgt) { +uint32_t scan_dir(char* path, char mkdb, uint32_t this_dir_tgt) { DIR dir; FILINFO fno; FRESULT res; uint8_t len; TCHAR* fn; static unsigned char depth = 0; - static uint16_t crc; + static uint32_t crc; static uint32_t db_tgt; static uint32_t next_subdir_tgt; static uint32_t parent_tgt; @@ -212,7 +212,7 @@ uint16_t scan_dir(char* path, char mkdb, uint32_t this_dir_tgt) { } else { TCHAR* sfn = fno.fname; while(*sfn != 0) { - crc += crc_xmodem_update(crc, *((unsigned char*)sfn++)); + crc += crc32_update(crc, *((unsigned char*)sfn++)); } } } @@ -246,14 +246,14 @@ SNES_FTYPE determine_filetype(char* filename) { return TYPE_UNKNOWN; } -FRESULT get_db_id(uint16_t* id) { +FRESULT get_db_id(uint32_t* id) { file_open((uint8_t*)"/sd2snes/sd2snes.db", FA_READ); if(file_res == FR_OK) { - file_readblock(id, 0, 2); + file_readblock(id, 0, 4); /* XXX */// *id=0xdead; file_close(); } else { - *id=0xdead; + *id=0xdeadbeef; } return file_res; } diff --git a/src/filetypes.h b/src/filetypes.h index 4b0aa29..a117b5e 100644 --- a/src/filetypes.h +++ b/src/filetypes.h @@ -40,8 +40,8 @@ char fs_path[256]; SNES_FTYPE determine_filetype(char* filename); //uint32_t scan_fs(); uint16_t scan_flat(const char* path); -uint16_t scan_dir(char* path, char mkdb, uint32_t this_subdir_tgt); -FRESULT get_db_id(uint16_t*); +uint32_t scan_dir(char* path, char mkdb, uint32_t this_subdir_tgt); +FRESULT get_db_id(uint32_t*); int get_num_dirent(uint32_t addr); void sort_all_dir(uint32_t endaddr); diff --git a/src/main.c b/src/main.c index 0a4fe9b..d9d8d29 100644 --- a/src/main.c +++ b/src/main.c @@ -87,25 +87,25 @@ restart: set_mcu_ovr(1); *fs_path=0; - uint16_t saved_dir_id; + uint32_t saved_dir_id; get_db_id(&saved_dir_id); - uint16_t mem_dir_id = sram_readshort(SRAM_DIRID); - uint32_t mem_magic = sram_readlong(SRAM_SCRATCHPAD); + uint32_t mem_dir_id = sram_readlong(SRAM_DIRID); + uint32_t mem_magic = sram_readlong(SRAM_SCRATCHPAD); - - if((mem_magic != 0x12345678) || (mem_dir_id != saved_dir_id)) { + printf("mem_magic=%lx mem_dir_id=%lx saved_dir_id=%lx\n", mem_magic, mem_dir_id, saved_dir_id); + if((mem_magic != 0x12345678) || (mem_dir_id != saved_dir_id)) { /* generate fs footprint (interesting files only) */ - uint16_t curr_dir_id = scan_dir(fs_path, 0, 0); - printf("curr dir id = %x\n", curr_dir_id); + uint32_t curr_dir_id = scan_dir(fs_path, 0, 0); + printf("curr dir id = %lx\n", curr_dir_id); /* files changed or no database found? */ if((get_db_id(&saved_dir_id) != FR_OK) || saved_dir_id != curr_dir_id) { /* rebuild database */ - printf("saved dir id = %x\n", saved_dir_id); + printf("saved dir id = %lx\n", saved_dir_id); printf("rebuilding database..."); curr_dir_id = scan_dir(fs_path, 1, 0); - sram_writeblock(&curr_dir_id, SRAM_DB_ADDR, 2); + sram_writeblock(&curr_dir_id, SRAM_DB_ADDR, 4); uint32_t endaddr, direndaddr; sram_readblock(&endaddr, SRAM_DB_ADDR+4, 4); sram_readblock(&direndaddr, SRAM_DB_ADDR+8, 4); @@ -117,12 +117,12 @@ restart: save_sram((uint8_t*)"/sd2snes/sd2snes.dir", direndaddr-(SRAM_DIR_ADDR), SRAM_DIR_ADDR); printf("done\n"); } else { - printf("saved dir id = %x\n", saved_dir_id); + printf("saved dir id = %lx\n", saved_dir_id); printf("different card, consistent db, loading db...\n"); load_sram((uint8_t*)"/sd2snes/sd2snes.db", SRAM_DB_ADDR); load_sram((uint8_t*)"/sd2snes/sd2snes.dir", SRAM_DIR_ADDR); } - sram_writeshort(curr_dir_id, SRAM_DIRID); + sram_writelong(curr_dir_id, SRAM_DIRID); sram_writelong(0x12345678, SRAM_SCRATCHPAD); } else { printf("same card, loading db...\n"); diff --git a/src/memory.c b/src/memory.c index c1f2bef..b7c8836 100644 --- a/src/memory.c +++ b/src/memory.c @@ -29,6 +29,7 @@ #include "uart.h" #include "fpga.h" #include "crc.h" +#include "crc32.h" #include "ff.h" #include "fileops.h" #include "spi.h" @@ -268,7 +269,7 @@ void save_sram(uint8_t* filename, uint32_t sram_size, uint32_t base_addr) { uint32_t calc_sram_crc(uint32_t base_addr, uint32_t size) { uint8_t data; uint32_t count; - uint16_t crc; + uint32_t crc; crc=0; crc_valid=1; set_mcu_addr(base_addr); @@ -281,7 +282,7 @@ uint32_t calc_sram_crc(uint32_t base_addr, uint32_t size) { crc_valid = 0; break; } - crc += crc_xmodem_update(crc, data); + crc += crc32_update(crc, data); } FPGA_DESELECT(); return crc; diff --git a/src/snes.c b/src/snes.c index efd5a7f..83e77fb 100644 --- a/src/snes.c +++ b/src/snes.c @@ -106,7 +106,7 @@ void snes_main_loop() { } saveram_crc_old = saveram_crc; } - printf("crc_valid=%d sram_valid=%d diffcount=%ld samecount=%ld, didnotsave=%ld\n", crc_valid, sram_valid, diffcount, samecount, didnotsave); + printf("crc=%lx crc_valid=%d sram_valid=%d diffcount=%ld samecount=%ld, didnotsave=%ld\n", saveram_crc, crc_valid, sram_valid, diffcount, samecount, didnotsave); } /*