Deleted Added
full compact
pccard.c (189318) pccard.c (222764)
1/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
2
3/*-
4 * Copyright (c) 1997 Marc Horowitz. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
1/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
2
3/*-
4 * Copyright (c) 1997 Marc Horowitz. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/dev/pccard/pccard.c 189318 2009-03-03 18:57:59Z imp $");
33__FBSDID("$FreeBSD: head/sys/dev/pccard/pccard.c 222764 2011-06-06 16:27:38Z imp $");
34
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/malloc.h>
38#include <sys/module.h>
39#include <sys/kernel.h>
40#include <sys/queue.h>
41#include <sys/sysctl.h>

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

1400
1401static int
1402pccard_ccr_read_impl(device_t brdev, device_t child, uint32_t offset,
1403 uint8_t *val)
1404{
1405 struct pccard_ivar *devi = PCCARD_IVAR(child);
1406
1407 *val = pccard_ccr_read(devi->pf, offset);
34
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/malloc.h>
38#include <sys/module.h>
39#include <sys/kernel.h>
40#include <sys/queue.h>
41#include <sys/sysctl.h>

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

1400
1401static int
1402pccard_ccr_read_impl(device_t brdev, device_t child, uint32_t offset,
1403 uint8_t *val)
1404{
1405 struct pccard_ivar *devi = PCCARD_IVAR(child);
1406
1407 *val = pccard_ccr_read(devi->pf, offset);
1408 device_printf(child, "ccr_read of %#x (%#x) is %#x\n", offset,
1409 devi->pf->pf_ccr_offset, *val);
1408 DEVPRINTF((child, "ccr_read of %#x (%#x) is %#x\n", offset,
1409 devi->pf->pf_ccr_offset, *val));
1410 return 0;
1411}
1412
1413static int
1414pccard_ccr_write_impl(device_t brdev, device_t child, uint32_t offset,
1415 uint8_t val)
1416{
1417 struct pccard_ivar *devi = PCCARD_IVAR(child);
1418 struct pccard_function *pf = devi->pf;
1419
1420 /*
1421 * Can't use pccard_ccr_write since client drivers may access
1422 * registers not contained in the 'mask' if they are non-standard.
1423 */
1410 return 0;
1411}
1412
1413static int
1414pccard_ccr_write_impl(device_t brdev, device_t child, uint32_t offset,
1415 uint8_t val)
1416{
1417 struct pccard_ivar *devi = PCCARD_IVAR(child);
1418 struct pccard_function *pf = devi->pf;
1419
1420 /*
1421 * Can't use pccard_ccr_write since client drivers may access
1422 * registers not contained in the 'mask' if they are non-standard.
1423 */
1424 device_printf(child, "ccr_write of %#x to %#x (%#x)\n", val, offset,
1425 devi->pf->pf_ccr_offset);
1424 DEVPRINTF((child, "ccr_write of %#x to %#x (%#x)\n", val, offset,
1425 devi->pf->pf_ccr_offset));
1426 bus_space_write_1(pf->pf_ccrt, pf->pf_ccrh, pf->pf_ccr_offset + offset,
1427 val);
1428 return 0;
1429}
1430
1431
1432static device_method_t pccard_methods[] = {
1433 /* Device interface */

--- 52 unchanged lines hidden ---
1426 bus_space_write_1(pf->pf_ccrt, pf->pf_ccrh, pf->pf_ccr_offset + offset,
1427 val);
1428 return 0;
1429}
1430
1431
1432static device_method_t pccard_methods[] = {
1433 /* Device interface */

--- 52 unchanged lines hidden ---