Deleted Added
full compact
pccard.c (97613) pccard.c (101762)
1/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
1/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard.c 97613 2002-05-30 17:38:00Z takawata $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard.c 101762 2002-08-12 22:34:12Z 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

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

1188pccard_setup_intr(device_t dev, device_t child, struct resource *irq,
1189 int flags, driver_intr_t *intr, void *arg, void **cookiep)
1190{
1191 struct pccard_ivar *ivar = PCCARD_IVAR(child);
1192 struct pccard_function *func = ivar->fcn;
1193 int err;
1194
1195 if (func->intr_handler != NULL)
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

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

1188pccard_setup_intr(device_t dev, device_t child, struct resource *irq,
1189 int flags, driver_intr_t *intr, void *arg, void **cookiep)
1190{
1191 struct pccard_ivar *ivar = PCCARD_IVAR(child);
1192 struct pccard_function *func = ivar->fcn;
1193 int err;
1194
1195 if (func->intr_handler != NULL)
1196 panic("Only one interrupt handler per function allowed\n");
1196 panic("Only one interrupt handler per function allowed");
1197 err = bus_generic_setup_intr(dev, child, irq, flags, pccard_intr,
1198 func, cookiep);
1199 if (err != 0)
1200 return (err);
1201 func->intr_handler = intr;
1202 func->intr_handler_arg = arg;
1203 func->intr_handler_cookie = *cookiep;
1204 /* XXX Not sure this is right to write to ccr */

--- 79 unchanged lines hidden ---
1197 err = bus_generic_setup_intr(dev, child, irq, flags, pccard_intr,
1198 func, cookiep);
1199 if (err != 0)
1200 return (err);
1201 func->intr_handler = intr;
1202 func->intr_handler_arg = arg;
1203 func->intr_handler_cookie = *cookiep;
1204 /* XXX Not sure this is right to write to ccr */

--- 79 unchanged lines hidden ---