2c2
< /* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 167086 2007-02-27 17:23:29Z jhb $ */
---
> /* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 179483 2008-06-01 20:55:34Z imp $ */
901c901
< int idx, i, j;
---
> int idx, i;
909,910c909
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
---
> reg = pccard_tuple_read_1(tuple, idx++);
986,987c985
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
---
> reg = pccard_tuple_read_1(tuple, idx++);
1002,1003c1000
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
---
> reg = pccard_tuple_read_1(tuple, idx++);
1016,1032c1013,1026
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
< /* for each bit */
< for (j = 0; j < 7; j++) {
< /* if the bit is set */
< if ((reg >> j) & 0x01) {
< /* skip over bytes */
< do {
< reg2 = pccard_tuple_read_1(tuple, idx);
< idx++;
< /*
< * until
< * non-extensi
< * on byte
< */
< } while (reg2 & 0x80);
< }
---
> reg = pccard_tuple_read_1(tuple, idx++);
> for (; reg; reg >>= 1)
> {
> /* set bit -> read */
> if ((reg & 1) == 0)
> continue;
> /* skip over bytes */
> do {
> reg2 = pccard_tuple_read_1(tuple, idx++);
> /*
> * until non-extension
> * byte
> */
> } while (reg2 & 0x80);
1038,1039c1032
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
---
> reg = pccard_tuple_read_1(tuple, idx++);
1057,1058c1050
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
---
> reg = pccard_tuple_read_1(tuple, idx++);
1069,1071c1061
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
<
---
> reg = pccard_tuple_read_1(tuple, idx++);
1088,1089c1078
< pccard_tuple_read_1(tuple, idx);
< idx++;
---
> pccard_tuple_read_1(tuple, idx++);
1106,1107c1095
< pccard_tuple_read_1(tuple, idx);
< idx++;
---
> pccard_tuple_read_1(tuple, idx++);
1135,1136c1123
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
---
> reg = pccard_tuple_read_1(tuple, idx++);
1189,1191c1176
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
<
---
> reg = pccard_tuple_read_1(tuple, idx++);
1194d1178
<
1258,1259c1242
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
---
> reg = pccard_tuple_read_1(tuple, idx++);
1272,1273c1255
< reg = pccard_tuple_read_1(tuple, idx);
< idx++;
---
> reg = pccard_tuple_read_1(tuple, idx++);