Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging/keucr: fix keucr smilecc.c coding style

fix keucr smilecc.c coding style

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Cho, Yu-Chen and committed by
Greg Kroah-Hartman
65cdcf36 8a25a2cf

+136 -131
+136 -131
drivers/staging/keucr/smilecc.c
··· 1 1 #include "usb.h" 2 2 #include "scsiglue.h" 3 3 #include "transport.h" 4 - //#include "stdlib.h" 5 - //#include "EUCR6SK.h" 4 + /* #include "stdlib.h" */ 5 + /* #include "EUCR6SK.h" */ 6 6 #include "smcommon.h" 7 7 #include "smil.h" 8 8 9 - //#include <stdio.h> 10 - //#include <stdlib.h> 11 - //#include <string.h> 12 - //#include <dos.h> 13 - // 14 - //#include "EMCRIOS.h" 9 + /* #include <stdio.h> */ 10 + /* #include <stdlib.h> */ 11 + /* #include <string.h> */ 12 + /* #include <dos.h> */ 13 + /* #include "EMCRIOS.h" */ 15 14 16 - // CP0-CP5 code table 15 + /* CP0-CP5 code table */ 17 16 static BYTE ecctable[256] = { 18 - 0x00,0x55,0x56,0x03,0x59,0x0C,0x0F,0x5A,0x5A,0x0F,0x0C,0x59,0x03,0x56,0x55,0x00, 19 - 0x65,0x30,0x33,0x66,0x3C,0x69,0x6A,0x3F,0x3F,0x6A,0x69,0x3C,0x66,0x33,0x30,0x65, 20 - 0x66,0x33,0x30,0x65,0x3F,0x6A,0x69,0x3C,0x3C,0x69,0x6A,0x3F,0x65,0x30,0x33,0x66, 21 - 0x03,0x56,0x55,0x00,0x5A,0x0F,0x0C,0x59,0x59,0x0C,0x0F,0x5A,0x00,0x55,0x56,0x03, 22 - 0x69,0x3C,0x3F,0x6A,0x30,0x65,0x66,0x33,0x33,0x66,0x65,0x30,0x6A,0x3F,0x3C,0x69, 23 - 0x0C,0x59,0x5A,0x0F,0x55,0x00,0x03,0x56,0x56,0x03,0x00,0x55,0x0F,0x5A,0x59,0x0C, 24 - 0x0F,0x5A,0x59,0x0C,0x56,0x03,0x00,0x55,0x55,0x00,0x03,0x56,0x0C,0x59,0x5A,0x0F, 25 - 0x6A,0x3F,0x3C,0x69,0x33,0x66,0x65,0x30,0x30,0x65,0x66,0x33,0x69,0x3C,0x3F,0x6A, 26 - 0x6A,0x3F,0x3C,0x69,0x33,0x66,0x65,0x30,0x30,0x65,0x66,0x33,0x69,0x3C,0x3F,0x6A, 27 - 0x0F,0x5A,0x59,0x0C,0x56,0x03,0x00,0x55,0x55,0x00,0x03,0x56,0x0C,0x59,0x5A,0x0F, 28 - 0x0C,0x59,0x5A,0x0F,0x55,0x00,0x03,0x56,0x56,0x03,0x00,0x55,0x0F,0x5A,0x59,0x0C, 29 - 0x69,0x3C,0x3F,0x6A,0x30,0x65,0x66,0x33,0x33,0x66,0x65,0x30,0x6A,0x3F,0x3C,0x69, 30 - 0x03,0x56,0x55,0x00,0x5A,0x0F,0x0C,0x59,0x59,0x0C,0x0F,0x5A,0x00,0x55,0x56,0x03, 31 - 0x66,0x33,0x30,0x65,0x3F,0x6A,0x69,0x3C,0x3C,0x69,0x6A,0x3F,0x65,0x30,0x33,0x66, 32 - 0x65,0x30,0x33,0x66,0x3C,0x69,0x6A,0x3F,0x3F,0x6A,0x69,0x3C,0x66,0x33,0x30,0x65, 33 - 0x00,0x55,0x56,0x03,0x59,0x0C,0x0F,0x5A,0x5A,0x0F,0x0C,0x59,0x03,0x56,0x55,0x00 17 + 0x00, 0x55, 0x56, 0x03, 0x59, 0x0C, 0x0F, 0x5A, 0x5A, 0x0F, 0x0C, 0x59, 0x03, 18 + 0x56, 0x55, 0x00, 0x65, 0x30, 0x33, 0x66, 0x3C, 0x69, 0x6A, 0x3F, 0x3F, 0x6A, 19 + 0x69, 0x3C, 0x66, 0x33, 0x30, 0x65, 0x66, 0x33, 0x30, 0x65, 0x3F, 0x6A, 0x69, 20 + 0x3C, 0x3C, 0x69, 0x6A, 0x3F, 0x65, 0x30, 0x33, 0x66, 0x03, 0x56, 0x55, 0x00, 21 + 0x5A, 0x0F, 0x0C, 0x59, 0x59, 0x0C, 0x0F, 0x5A, 0x00, 0x55, 0x56, 0x03, 0x69, 22 + 0x3C, 0x3F, 0x6A, 0x30, 0x65, 0x66, 0x33, 0x33, 0x66, 0x65, 0x30, 0x6A, 0x3F, 23 + 0x3C, 0x69, 0x0C, 0x59, 0x5A, 0x0F, 0x55, 0x00, 0x03, 0x56, 0x56, 0x03, 0x00, 24 + 0x55, 0x0F, 0x5A, 0x59, 0x0C, 0x0F, 0x5A, 0x59, 0x0C, 0x56, 0x03, 0x00, 0x55, 25 + 0x55, 0x00, 0x03, 0x56, 0x0C, 0x59, 0x5A, 0x0F, 0x6A, 0x3F, 0x3C, 0x69, 0x33, 26 + 0x66, 0x65, 0x30, 0x30, 0x65, 0x66, 0x33, 0x69, 0x3C, 0x3F, 0x6A, 0x6A, 0x3F, 27 + 0x3C, 0x69, 0x33, 0x66, 0x65, 0x30, 0x30, 0x65, 0x66, 0x33, 0x69, 0x3C, 0x3F, 28 + 0x6A, 0x0F, 0x5A, 0x59, 0x0C, 0x56, 0x03, 0x00, 0x55, 0x55, 0x00, 0x03, 0x56, 29 + 0x0C, 0x59, 0x5A, 0x0F, 0x0C, 0x59, 0x5A, 0x0F, 0x55, 0x00, 0x03, 0x56, 0x56, 30 + 0x03, 0x00, 0x55, 0x0F, 0x5A, 0x59, 0x0C, 0x69, 0x3C, 0x3F, 0x6A, 0x30, 0x65, 31 + 0x66, 0x33, 0x33, 0x66, 0x65, 0x30, 0x6A, 0x3F, 0x3C, 0x69, 0x03, 0x56, 0x55, 32 + 0x00, 0x5A, 0x0F, 0x0C, 0x59, 0x59, 0x0C, 0x0F, 0x5A, 0x00, 0x55, 0x56, 0x03, 33 + 0x66, 0x33, 0x30, 0x65, 0x3F, 0x6A, 0x69, 0x3C, 0x3C, 0x69, 0x6A, 0x3F, 0x65, 34 + 0x30, 0x33, 0x66, 0x65, 0x30, 0x33, 0x66, 0x3C, 0x69, 0x6A, 0x3F, 0x3F, 0x6A, 35 + 0x69, 0x3C, 0x66, 0x33, 0x30, 0x65, 0x00, 0x55, 0x56, 0x03, 0x59, 0x0C, 0x0F, 36 + 0x5A, 0x5A, 0x0F, 0x0C, 0x59, 0x03, 0x56, 0x55, 0x00 34 37 }; 35 38 36 - static void trans_result (BYTE, BYTE, BYTE *, BYTE *); 39 + static void trans_result(BYTE, BYTE, BYTE *, BYTE *); 37 40 38 41 #define BIT7 0x80 39 42 #define BIT6 0x40 ··· 52 49 #define CORRECTABLE 0x00555554L 53 50 54 51 /* 55 - * reg2; // LP14,LP12,LP10,... 56 - * reg3; // LP15,LP13,LP11,... 57 - * *ecc1; // LP15,LP14,LP13,... 58 - * *ecc2; // LP07,LP06,LP05,... 52 + * reg2; * LP14,LP12,LP10,... 53 + * reg3; * LP15,LP13,LP11,... 54 + * *ecc1; * LP15,LP14,LP13,... 55 + * *ecc2; * LP07,LP06,LP05,... 59 56 */ 60 57 static void trans_result(BYTE reg2, BYTE reg3, BYTE *ecc1, BYTE *ecc2) 61 58 { 62 - BYTE a; // Working for reg2,reg3 63 - BYTE b; // Working for ecc1,ecc2 64 - BYTE i; // For counting 59 + BYTE a; /* Working for reg2,reg3 */ 60 + BYTE b; /* Working for ecc1,ecc2 */ 61 + BYTE i; /* For counting */ 65 62 66 - a=BIT7; b=BIT7; // 80h=10000000b 67 - *ecc1=*ecc2=0; // Clear ecc1,ecc2 68 - for(i=0; i<4; ++i) { 69 - if ((reg3&a)!=0) 70 - *ecc1|=b; // LP15,13,11,9 -> ecc1 71 - b=b>>1; // Right shift 72 - if ((reg2&a)!=0) 73 - *ecc1|=b; // LP14,12,10,8 -> ecc1 74 - b=b>>1; // Right shift 75 - a=a>>1; // Right shift 76 - } 63 + a = BIT7; b = BIT7; /* 80h=10000000b */ 64 + *ecc1 = *ecc2 = 0; /* Clear ecc1,ecc2 */ 65 + for (i = 0; i < 4; ++i) { 66 + if ((reg3&a) != 0) 67 + *ecc1 |= b; /* LP15,13,11,9 -> ecc1 */ 68 + b = b>>1; /* Right shift */ 69 + if ((reg2&a) != 0) 70 + *ecc1 |= b; /* LP14,12,10,8 -> ecc1 */ 71 + b = b>>1; /* Right shift */ 72 + a = a>>1; /* Right shift */ 73 + } 77 74 78 - b=BIT7; // 80h=10000000b 79 - for(i=0; i<4; ++i) { 80 - if ((reg3&a)!=0) 81 - *ecc2|=b; // LP7,5,3,1 -> ecc2 82 - b=b>>1; // Right shift 83 - if ((reg2&a)!=0) 84 - *ecc2|=b; // LP6,4,2,0 -> ecc2 85 - b=b>>1; // Right shift 86 - a=a>>1; // Right shift 87 - } 75 + b = BIT7; /* 80h=10000000b */ 76 + for (i = 0; i < 4; ++i) { 77 + if ((reg3&a) != 0) 78 + *ecc2 |= b; /* LP7,5,3,1 -> ecc2 */ 79 + b = b>>1; /* Right shift */ 80 + if ((reg2&a) != 0) 81 + *ecc2 |= b; /* LP6,4,2,0 -> ecc2 */ 82 + b = b>>1; /* Right shift */ 83 + a = a>>1; /* Right shift */ 84 + } 88 85 } 89 86 90 - //static void calculate_ecc(table,data,ecc1,ecc2,ecc3) 87 + /*static void calculate_ecc(table,data,ecc1,ecc2,ecc3) */ 91 88 /* 92 - * *table; // CP0-CP5 code table 93 - * *data; // DATA 94 - * *ecc1; // LP15,LP14,LP13,... 95 - * *ecc2; // LP07,LP06,LP05,... 96 - * *ecc3; // CP5,CP4,CP3,...,"1","1" 89 + * *table; * CP0-CP5 code table 90 + * *data; * DATA 91 + * *ecc1; * LP15,LP14,LP13,... 92 + * *ecc2; * LP07,LP06,LP05,... 93 + * *ecc3; * CP5,CP4,CP3,...,"1","1" 97 94 */ 98 95 void calculate_ecc(BYTE *table, BYTE *data, BYTE *ecc1, BYTE *ecc2, BYTE *ecc3) 99 96 { 100 - DWORD i; // For counting 101 - BYTE a; // Working for table 102 - BYTE reg1; // D-all,CP5,CP4,CP3,... 103 - BYTE reg2; // LP14,LP12,L10,... 104 - BYTE reg3; // LP15,LP13,L11,... 97 + DWORD i; /* For counting */ 98 + BYTE a; /* Working for table */ 99 + BYTE reg1; /* D-all,CP5,CP4,CP3,... */ 100 + BYTE reg2; /* LP14,LP12,L10,... */ 101 + BYTE reg3; /* LP15,LP13,L11,... */ 105 102 106 - reg1=reg2=reg3=0; // Clear parameter 107 - for(i=0; i<256; ++i) { 108 - a=table[data[i]]; // Get CP0-CP5 code from table 109 - reg1^=(a&MASK_CPS); // XOR with a 110 - if ((a&BIT6)!=0) 111 - { // If D_all(all bit XOR) = 1 112 - reg3^=(BYTE)i; // XOR with counter 113 - reg2^=~((BYTE)i); // XOR with inv. of counter 114 - } 115 - } 103 + reg1 = reg2 = reg3 = 0; /* Clear parameter */ 104 + for (i = 0; i < 256; ++i) { 105 + a = table[data[i]]; /* Get CP0-CP5 code from table */ 106 + reg1 ^= (a&MASK_CPS); /* XOR with a */ 107 + if ((a&BIT6) != 0) { /* If D_all(all bit XOR) = 1 */ 108 + reg3 ^= (BYTE)i; /* XOR with counter */ 109 + reg2 ^= ~((BYTE)i); /* XOR with inv. of counter */ 110 + } 111 + } 116 112 117 - // Trans LP14,12,10,... & LP15,13,11,... -> LP15,14,13,... & LP7,6,5,.. 118 - trans_result(reg2,reg3,ecc1,ecc2); 119 - *ecc1=~(*ecc1); *ecc2=~(*ecc2); // Inv. ecc2 & ecc3 120 - *ecc3=((~reg1)<<2)|BIT1BIT0; // Make TEL format 113 + /* Trans LP14,12,10,... & LP15,13,11,... -> 114 + LP15,14,13,... & LP7,6,5,.. */ 115 + trans_result(reg2, reg3, ecc1, ecc2); 116 + *ecc1 = ~(*ecc1); *ecc2 = ~(*ecc2); /* Inv. ecc2 & ecc3 */ 117 + *ecc3 = ((~reg1)<<2)|BIT1BIT0; /* Make TEL format */ 121 118 } 122 119 123 120 /* 124 - * *data; // DATA 125 - * *eccdata; // ECC DATA 126 - * ecc1; // LP15,LP14,LP13,... 127 - * ecc2; // LP07,LP06,LP05,... 128 - * ecc3; // CP5,CP4,CP3,...,"1","1" 121 + * *data; * DATA 122 + * *eccdata; * ECC DATA 123 + * ecc1; * LP15,LP14,LP13,... 124 + * ecc2; * LP07,LP06,LP05,... 125 + * ecc3; * CP5,CP4,CP3,...,"1","1" 129 126 */ 130 127 BYTE correct_data(BYTE *data, BYTE *eccdata, BYTE ecc1, BYTE ecc2, BYTE ecc3) 131 128 { 132 - DWORD l; // Working to check d 133 - DWORD d; // Result of comparison 134 - DWORD i; // For counting 135 - BYTE d1,d2,d3; // Result of comparison 136 - BYTE a; // Working for add 137 - BYTE add; // Byte address of cor. DATA 138 - BYTE b; // Working for bit 139 - BYTE bit; // Bit address of cor. DATA 129 + DWORD l; /* Working to check d */ 130 + DWORD d; /* Result of comparison */ 131 + DWORD i; /* For counting */ 132 + BYTE d1, d2, d3; /* Result of comparison */ 133 + BYTE a; /* Working for add */ 134 + BYTE add; /* Byte address of cor. DATA */ 135 + BYTE b; /* Working for bit */ 136 + BYTE bit; /* Bit address of cor. DATA */ 140 137 141 - d1=ecc1^eccdata[1]; d2=ecc2^eccdata[0]; // Compare LP's 142 - d3=ecc3^eccdata[2]; // Comapre CP's 143 - d=((DWORD)d1<<16) // Result of comparison 144 - +((DWORD)d2<<8) 145 - +(DWORD)d3; 138 + d1 = ecc1^eccdata[1]; d2 = ecc2^eccdata[0]; /* Compare LP's */ 139 + d3 = ecc3^eccdata[2]; /* Comapre CP's */ 140 + d = ((DWORD)d1<<16) /* Result of comparison */ 141 + +((DWORD)d2<<8) 142 + +(DWORD)d3; 146 143 147 - if (d==0) return(0); // If No error, return 144 + if (d == 0) 145 + return 0; /* If No error, return */ 148 146 149 - if (((d^(d>>1))&CORRECTABLE)==CORRECTABLE) 150 - { // If correctable 151 - l=BIT23; 152 - add=0; // Clear parameter 153 - a=BIT7; 147 + if (((d^(d>>1))&CORRECTABLE) == CORRECTABLE) { /* If correctable */ 148 + l = BIT23; 149 + add = 0; /* Clear parameter */ 150 + a = BIT7; 154 151 155 - for(i=0; i<8; ++i) { // Checking 8 bit 156 - if ((d&l)!=0) add|=a; // Make byte address from LP's 157 - l>>=2; a>>=1; // Right Shift 158 - } 152 + for (i = 0; i < 8; ++i) { /* Checking 8 bit */ 153 + if ((d&l) != 0) 154 + add |= a; /* Make byte address from LP's */ 155 + l >>= 2; a >>= 1; /* Right Shift */ 156 + } 159 157 160 - bit=0; // Clear parameter 161 - b=BIT2; 162 - for(i=0; i<3; ++i) { // Checking 3 bit 163 - if ((d&l)!=0) bit|=b; // Make bit address from CP's 164 - l>>=2; b>>=1; // Right shift 165 - } 158 + bit = 0; /* Clear parameter */ 159 + b = BIT2; 160 + for (i = 0; i < 3; ++i) { /* Checking 3 bit */ 161 + if ((d&l) != 0) 162 + bit |= b; /* Make bit address from CP's */ 163 + l >>= 2; b >>= 1; /* Right shift */ 164 + } 166 165 167 - b=BIT0; 168 - data[add]^=(b<<bit); // Put corrected data 169 - return(1); 170 - } 166 + b = BIT0; 167 + data[add] ^= (b<<bit); /* Put corrected data */ 168 + return 1; 169 + } 171 170 172 - i=0; // Clear count 173 - d&=0x00ffffffL; // Masking 171 + i = 0; /* Clear count */ 172 + d &= 0x00ffffffL; /* Masking */ 174 173 175 - while(d) { // If d=0 finish counting 176 - if (d&BIT0) ++i; // Count number of 1 bit 177 - d>>=1; // Right shift 178 - } 174 + while (d) { /* If d=0 finish counting */ 175 + if (d&BIT0) 176 + ++i; /* Count number of 1 bit */ 177 + d >>= 1; /* Right shift */ 178 + } 179 179 180 - if (i==1) 181 - { // If ECC error 182 - eccdata[1]=ecc1; eccdata[0]=ecc2; // Put right ECC code 183 - eccdata[2]=ecc3; 184 - return(2); 185 - } 186 - return(3); // Uncorrectable error 180 + if (i == 1) { /* If ECC error */ 181 + eccdata[1] = ecc1; eccdata[0] = ecc2; /* Put right ECC code */ 182 + eccdata[2] = ecc3; 183 + return 2; 184 + } 185 + return 3; /* Uncorrectable error */ 187 186 } 188 187 189 188 int _Correct_D_SwECC(BYTE *buf, BYTE *redundant_ecc, BYTE *calculate_ecc) ··· 205 200 206 201 void _Calculate_D_SwECC(BYTE *buf, BYTE *ecc) 207 202 { 208 - calculate_ecc(ecctable,buf,ecc+1,ecc+0,ecc+2); 203 + calculate_ecc(ecctable, buf, ecc+1, ecc+0, ecc+2); 209 204 } 210 205 211 206