Deleted Added
full compact
if_pcn.c (115531) if_pcn.c (117208)
1/*
2 * Copyright (c) 2000 Berkeley Software Design, Inc.
3 * Copyright (c) 1997, 1998, 1999, 2000
4 * Bill Paul <wpaul@osd.bsdi.com>. 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:

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

45 * these enhancements is the ability to perform PCI DMA operations
46 * using 32-bit addressing (which eliminates the need for ISA
47 * bounce-buffering), and special receive buffer alignment (which
48 * allows the receive handler to pass packets to the upper protocol
49 * layers without copying on both the x86 and alpha platforms).
50 */
51
52#include <sys/cdefs.h>
1/*
2 * Copyright (c) 2000 Berkeley Software Design, Inc.
3 * Copyright (c) 1997, 1998, 1999, 2000
4 * Bill Paul <wpaul@osd.bsdi.com>. 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:

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

45 * these enhancements is the ability to perform PCI DMA operations
46 * using 32-bit addressing (which eliminates the need for ISA
47 * bounce-buffering), and special receive buffer alignment (which
48 * allows the receive handler to pass packets to the upper protocol
49 * layers without copying on both the x86 and alpha platforms).
50 */
51
52#include <sys/cdefs.h>
53__FBSDID("$FreeBSD: head/sys/pci/if_pcn.c 115531 2003-05-31 20:02:43Z phk $");
53__FBSDID("$FreeBSD: head/sys/pci/if_pcn.c 117208 2003-07-03 21:39:53Z imp $");
54
55#include <sys/param.h>
56#include <sys/systm.h>
57#include <sys/sockio.h>
58#include <sys/mbuf.h>
59#include <sys/malloc.h>
60#include <sys/kernel.h>
61#include <sys/socket.h>

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

510 int unit, error = 0, rid;
511
512 sc = device_get_softc(dev);
513 unit = device_get_unit(dev);
514
515 /* Initialize our mutex. */
516 mtx_init(&sc->pcn_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
517 MTX_DEF | MTX_RECURSE);
54
55#include <sys/param.h>
56#include <sys/systm.h>
57#include <sys/sockio.h>
58#include <sys/mbuf.h>
59#include <sys/malloc.h>
60#include <sys/kernel.h>
61#include <sys/socket.h>

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

510 int unit, error = 0, rid;
511
512 sc = device_get_softc(dev);
513 unit = device_get_unit(dev);
514
515 /* Initialize our mutex. */
516 mtx_init(&sc->pcn_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
517 MTX_DEF | MTX_RECURSE);
518
518#ifndef BURN_BRIDGES
519 /*
520 * Handle power management nonsense.
521 */
522 if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
523 u_int32_t iobase, membase, irq;
524
525 /* Save important PCI config data. */
526 iobase = pci_read_config(dev, PCN_PCI_LOIO, 4);

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

533 pci_get_powerstate(dev));
534 pci_set_powerstate(dev, PCI_POWERSTATE_D0);
535
536 /* Restore PCI config data. */
537 pci_write_config(dev, PCN_PCI_LOIO, iobase, 4);
538 pci_write_config(dev, PCN_PCI_LOMEM, membase, 4);
539 pci_write_config(dev, PCN_PCI_INTLINE, irq, 4);
540 }
519 /*
520 * Handle power management nonsense.
521 */
522 if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
523 u_int32_t iobase, membase, irq;
524
525 /* Save important PCI config data. */
526 iobase = pci_read_config(dev, PCN_PCI_LOIO, 4);

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

533 pci_get_powerstate(dev));
534 pci_set_powerstate(dev, PCI_POWERSTATE_D0);
535
536 /* Restore PCI config data. */
537 pci_write_config(dev, PCN_PCI_LOIO, iobase, 4);
538 pci_write_config(dev, PCN_PCI_LOMEM, membase, 4);
539 pci_write_config(dev, PCN_PCI_INTLINE, irq, 4);
540 }
541
541#endif
542 /*
543 * Map control/status registers.
544 */
545 pci_enable_busmaster(dev);
546
547 rid = PCN_RID;
548 sc->pcn_res = bus_alloc_resource(dev, PCN_RES, &rid,
549 0, ~0, 1, RF_ACTIVE);

--- 891 unchanged lines hidden ---
542 /*
543 * Map control/status registers.
544 */
545 pci_enable_busmaster(dev);
546
547 rid = PCN_RID;
548 sc->pcn_res = bus_alloc_resource(dev, PCN_RES, &rid,
549 0, ~0, 1, RF_ACTIVE);

--- 891 unchanged lines hidden ---