Deleted Added
sdiff udiff text old ( 59193 ) new ( 59389 )
full compact
pccardvar.h (59193) pccardvar.h (59389)
1/* $NetBSD: pcmciavar.h,v 1.9 1998/12/29 09:00:28 marc Exp $ */
1/* $NetBSD: pcmciavar.h,v 1.9 1998/12/29 09:00:28 marc Exp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccardvar.h 59193 2000-04-13 06:42:58Z imp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccardvar.h 59389 2000-04-19 08:31:21Z 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

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

30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/types.h>
34#include <sys/queue.h>
35
36#include <machine/bus.h>
37
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

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

30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/types.h>
34#include <sys/queue.h>
35
36#include <machine/bus.h>
37
38#include <dev/pccard/pccardchip.h>
39
40extern int pccard_verbose;
41
42/*
43 * Contains information about mapped/allocated i/o spaces.
44 */
45struct pccard_io_handle {
46 bus_space_tag_t iot; /* bus space tag (from chipset) */
47 bus_space_handle_t ioh; /* mapped space handle */

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

56/*
57 * Contains information about allocated memory space.
58 */
59struct pccard_mem_handle {
60 bus_space_tag_t memt; /* bus space tag (from chipset) */
61 bus_space_handle_t memh; /* mapped space handle */
62 bus_addr_t addr; /* resulting address in bus space */
63 bus_size_t size; /* size of mem space */
38extern int pccard_verbose;
39
40/*
41 * Contains information about mapped/allocated i/o spaces.
42 */
43struct pccard_io_handle {
44 bus_space_tag_t iot; /* bus space tag (from chipset) */
45 bus_space_handle_t ioh; /* mapped space handle */

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

54/*
55 * Contains information about allocated memory space.
56 */
57struct pccard_mem_handle {
58 bus_space_tag_t memt; /* bus space tag (from chipset) */
59 bus_space_handle_t memh; /* mapped space handle */
60 bus_addr_t addr; /* resulting address in bus space */
61 bus_size_t size; /* size of mem space */
64 pccard_mem_handle_t mhandle; /* opaque memory handle */
65 bus_size_t realsize; /* how much we really allocated */
66 long offset;
67 int kind;
68};
69
70/* pccard itself */
71
72#define PCCARD_CFE_MWAIT_REQUIRED 0x0001

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

121 STAILQ_HEAD(, pccard_config_entry) cfe_head;
122 STAILQ_ENTRY(pccard_function) pf_list;
123 /* run-time state */
124 struct pccard_softc *sc;
125 struct pccard_config_entry *cfe;
126 struct pccard_mem_handle pf_pcmh;
127#define pf_ccrt pf_pcmh.memt
128#define pf_ccrh pf_pcmh.memh
62 bus_size_t realsize; /* how much we really allocated */
63 long offset;
64 int kind;
65};
66
67/* pccard itself */
68
69#define PCCARD_CFE_MWAIT_REQUIRED 0x0001

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

118 STAILQ_HEAD(, pccard_config_entry) cfe_head;
119 STAILQ_ENTRY(pccard_function) pf_list;
120 /* run-time state */
121 struct pccard_softc *sc;
122 struct pccard_config_entry *cfe;
123 struct pccard_mem_handle pf_pcmh;
124#define pf_ccrt pf_pcmh.memt
125#define pf_ccrh pf_pcmh.memh
129#define pf_ccr_mhandle pf_pcmh.mhandle
130#define pf_ccr_realsize pf_pcmh.realsize
131 bus_addr_t pf_ccr_offset;
132 int pf_ccr_window;
133 long pf_mfc_iobase;
134 long pf_mfc_iomax;
135 int (*ih_fct)(void *);
136 void *ih_arg;
137 int ih_ipl;

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

156#define PCCARD_VENDOR_INVALID -1
157 int32_t product;
158#define PCCARD_PRODUCT_INVALID -1
159 u_int16_t error;
160#define PCCARD_CIS_INVALID { NULL, NULL, NULL, NULL }
161 STAILQ_HEAD(, pccard_function) pf_head;
162};
163
126#define pf_ccr_realsize pf_pcmh.realsize
127 bus_addr_t pf_ccr_offset;
128 int pf_ccr_window;
129 long pf_mfc_iobase;
130 long pf_mfc_iomax;
131 int (*ih_fct)(void *);
132 void *ih_arg;
133 int ih_ipl;

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

152#define PCCARD_VENDOR_INVALID -1
153 int32_t product;
154#define PCCARD_PRODUCT_INVALID -1
155 u_int16_t error;
156#define PCCARD_CIS_INVALID { NULL, NULL, NULL, NULL }
157 STAILQ_HEAD(, pccard_function) pf_head;
158};
159
160#define PCCARD_MEM_ATTR 1
161#define PCCARD_MEM_COMMON 2
162
163#define PCCARD_WIDTH_AUTO 0
164#define PCCARD_WIDTH_IO8 1
165#define PCCARD_WIDTH_IO16 2
166
164/* More later? */
165struct pccard_ivar {
166 struct resource_list resources;
167 int slotnum;
168};
169
170struct pccard_softc {
171 device_t dev;

--- 117 unchanged lines hidden --- 		167/* More later? */
168struct pccard_ivar {
169 struct resource_list resources;
170 int slotnum;
171};
172
173struct pccard_softc {
174 device_t dev;

--- 117 unchanged lines hidden ---