Deleted Added
full compact
pccardvar.h (54250) pccardvar.h (55500)
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 54250 1999-12-07 06:44:38Z imp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccardvar.h 55500 2000-01-06 07:30:28Z 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

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

167};
168
169struct pccard_softc {
170
171 /* this stuff is for the socket */
172 pccard_chipset_tag_t pct;
173 pccard_chipset_handle_t pch;
174
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

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

167};
168
169struct pccard_softc {
170
171 /* this stuff is for the socket */
172 pccard_chipset_tag_t pct;
173 pccard_chipset_handle_t pch;
174
175 device_t dev;
176
175 /* this stuff is for the card */
176 struct pccard_card card;
177 void *ih;
177 /* this stuff is for the card */
178 struct pccard_card card;
179 void *ih;
178 int sc_enabled_count; /* how many functions are
179 enabled */
180 int sc_enabled_count; /* num functions enabled */
180
181 /*
182 * These are passed down from the PCCARD chip, and exist only
183 * so that cards with Very Special address allocation needs
184 * know what range they should be dealing with.
185 */
186 bus_addr_t iobase; /* start i/o space allocation here */
187 bus_size_t iosize; /* size of the i/o space range */

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

193struct pccard_cis_quirk {
194 int32_t manufacturer;
195 int32_t product;
196 char *cis1_info[4];
197 struct pccard_function *pf;
198 struct pccard_config_entry *cfe;
199};
200
181
182 /*
183 * These are passed down from the PCCARD chip, and exist only
184 * so that cards with Very Special address allocation needs
185 * know what range they should be dealing with.
186 */
187 bus_addr_t iobase; /* start i/o space allocation here */
188 bus_size_t iosize; /* size of the i/o space range */

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

194struct pccard_cis_quirk {
195 int32_t manufacturer;
196 int32_t product;
197 char *cis1_info[4];
198 struct pccard_function *pf;
199 struct pccard_config_entry *cfe;
200};
201
201struct pccard_attach_args {
202 int32_t manufacturer;
203 int32_t product;
204 struct pccard_card *card;
205 struct pccard_function *pf;
206};
207
208struct pccard_tuple {
209 unsigned int code;
210 unsigned int length;
211 u_long mult;
212 bus_addr_t ptr;
213 bus_space_tag_t memt;
214 bus_space_handle_t memh;
215};

--- 75 unchanged lines hidden ---
202struct pccard_tuple {
203 unsigned int code;
204 unsigned int length;
205 u_long mult;
206 bus_addr_t ptr;
207 bus_space_tag_t memt;
208 bus_space_handle_t memh;
209};

--- 75 unchanged lines hidden ---