Deleted Added
full compact
pccard_cis.c (55720) pccard_cis.c (58581)
1/* $NetBSD: pcmcia_cis.c,v 1.10 1998/12/29 09:03:15 marc Exp $ */
1/* $NetBSD: pcmcia_cis.c,v 1.10 1998/12/29 09:03:15 marc Exp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 55720 2000-01-10 06:58:17Z imp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 58581 2000-03-26 07:01:52Z 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

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

116 int ret;
117
118 ret = 0;
119
120 /* allocate some memory */
121
122 rid = 0;
123 res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 0, ~0,
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

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

116 int ret;
117
118 ret = 0;
119
120 /* allocate some memory */
121
122 rid = 0;
123 res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 0, ~0,
124 PCCARD_CIS_SIZE, RF_ACTIVE | RF_PCCARD_ATTR);
124 PCCARD_CIS_SIZE, RF_ACTIVE /* | RF_PCCARD_ATTR */);
125 if (res == NULL) {
126#ifdef DIAGNOSTIC
127 device_printf(dev, "can't alloc memory to read attributes\n");
128#endif
129 return -1;
130 }
131 tuple.memt = rman_get_bustag(res);
132 tuple.memh = rman_get_bushandle(res);

--- 1073 unchanged lines hidden ---
125 if (res == NULL) {
126#ifdef DIAGNOSTIC
127 device_printf(dev, "can't alloc memory to read attributes\n");
128#endif
129 return -1;
130 }
131 tuple.memt = rman_get_bustag(res);
132 tuple.memh = rman_get_bushandle(res);

--- 1073 unchanged lines hidden ---