Deleted Added
full compact
pccard_cis.c (188219) pccard_cis.c (189682)
1/* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */
1/* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 188219 2009-02-06 07:49:03Z imp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 189682 2009-03-11 08:14:44Z imp $ */
3
4/*-
5 * Copyright (c) 1997 Marc Horowitz. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 1182 unchanged lines hidden (view full) ---

1193 cardaddrsize =
1194 ((reg & PCCARD_TPCE_MS_CARDADDR_SIZE_MASK) >>
1195 PCCARD_TPCE_MS_CARDADDR_SIZE_SHIFT);
1196 hostaddrsize =
1197 (reg & PCCARD_TPCE_MS_HOSTADDR) ? cardaddrsize : 0;
1198
1199 if (lengthsize == 0) {
1200 DPRINTF(("cfe memspace "
3
4/*-
5 * Copyright (c) 1997 Marc Horowitz. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 1182 unchanged lines hidden (view full) ---

1193 cardaddrsize =
1194 ((reg & PCCARD_TPCE_MS_CARDADDR_SIZE_MASK) >>
1195 PCCARD_TPCE_MS_CARDADDR_SIZE_SHIFT);
1196 hostaddrsize =
1197 (reg & PCCARD_TPCE_MS_HOSTADDR) ? cardaddrsize : 0;
1198
1199 if (lengthsize == 0) {
1200 DPRINTF(("cfe memspace "
1201 "lengthsize == 0"));
1202 state->card->error++;
1201 "lengthsize == 0\n"));
1203 }
1204 for (i = 0; i < cfe->num_memspace; i++) {
1205 if (lengthsize) {
1206 cfe->memspace[i].length =
1207 256 * pccard_tuple_read_n(tuple, lengthsize,
1208 idx);
1209 idx += lengthsize;
1210 } else {
1211 cfe->memspace[i].length = 0;
1212 }
1213 if (cfe->memspace[i].length == 0) {
1202 }
1203 for (i = 0; i < cfe->num_memspace; i++) {
1204 if (lengthsize) {
1205 cfe->memspace[i].length =
1206 256 * pccard_tuple_read_n(tuple, lengthsize,
1207 idx);
1208 idx += lengthsize;
1209 } else {
1210 cfe->memspace[i].length = 0;
1211 }
1212 if (cfe->memspace[i].length == 0) {
1214 DPRINTF(("cfe->memspace[%d].length == 0",
1213 DPRINTF(("cfe->memspace[%d].length == 0\n",
1215 i));
1214 i));
1216 state->card->error++;
1217 }
1218 if (cardaddrsize) {
1219 cfe->memspace[i].cardaddr =
1220 256 * pccard_tuple_read_n(tuple, cardaddrsize,
1221 idx);
1222 idx += cardaddrsize;
1223 } else {
1224 cfe->memspace[i].cardaddr = 0;

--- 84 unchanged lines hidden ---
1215 }
1216 if (cardaddrsize) {
1217 cfe->memspace[i].cardaddr =
1218 256 * pccard_tuple_read_n(tuple, cardaddrsize,
1219 idx);
1220 idx += cardaddrsize;
1221 } else {
1222 cfe->memspace[i].cardaddr = 0;

--- 84 unchanged lines hidden ---