Deleted Added
full compact
if_csvar.h (140927) if_csvar.h (147256)
1/*-
2 * Copyright (c) 1999 M. Warner Losh <imp@village.org>
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

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

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

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

17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * $FreeBSD: head/sys/dev/cs/if_csvar.h 140927 2005-01-28 06:45:42Z imp $
25 * $FreeBSD: head/sys/dev/cs/if_csvar.h 147256 2005-06-10 16:49:24Z brooks $
26 */
27
28#ifndef _IF_CSVAR_H
29#define _IF_CSVAR_H
30
31#include <net/if_arp.h>
32#include <net/if_media.h>
33
34/*
35 * cs_softc: per line info and status
36 */
37struct cs_softc {
38 /* Ethernet common code */
26 */
27
28#ifndef _IF_CSVAR_H
29#define _IF_CSVAR_H
30
31#include <net/if_arp.h>
32#include <net/if_media.h>
33
34/*
35 * cs_softc: per line info and status
36 */
37struct cs_softc {
38 /* Ethernet common code */
39 struct arpcom arpcom;
39 struct ifnet *ifp;
40
41 /* Configuration words from EEPROM */
42 int auto_neg_cnf; /* AutoNegotitation configuration */
43 int adapter_cnf; /* Adapter configuration */
44 int isa_config; /* ISA configuration */
45 int chip_type; /* Type of chip */
46
40
41 /* Configuration words from EEPROM */
42 int auto_neg_cnf; /* AutoNegotitation configuration */
43 int adapter_cnf; /* Adapter configuration */
44 int isa_config; /* ISA configuration */
45 int chip_type; /* Type of chip */
46
47 u_char enaddr[6];
48
47 struct ifmedia media; /* Media information */
48
49 int port_rid; /* resource id for port range */
50 int port_used; /* nonzero if ports used */
51 struct resource* port_res; /* resource for port range */
52 int mem_rid; /* resource id for memory range */
53 int mem_used; /* nonzero if memory used */
54 struct resource* mem_res; /* resource for memory range */

--- 26 unchanged lines hidden ---
49 struct ifmedia media; /* Media information */
50
51 int port_rid; /* resource id for port range */
52 int port_used; /* nonzero if ports used */
53 struct resource* port_res; /* resource for port range */
54 int mem_rid; /* resource id for memory range */
55 int mem_used; /* nonzero if memory used */
56 struct resource* mem_res; /* resource for memory range */

--- 26 unchanged lines hidden ---