| pccard.c (55720) | pccard.c (58581) |
|---|---|
| 1/* $NetBSD: pcmcia.c,v 1.13 1998/12/24 04:51:59 marc Exp $ */ | 1/* $NetBSD: pcmcia.c,v 1.13 1998/12/24 04:51:59 marc Exp $ */ |
| 2/* $FreeBSD: head/sys/dev/pccard/pccard.c 55720 2000-01-10 06:58:17Z imp $ */ | 2/* $FreeBSD: head/sys/dev/pccard/pccard.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 --- 318 unchanged lines hidden (view full) --- 329 break; 330 } 331 } 332 333 if (tmp == NULL) { 334 pf->ccr_rid = 0; 335 pf->ccr_res = bus_alloc_resource(dev, SYS_RES_MEMORY, 336 &pf->ccr_rid, pf->ccr_base, pf->ccr_base + PCCARD_CCR_SIZE, | 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 --- 318 unchanged lines hidden (view full) --- 329 break; 330 } 331 } 332 333 if (tmp == NULL) { 334 pf->ccr_rid = 0; 335 pf->ccr_res = bus_alloc_resource(dev, SYS_RES_MEMORY, 336 &pf->ccr_rid, pf->ccr_base, pf->ccr_base + PCCARD_CCR_SIZE, |
| 337 PCCARD_CCR_SIZE, RF_ACTIVE | RF_PCCARD_ATTR); | 337 PCCARD_CCR_SIZE, RF_ACTIVE); 338 /* XXX SET MEM_ATTR */ |
| 338 if (!pf->ccr_res) 339 goto bad; 340 pf->pf_ccrt = rman_get_bustag(pf->ccr_res); 341 pf->pf_ccrh = rman_get_bushandle(pf->ccr_res); 342 pf->pf_ccr_offset = rman_get_start(pf->ccr_res); 343 pf->pf_ccr_realsize = 1; 344 } 345 --- 419 unchanged lines hidden --- | 339 if (!pf->ccr_res) 340 goto bad; 341 pf->pf_ccrt = rman_get_bustag(pf->ccr_res); 342 pf->pf_ccrh = rman_get_bushandle(pf->ccr_res); 343 pf->pf_ccr_offset = rman_get_start(pf->ccr_res); 344 pf->pf_ccr_realsize = 1; 345 } 346 --- 419 unchanged lines hidden --- |