Deleted Added
full compact
pccardvarp.h (170163) pccardvarp.h (188219)
1/*-
2 * Copyright (c) 2005, M. Warner Losh
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

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

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

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 * $FreeBSD: head/sys/dev/pccard/pccardvarp.h 170163 2007-05-31 19:29:20Z piso $
27 * $FreeBSD: head/sys/dev/pccard/pccardvarp.h 188219 2009-02-06 07:49:03Z imp $
28 */
29
30#ifndef _PCCARD_PCCARDVARP_H
31#define _PCCARD_PCCARDVARP_H
32
33/* pccard itself */
34
35#define PCCARD_MEM_PAGE_SIZE 1024

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

70 u_long cardaddr;
71 u_long hostaddr;
72 } memspace[2]; /* XXX this could be as high as 8 */
73 int maxtwins;
74 STAILQ_ENTRY(pccard_config_entry) cfe_list;
75};
76
77struct pccard_funce_disk {
28 */
29
30#ifndef _PCCARD_PCCARDVARP_H
31#define _PCCARD_PCCARDVARP_H
32
33/* pccard itself */
34
35#define PCCARD_MEM_PAGE_SIZE 1024

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

70 u_long cardaddr;
71 u_long hostaddr;
72 } memspace[2]; /* XXX this could be as high as 8 */
73 int maxtwins;
74 STAILQ_ENTRY(pccard_config_entry) cfe_list;
75};
76
77struct pccard_funce_disk {
78 int pfd_interface;
78 uint8_t pfd_interface;
79#define PFD_I_V_MASK 0x3
80#define PFD_I_V_NONE_REQUIRED 0x0
81#define PFD_I_V_REQ_MOD_ACC 0x1
82#define PFD_I_V_REQ_ACC 0x2
83#define PFD_I_V_REQ_ALWYS 0x1
84#define PFD_I_S 0x4 /* 0 rotating, 1 silicon */
85#define PFD_I_U 0x8 /* SN Uniq? */
86#define PFD_I_D 0x10 /* 0 - 1 drive, 1 - 2 drives */
87 uint8_t pfd_power;
88#define PFD_P_P0 0x1
89#define PFD_P_P1 0x2
90#define PFD_P_P2 0x4
91#define PFD_P_P3 0x8
92#define PFD_P_N 0x10 /* 3f7/377 excluded? */
93#define PFD_P_E 0x20 /* Index bit supported? */
94#define PFD_P_I 0x40 /* twincard */
79};
80
81struct pccard_funce_lan {
82 int pfl_nidlen;
83 uint8_t pfl_nid[8];
84};
85
86union pccard_funce {

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

114 int pf_flags;
115 driver_filter_t *intr_filter;
116 driver_intr_t *intr_handler;
117 void *intr_handler_arg;
118 void *intr_handler_cookie;
119
120 union pccard_funce pf_funce; /* CISTPL_FUNCE */
121#define pf_funce_disk_interface pf_funce.pfv_disk.pfd_interface
95};
96
97struct pccard_funce_lan {
98 int pfl_nidlen;
99 uint8_t pfl_nid[8];
100};
101
102union pccard_funce {

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

130 int pf_flags;
131 driver_filter_t *intr_filter;
132 driver_intr_t *intr_handler;
133 void *intr_handler_arg;
134 void *intr_handler_cookie;
135
136 union pccard_funce pf_funce; /* CISTPL_FUNCE */
137#define pf_funce_disk_interface pf_funce.pfv_disk.pfd_interface
138#define pf_funce_disk_power pf_funce.pfv_disk.pfd_power
122#define pf_funce_lan_nid pf_funce.pfv_lan.pfl_nid
123#define pf_funce_lan_nidlen pf_funce.pfv_lan.pfl_nidlen
124};
125
126/* pf_flags */
127#define PFF_ENABLED 0x0001 /* function is enabled */
128
129struct pccard_card {

--- 64 unchanged lines hidden ---
139#define pf_funce_lan_nid pf_funce.pfv_lan.pfl_nid
140#define pf_funce_lan_nidlen pf_funce.pfv_lan.pfl_nidlen
141};
142
143/* pf_flags */
144#define PFF_ENABLED 0x0001 /* function is enabled */
145
146struct pccard_card {

--- 64 unchanged lines hidden ---