Deleted Added
sdiff udiff text old ( 59389 ) new ( 60833 )
full compact
pccardvar.h (59389) pccardvar.h (60833)
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 59389 2000-04-19 08:31:21Z imp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccardvar.h 60833 2000-05-23 20:41:01Z jake $ */
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

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

98 u_int16_t irqmask;
99 int num_memspace;
100 struct {
101 u_long length;
102 u_long cardaddr;
103 u_long hostaddr;
104 } memspace[2]; /* XXX this could be as high as 8 */
105 int maxtwins;
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

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

98 u_int16_t irqmask;
99 int num_memspace;
100 struct {
101 u_long length;
102 u_long cardaddr;
103 u_long hostaddr;
104 } memspace[2]; /* XXX this could be as high as 8 */
105 int maxtwins;
106 STAILQ_ENTRY(pccard_config_entry) cfe_list;
106 STAILQ_ENTRY(struct pccard_config_entry) cfe_list;
107};
108
109struct pccard_function {
110 /* read off the card */
111 int number;
112 int function;
113 int last_config_index;
114 u_long ccr_base;
115 u_long ccr_mask;
116 struct resource *ccr_res;
117 int ccr_rid;
107};
108
109struct pccard_function {
110 /* read off the card */
111 int number;
112 int function;
113 int last_config_index;
114 u_long ccr_base;
115 u_long ccr_mask;
116 struct resource *ccr_res;
117 int ccr_rid;
118 STAILQ_HEAD(, pccard_config_entry) cfe_head;
119 STAILQ_ENTRY(pccard_function) pf_list;
118 STAILQ_HEAD(, struct pccard_config_entry) cfe_head;
119 STAILQ_ENTRY(struct 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
126#define pf_ccr_realsize pf_pcmh.realsize
127 bus_addr_t pf_ccr_offset;

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

149 * indicates no id was found.
150 */
151 int32_t manufacturer;
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 }
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
126#define pf_ccr_realsize pf_pcmh.realsize
127 bus_addr_t pf_ccr_offset;

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

149 * indicates no id was found.
150 */
151 int32_t manufacturer;
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;
157 STAILQ_HEAD(, struct 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

--- 126 unchanged lines hidden --- 		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

--- 126 unchanged lines hidden ---