Deleted Added
full compact
ppi.c (155921) ppi.c (166914)
1/*-
2 * Copyright (c) 1997, 1998, 1999 Nicolas Souchu, Michael Smith
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 *
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1997, 1998, 1999 Nicolas Souchu, Michael Smith
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 *
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/ppbus/ppi.c 155921 2006-02-22 18:16:26Z jhb $");
30__FBSDID("$FreeBSD: head/sys/dev/ppbus/ppi.c 166914 2007-02-23 19:34:52Z imp $");
31#include "opt_ppb_1284.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/module.h>
36#include <sys/bus.h>
37#include <sys/conf.h>
38#include <sys/kernel.h>

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

271 (PPB_WAIT | PPB_INTR))))
272 return (res);
273
274 ppi->ppi_flags |= HAVE_PPBUS;
275
276#ifdef PERIPH_1284
277 if (ppi->intr_resource) {
278 /* register our interrupt handler */
31#include "opt_ppb_1284.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/module.h>
36#include <sys/bus.h>
37#include <sys/conf.h>
38#include <sys/kernel.h>

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

271 (PPB_WAIT | PPB_INTR))))
272 return (res);
273
274 ppi->ppi_flags |= HAVE_PPBUS;
275
276#ifdef PERIPH_1284
277 if (ppi->intr_resource) {
278 /* register our interrupt handler */
279 bus_setup_intr(ppidev, ppi->intr_resource,
280 INTR_TYPE_TTY, ppiintr, dev, &ppi->intr_cookie);
279 bus_setup_intr(ppidev, ppi->intr_resource,
280 INTR_TYPE_TTY, NULL, ppiintr, dev,
281 &ppi->intr_cookie);
281 }
282#endif /* PERIPH_1284 */
283 }
284 ppi->ppi_count += 1;
285
286 return (0);
287}
288

--- 290 unchanged lines hidden ---
282 }
283#endif /* PERIPH_1284 */
284 }
285 ppi->ppi_count += 1;
286
287 return (0);
288}
289

--- 290 unchanged lines hidden ---