From: Michael Gernoth Date: Wed, 28 Jan 2009 12:04:19 +0000 (+0100) Subject: small cleanups X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/commitdiff_plain/85feabf9dec991995b9e794fa7192a0a1c46106e small cleanups --- diff --git a/rsb-crc.c b/rsb-crc.c index 3fe5cbc..d2949ca 100644 --- a/rsb-crc.c +++ b/rsb-crc.c @@ -115,78 +115,61 @@ unsigned int rsb_crc(unsigned int r11_crc, unsigned char *r10_buf, unsigned int * 55ae0: DATA: 0x04c11db7 */ -unsigned int rsb_crc2(unsigned char *r0_buf, unsigned int r1_buflen, unsigned int r2_magic, unsigned int *crc) { +unsigned int rsb_crc2(unsigned char *r0_buf, unsigned int r1_buflen, unsigned int r2_magic, unsigned int *crc_out) { int r8_ret = 1; - unsigned int r3 = 0xc0000000; + unsigned int r3_pos = 0xc0000000; unsigned int r4_len; - unsigned int r5; + unsigned int r5_crc; unsigned int r6; - unsigned int r7_poly; unsigned int r9; unsigned int carry; #if 0 - if (r0_buf <= r3) - return r8_ret; + if (r0_buf <= r3_pos) + return 1; /* Not in RAM */ #endif - r3 = ((unsigned int)r0_buf) + 0x20; - r4_len = *((unsigned int*)r3); + r4_len = *(unsigned int*)(r0_buf + 0x20); printf("CRC: length: %d\n", r4_len); - r8_ret = 2; - - r3 += 4; - r5 = *((unsigned int*)r3); - - if (r5 != r2_magic) - return r8_ret; + if (*((unsigned int*)(r0_buf + 0x24)) != r2_magic) + return 2; /* MAGIC does not match */ - r8_ret = 3; - - if (r1_buflen >= r4_len) { - r5 = 0; - } else { - r5 = 1; - } - - if (r5 != 0) - return r8_ret; + if (r1_buflen < r4_len) + return 3; /* image to small */ r8_ret = 4; - r3 = (unsigned int)r0_buf; - r4_len += r3; + r3_pos = (unsigned int)r0_buf; + r4_len += r3_pos; - r5 = ~0x0; - - r7_poly = POLY; + r5_crc = ~0x0; - while (r3 < r4_len) { - r9 = r3 & (~0x3); + while (r3_pos < r4_len) { + r9 = r3_pos & (~0x3); r6 = *((unsigned int*)r9); - r9 = r3 & 0x3; + r9 = r3_pos & 0x3; r9 = r9 << 0x3; r6 = r6 >> r9; - r5 = r5 ^ (r6 << 24); + r5_crc = r5_crc ^ (r6 << 24); r6 = 0x8; do { - carry = r5 & 0x80000000; - r5 = r5 << 1; + carry = r5_crc & 0x80000000; + r5_crc = r5_crc << 1; if (carry) - r5 = r5 ^ r7_poly; + r5_crc = r5_crc ^ POLY; r6--; } while(r6); - r3++; + r3_pos++; } - r5 = ~r5; - *crc = r5; + r5_crc = ~r5_crc; + *crc_out = r5_crc; - r3 = *((unsigned int*)r4_len); + r3_pos = *((unsigned int*)r4_len); - if (r3 == r5) + if (r3_pos == r5_crc) r8_ret = 0; return r8_ret; diff --git a/rsb-crc.h b/rsb-crc.h index c59ccde..f97e6da 100644 --- a/rsb-crc.h +++ b/rsb-crc.h @@ -1,2 +1,2 @@ unsigned int rsb_crc(unsigned int r11_crc, unsigned char *r10_buf, unsigned int r14_len); -unsigned int rsb_crc2(unsigned char *r0_buf, unsigned int r1_buflen, unsigned int r2_magic, unsigned int *crc); +unsigned int rsb_crc2(unsigned char *r0_buf, unsigned int r1_buflen, unsigned int r2_magic, unsigned int *crc_out);