Deleted Added
full compact
cardbus.c (92301) cardbus.c (97613)
1/*
2 * Copyright (c) 2000,2001 Jonathan Chen.
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

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

20 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
1/*
2 * Copyright (c) 2000,2001 Jonathan Chen.
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

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

20 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * $FreeBSD: head/sys/dev/cardbus/cardbus.c 92301 2002-03-15 06:41:01Z imp $
28 * $FreeBSD: head/sys/dev/cardbus/cardbus.c 97613 2002-05-30 17:38:00Z takawata $
29 */
30
31/*
32 * Cardbus Bus Driver
33 *
34 * much of the bus code was stolen directly from sys/pci/pci.c
35 * (Copyright (c) 1997, Stefan Esser <se@freebsd.org>)
36 *

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

50
51#include <sys/pciio.h>
52#include <dev/pci/pcivar.h>
53#include <dev/pci/pcireg.h>
54
55#include <dev/cardbus/cardbusreg.h>
56#include <dev/cardbus/cardbusvar.h>
57#include <dev/cardbus/cardbus_cis.h>
29 */
30
31/*
32 * Cardbus Bus Driver
33 *
34 * much of the bus code was stolen directly from sys/pci/pci.c
35 * (Copyright (c) 1997, Stefan Esser <se@freebsd.org>)
36 *

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

50
51#include <sys/pciio.h>
52#include <dev/pci/pcivar.h>
53#include <dev/pci/pcireg.h>
54
55#include <dev/cardbus/cardbusreg.h>
56#include <dev/cardbus/cardbusvar.h>
57#include <dev/cardbus/cardbus_cis.h>
58#include <dev/pccard/pccardvar.h>
58
59#include "power_if.h"
59
60#include "power_if.h"
60#include "card_if.h"
61#include "pcib_if.h"
62
63/* sysctl vars */
64SYSCTL_NODE(_hw, OID_AUTO, cardbus, CTLFLAG_RD, 0, "CardBus parameters");
65
66int cardbus_debug = 0;
67TUNABLE_INT("hw.cardbus.debug", &cardbus_debug);
68SYSCTL_INT(_hw_cardbus, OID_AUTO, debug, CTLFLAG_RW,

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

1231 "cardbus",
1232 cardbus_methods,
1233 0 /* no softc */
1234};
1235
1236static devclass_t cardbus_devclass;
1237
1238DRIVER_MODULE(cardbus, pccbb, cardbus_driver, cardbus_devclass, 0, 0);
61#include "pcib_if.h"
62
63/* sysctl vars */
64SYSCTL_NODE(_hw, OID_AUTO, cardbus, CTLFLAG_RD, 0, "CardBus parameters");
65
66int cardbus_debug = 0;
67TUNABLE_INT("hw.cardbus.debug", &cardbus_debug);
68SYSCTL_INT(_hw_cardbus, OID_AUTO, debug, CTLFLAG_RW,

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

1231 "cardbus",
1232 cardbus_methods,
1233 0 /* no softc */
1234};
1235
1236static devclass_t cardbus_devclass;
1237
1238DRIVER_MODULE(cardbus, pccbb, cardbus_driver, cardbus_devclass, 0, 0);
1239MODULE_VERSION(cardbus, 1);
1240MODULE_DEPEND(cardbus, exca, 1, 1, 1);
1239/*
1240MODULE_DEPEND(cardbus, pccbb, 1, 1, 1);
1241*/
1241/*
1242MODULE_DEPEND(cardbus, pccbb, 1, 1, 1);
1243*/