Deleted Added
full compact
pccbbvar.h (82375) pccbbvar.h (82378)
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/pccbb/pccbbvar.h 82375 2001-08-26 23:55:34Z jon $
28 * $FreeBSD: head/sys/dev/pccbb/pccbbvar.h 82378 2001-08-27 00:09:42Z jon $
29 */
30
31/*
32 * Structure definitions for the Cardbus Bridge driver
33 */
34
35struct intrhand {
36 void(*func)(void*arg);

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

43 u_int32_t socket_mask;
44 u_int32_t socket_state;
45 u_int32_t socket_force;
46 u_int32_t socket_control;
47 u_int32_t socket_power;
48};
49
50struct pccbb_reslist {
29 */
30
31/*
32 * Structure definitions for the Cardbus Bridge driver
33 */
34
35struct intrhand {
36 void(*func)(void*arg);

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

43 u_int32_t socket_mask;
44 u_int32_t socket_state;
45 u_int32_t socket_force;
46 u_int32_t socket_control;
47 u_int32_t socket_power;
48};
49
50struct pccbb_reslist {
51 SLIST_ENTRY(pccbb_reslist) entries;
51 SLIST_ENTRY(pccbb_reslist) link;
52 struct resource *res;
52 int type;
53 int rid;
53 int type;
54 int rid;
54 u_int32_t start;
55 u_int32_t end;
56 device_t odev;
57 int win;
55 /* note: unlike the regular resource list, there can be
56 * duplicate rid's in the same list. However, the
57 * combination of rid and res->r_dev should be unique.
58 */
59 bus_addr_t cardaddr; /* for 16-bit pccard memory */
58};
59
60#define PCCBB_AUTO_OPEN_SMALLHOLE 0x100
61
62struct pccbb_softc {
63 device_t sc_dev;
64 struct resource *sc_base_res;
65 struct resource *sc_irq_res;

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

114#define CARD_VCC_0V 0x0004
115#define CARD_VCC_5V 0x0005
116#define CARD_VCCMASK 0x000f
117#define CARD_VPP_UC 0x0000
118#define CARD_VPP_VCC 0x0010
119#define CARD_VPP_12V 0x0030
120#define CARD_VPP_0V 0x0040
121#define CARD_VPPMASK 0x00f0
60};
61
62#define PCCBB_AUTO_OPEN_SMALLHOLE 0x100
63
64struct pccbb_softc {
65 device_t sc_dev;
66 struct resource *sc_base_res;
67 struct resource *sc_irq_res;

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

116#define CARD_VCC_0V 0x0004
117#define CARD_VCC_5V 0x0005
118#define CARD_VCCMASK 0x000f
119#define CARD_VPP_UC 0x0000
120#define CARD_VPP_VCC 0x0010
121#define CARD_VPP_12V 0x0030
122#define CARD_VPP_0V 0x0040
123#define CARD_VPPMASK 0x00f0
122
123/* XXX: rman is dumb */
124#define CARDBUS_SYS_RES_MEMORY_START 0x44000000
125#define CARDBUS_SYS_RES_MEMORY_END 0xEFFFFFFF
126#define CARDBUS_SYS_RES_IOPORT_START 0x3000
127#define CARDBUS_SYS_RES_IOPORT_END 0xEFFF
128