d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8696873dae
freebsd-skq/sys/dev/ed/if_edvar.h

290 lines
10 KiB
C
Raw Normal View History

Start each of the license/copyright comments with /*-, minor shuffle of lines
2005-01-06 01:43:34 +00:00
/*-
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice unmodified, this list of conditions, and the following
* disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
$Id$ -> $FreeBSD$
1999-09-05 15:21:05 +00:00
* $FreeBSD$
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
*/
Minor newbus/style(9) cleanups. o Move the ax88190 code to its own function. o Move all device_method_t, driver_t and DRIVER_MODULE definitions to the end of files. o Wrap a few lines > 80 characters. o Use the same devclass for all ed drivers. This allows machines with multiple types of cards to have their cards numbered correctly. Before, you could wind up with two ed0's. o Protect if_edvar.h from multiple includes because I was there.
2000-12-26 06:38:04 +00:00
#ifndef SYS_DEV_ED_IF_EDVAR_H
#define SYS_DEV_ED_IF_EDVAR_H
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
/*
* ed_softc: per line info and status
*/
struct ed_softc {
Stop embedding struct ifnet at the top of driver softcs. Instead the struct ifnet or the layer 2 common structure it was embedded in have been replaced with a struct ifnet pointer to be filled by a call to the new function, if_alloc(). The layer 2 common structure is also allocated via if_alloc() based on the interface type. It is hung off the new struct ifnet member, if_l2com. This change removes the size of these structures from the kernel ABI and will allow us to better manage them as interfaces come and go. Other changes of note: - Struct arpcom is no longer referenced in normal interface code. Instead the Ethernet address is accessed via the IFP2ENADDR() macro. To enforce this ac_enaddr has been renamed to _ac_enaddr. - The second argument to ether_ifattach is now always the mac address from driver private storage rather than sometimes being ac_enaddr. Reviewed by: sobomax, sam
2005-06-10 16:49:24 +00:00
struct ifnet *ifp;
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
struct ifmedia ifmedia; /* Media info */
device_t dev;
struct mtx sc_mtx;
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
char *type_str; /* pointer to type string */
u_char vendor; /* interface vendor */
u_char type; /* interface type code */
MFP4: Optimize the layout of softc somewhat. This groups the u_chars into larger sections. I'd like to move to having a flags word, but I need to make sure that there's no adverse locking problems.
2005-02-14 06:25:06 +00:00
u_char chip_type; /* the type of chip (one of ED_CHIP_TYPE_*) */
u_char isa16bit; /* width of access to card 0=8 or 1=16 */
u_char mem_shared; /* NIC memory is shared with host */
u_char xmit_busy; /* transmitter is busy */
Stop embedding struct ifnet at the top of driver softcs. Instead the struct ifnet or the layer 2 common structure it was embedded in have been replaced with a struct ifnet pointer to be filled by a call to the new function, if_alloc(). The layer 2 common structure is also allocated via if_alloc() based on the interface type. It is hung off the new struct ifnet member, if_l2com. This change removes the size of these structures from the kernel ABI and will allow us to better manage them as interfaces come and go. Other changes of note: - Struct arpcom is no longer referenced in normal interface code. Instead the Ethernet address is accessed via the IFP2ENADDR() macro. To enforce this ac_enaddr has been renamed to _ac_enaddr. - The second argument to ether_ifattach is now always the mac address from driver private storage rather than sometimes being ac_enaddr. Reviewed by: sobomax, sam
2005-06-10 16:49:24 +00:00
u_char enaddr[6];
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
int port_rid; /* resource id for port range */
int port_used; /* nonzero if ports used */
struct resource* port_res; /* resource for port range */
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_tag_t port_bst;
bus_space_handle_t port_bsh;
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
int mem_rid; /* resource id for memory range */
int mem_used; /* nonzero if memory used */
struct resource* mem_res; /* resource for memory range */
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_tag_t mem_bst;
bus_space_handle_t mem_bsh;
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
int irq_rid; /* resource id for irq */
struct resource* irq_res; /* resource for irq */
void* irq_handle; /* handle for irq handler */
It turns out that many of the ambicom cards have their CIS resources listed in different orders. Since it is easy to identify the Modem resources vs the Ethernet resources by looking at the size, use that rather than hard coded rids. For such parts, go ahead and guess which rid we should use based on the size. This guess appears reliable for the two example cards that I have with different CIS info.
2005-09-06 22:44:26 +00:00
int modem_rid; /* resource ID for modem part of device */
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
int (*sc_media_ioctl)(struct ed_softc *sc, struct ifreq *ifr,
u_long command);
void (*sc_mediachg)(struct ed_softc *);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
device_t miibus; /* MII bus for cards with MII. */
Remove __P.
2002-03-20 02:08:01 +00:00
void (*mii_writebits)(struct ed_softc *, u_int, int);
u_int (*mii_readbits)(struct ed_softc *, int);
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
struct callout tick_ch;
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
void (*sc_tick)(void *);
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
void (*readmem)(struct ed_softc *sc, bus_size_t src, uint8_t *dst,
uint16_t amount);
Have a function pointer to the routine to call for writing an mbuf into the card's memory. # this eliminates a more of the ifdef soup in if_ed and if_edvar # I've fixed the cbus drivers, but can't test them all easily. If I've broken anything, please let me know.
2006-01-27 19:10:13 +00:00
u_short (*sc_write_mbufs)(struct ed_softc *, struct mbuf *, bus_size_t);
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
int nic_offset; /* NIC (DS8390) I/O bus address offset */
int asic_offset; /* ASIC I/O bus address offset */
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
/*
* The following 'proto' variable is part of a work-around for 8013EBT asics
* being write-only. It's sort of a prototype/shadow of the real thing.
*/
u_char wd_laar_proto;
u_char cr_proto;
/*
* HP PC LAN PLUS card support.
*/
u_short hpp_options; /* flags controlling behaviour of the HP card */
u_short hpp_id; /* software revision and other fields */
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
caddr_t hpp_mem_start; /* Memory-mapped IO register address */
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
bus_size_t mem_start; /* NIC memory start address */
bus_size_t mem_end; /* NIC memory end address */
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
uint32_t mem_size; /* total NIC memory size */
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
bus_size_t mem_ring; /* start of RX ring-buffer (in NIC mem) */
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
u_char txb_cnt; /* number of transmit buffers */
u_char txb_inuse; /* number of TX buffers currently in-use */
u_char txb_new; /* pointer to where new buffer will be added */
u_char txb_next_tx; /* pointer to next buffer ready to xmit */
u_short txb_len[8]; /* buffered xmit buffer lengths */
u_char tx_page_start; /* first page of TX buffer area */
u_char rec_page_start; /* first page of RX ring-buffer */
u_char rec_page_stop; /* last page of RX ring-buffer */
u_char next_packet; /* pointer to next unread RX packet */
MFp4: o Implement a bunch of sysctl's to report the information that's now always reported. Mvoe reporting of that info to bootverbose, but maybe it can go away entirely. dev.ed.X.type: string name dev.ed.X.TxMem: amount of memory used for tx side of the card dev.ed.X.RxMem: amount of memory used for rx side of the card dev.ed.X.Mem: Total amount of mem on card. o Better comments about where NE-2000 (and clones) gets their MAC address from.
2006-06-12 04:30:42 +00:00
u_int tx_mem; /* Total amount of RAM for tx */
u_int rx_mem; /* Total amount of RAM for rx */
This is part of an untested set of changes to the ed driver to support the new PnP code. Since the bulk of the driver changes are not being committed at this time, it will not affect the driver. The code is being committed early to allow others synchronise changes.
1999-09-01 21:21:03 +00:00
struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */
};
- Remove the ISA, PCI, and PCCARD specific code from if_ed.c; it now lives in the respective bus front end files. - Add various function prototypes to if_edvar.h - Clean up some debugging code that snuck into if_ed_isa.c - Turn on the right bits in files.i386
1999-10-15 03:12:48 +00:00
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_nic_inb(sc, port) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_1(sc->port_bst, sc->port_bsh, (sc)->nic_offset + (port))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_nic_outb(sc, port, value) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_1(sc->port_bst, sc->port_bsh, \
(sc)->nic_offset + (port), (value))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_nic_inw(sc, port) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_2(sc->port_bst, sc->port_bsh, (sc)->nic_offset + (port))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_nic_outw(sc, port, value) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_2(sc->port_bst, sc->port_bsh, \
(sc)->nic_offset + (port), (value))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_nic_insb(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_multi_1(sc->port_bst, sc->port_bsh, \
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
(sc)->nic_offset + (port), (addr), (count))
#define ed_nic_outsb(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_multi_1(sc->port_bst, sc->port_bsh, \
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
(sc)->nic_offset + (port), (addr), (count))
#define ed_nic_insw(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_multi_2(sc->port_bst, sc->port_bsh, \
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
(sc)->nic_offset + (port), (uint16_t *)(addr), (count))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_nic_outsw(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_multi_2(sc->port_bst, sc->port_bsh, \
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
(sc)->nic_offset + (port), (uint16_t *)(addr), (count))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_nic_insl(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_multi_4(sc->port_bst, sc->port_bsh, \
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
(sc)->nic_offset + (port), (uint32_t *)(addr), (count))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_nic_outsl(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_multi_4(sc->port_bst, sc->port_bsh, \
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
(sc)->nic_offset + (port), (uint32_t *)(addr), (count))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_asic_inb(sc, port) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_1(sc->port_bst, sc->port_bsh, \
(sc)->asic_offset + (port))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_asic_outb(sc, port, value) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_1(sc->port_bst, sc->port_bsh, \
(sc)->asic_offset + (port), (value))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_asic_inw(sc, port) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_2(sc->port_bst, sc->port_bsh, \
(sc)->asic_offset + (port))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_asic_outw(sc, port, value) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_2(sc->port_bst, sc->port_bsh, \
(sc)->asic_offset + (port), (value))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_asic_insb(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_multi_1(sc->port_bst, sc->port_bsh, \
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
(sc)->asic_offset + (port), (addr), (count))
#define ed_asic_outsb(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_multi_1(sc->port_bst, sc->port_bsh, \
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
(sc)->asic_offset + (port), (addr), (count))
#define ed_asic_insw(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_multi_2(sc->port_bst, sc->port_bsh, \
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
(sc)->asic_offset + (port), (uint16_t *)(addr), (count))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_asic_outsw(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_multi_2(sc->port_bst, sc->port_bsh, \
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
(sc)->asic_offset + (port), (uint16_t *)(addr), (count))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_asic_insl(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_read_multi_4(sc->port_bst, sc->port_bsh, \
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
(sc)->asic_offset + (port), (uint32_t *)(addr), (count))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
#define ed_asic_outsl(sc, port, addr, count) \
MFp4: Optimize in/out macros. Cache the handle and tag in softc and use them in the macros. Since the rman_get_bus{tag,handle} transitioned from macros to function calls, this unpessimizes that conversion.
2005-02-22 05:12:25 +00:00
bus_space_write_multi_4(sc->port_bst, sc->port_bsh, \
MFp4: u_intXX_t to uintXX_t.
2005-01-19 07:37:32 +00:00
(sc)->asic_offset + (port), (uint32_t *)(addr), (count))
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
Fix style bugs introduced in the de__Pification of this code. Style bug generically noted by: bde
2005-02-08 05:41:54 +00:00
void ed_release_resources(device_t);
int ed_alloc_port(device_t, int, int);
int ed_alloc_memory(device_t, int, int);
int ed_alloc_irq(device_t, int, int);
int ed_probe_generic8390(struct ed_softc *);
int ed_probe_WD80x3(device_t, int, int);
use fixed types for the calls to ed_pio_readmem, ed_pio_writemem. Make the special hp versions match the general ones. Also use fixed types in the WD80x3_generic probe, and change callers' arrays to match. Fix a couple of minor style issues by using newstyle function definitions in a couple places.
2005-02-08 05:59:43 +00:00
int ed_probe_WD80x3_generic(device_t, int, uint16_t *[]);
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
int ed_probe_RTL80x9(device_t, int, int);
Minor optimizations to compile out bits that aren't necessary when certain options aren't enabled. Submitted by: Chiharu Shibata-san (chi at bd mbn or jp)
2005-02-20 18:44:45 +00:00
#ifdef ED_3C503
Fix style bugs introduced in the de__Pification of this code. Style bug generically noted by: bde
2005-02-08 05:41:54 +00:00
int ed_probe_3Com(device_t, int, int);
Minor optimizations to compile out bits that aren't necessary when certain options aren't enabled. Submitted by: Chiharu Shibata-san (chi at bd mbn or jp)
2005-02-20 18:44:45 +00:00
#endif
#ifdef ED_SIC
Fix style bugs introduced in the de__Pification of this code. Style bug generically noted by: bde
2005-02-08 05:41:54 +00:00
int ed_probe_SIC(device_t, int, int);
Minor optimizations to compile out bits that aren't necessary when certain options aren't enabled. Submitted by: Chiharu Shibata-san (chi at bd mbn or jp)
2005-02-20 18:44:45 +00:00
#endif
o Expose ed_probe_Novel_generic, it is useful for pccard case. o Fix a now stale comment. There are likely many others like them, but this one definitely hasn't been true since DELAY was introduced into the tree.
2005-09-07 03:20:33 +00:00
int ed_probe_Novell_generic(device_t, int);
Fix style bugs introduced in the de__Pification of this code. Style bug generically noted by: bde
2005-02-08 05:41:54 +00:00
int ed_probe_Novell(device_t, int, int);
Move the #defines from edreg to edvar which don't have anything to do with talking to the hardware.
2005-02-14 22:28:51 +00:00
void ed_Novell_read_mac(struct ed_softc *);
Minor optimizations to compile out bits that aren't necessary when certain options aren't enabled. Submitted by: Chiharu Shibata-san (chi at bd mbn or jp)
2005-02-20 18:44:45 +00:00
#ifdef ED_HPP
Fix style bugs introduced in the de__Pification of this code. Style bug generically noted by: bde
2005-02-08 05:41:54 +00:00
int ed_probe_HP_pclanp(device_t, int, int);
Minor optimizations to compile out bits that aren't necessary when certain options aren't enabled. Submitted by: Chiharu Shibata-san (chi at bd mbn or jp)
2005-02-20 18:44:45 +00:00
#endif
Fix style bugs introduced in the de__Pification of this code. Style bug generically noted by: bde
2005-02-08 05:41:54 +00:00
int ed_attach(device_t);
Make it possible to unload ed. Move the ed_pccard_detach routine to if_ed and rename it to ed_detach(). Tell other busses to use this routine for detach. Since I don't actually have any non-pccard ed hardware I can test with, I've only tested with my pccards. More improvements in this area likely are possible. Prodded by: rwatson
2005-02-08 05:45:35 +00:00
int ed_detach(device_t);
Convenience function to clear memory of the card, and then check to make sure that it works by reading back as 0.
2005-02-08 23:57:43 +00:00
int ed_clear_memory(device_t);
Break out obscure ISA cards into their own files, as well as ne2000 and wd80x3 support. Make the obscure ISA cards optional, and add those options to NOTES on i386 (note: the ifdef around the whole code is for module building). Tweak pc98 ed support to include wd80x3 too. Add goo for alpha too. The affected cards are the 3Com 3C503, HP LAN+ and SIC (whatever that is). I couldn't find any of these for sale on ebay, so they are untested. If you have one of these cards, and send it to me, I'll ensure that you have no future problems with it... Minor cleanups as well by using functions rather than cut and paste code for some probing operations (where the function call overhead is lost in the noise). Remove use of kvtop, since they aren't required anymore. This driver needs to get its memory mapped act together, however, and use bus space. It doesn't right now. This reduces the size of if_ed.ko from about 51k to 33k on my laptop.
2005-02-09 20:03:40 +00:00
int ed_isa_mem_ok(device_t, u_long, u_int); /* XXX isa specific */
Fix style bugs introduced in the de__Pification of this code. Style bug generically noted by: bde
2005-02-08 05:41:54 +00:00
void ed_stop(struct ed_softc *);
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
void ed_shmem_readmem16(struct ed_softc *, bus_size_t, uint8_t *, uint16_t);
void ed_shmem_readmem8(struct ed_softc *, bus_size_t, uint8_t *, uint16_t);
Have a function pointer to the routine to call for writing an mbuf into the card's memory. # this eliminates a more of the ifdef soup in if_ed and if_edvar # I've fixed the cbus drivers, but can't test them all easily. If I've broken anything, please let me know.
2006-01-27 19:10:13 +00:00
u_short ed_shmem_write_mbufs(struct ed_softc *, struct mbuf *, bus_size_t);
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
void ed_pio_readmem(struct ed_softc *, bus_size_t, uint8_t *, uint16_t);
use fixed types for the calls to ed_pio_readmem, ed_pio_writemem. Make the special hp versions match the general ones. Also use fixed types in the WD80x3_generic probe, and change callers' arrays to match. Fix a couple of minor style issues by using newstyle function definitions in a couple places.
2005-02-08 05:59:43 +00:00
void ed_pio_writemem(struct ed_softc *, uint8_t *, uint16_t, uint16_t);
Have a function pointer to the routine to call for writing an mbuf into the card's memory. # this eliminates a more of the ifdef soup in if_ed and if_edvar # I've fixed the cbus drivers, but can't test them all easily. If I've broken anything, please let me know.
2006-01-27 19:10:13 +00:00
u_short ed_pio_write_mbufs(struct ed_softc *, struct mbuf *, bus_size_t);
Break out obscure ISA cards into their own files, as well as ne2000 and wd80x3 support. Make the obscure ISA cards optional, and add those options to NOTES on i386 (note: the ifdef around the whole code is for module building). Tweak pc98 ed support to include wd80x3 too. Add goo for alpha too. The affected cards are the 3Com 3C503, HP LAN+ and SIC (whatever that is). I couldn't find any of these for sale on ebay, so they are untested. If you have one of these cards, and send it to me, I'll ensure that you have no future problems with it... Minor cleanups as well by using functions rather than cut and paste code for some probing operations (where the function call overhead is lost in the noise). Remove use of kvtop, since they aren't required anymore. This driver needs to get its memory mapped act together, however, and use bus space. It doesn't right now. This reduces the size of if_ed.ko from about 51k to 33k on my laptop.
2005-02-09 20:03:40 +00:00
Move enable/disable 16bit access routines into if_ed. Slightly pessmize the error recover path through edintr by calling these functions, rather than expanding it inline. This error path already does a lot in it, so an extra function call will be lost in the noise. It also happens rarely.
2005-02-10 23:48:13 +00:00
void ed_disable_16bit_access(struct ed_softc *);
void ed_enable_16bit_access(struct ed_softc *);
- Remove the ISA, PCI, and PCCARD specific code from if_ed.c; it now lives in the respective bus front end files. - Add various function prototypes to if_edvar.h - Clean up some debugging code that snuck into if_ed_isa.c - Turn on the right bits in files.i386
1999-10-15 03:12:48 +00:00
driver_intr_t edintr;
Minor newbus/style(9) cleanups. o Move the ax88190 code to its own function. o Move all device_method_t, driver_t and DRIVER_MODULE definitions to the end of files. o Wrap a few lines > 80 characters. o Use the same devclass for all ed drivers. This allows machines with multiple types of cards to have their cards numbered correctly. Before, you could wind up with two ed0's. o Protect if_edvar.h from multiple includes because I was there.
2000-12-26 06:38:04 +00:00
extern devclass_t ed_devclass;
Move the #defines from edreg to edvar which don't have anything to do with talking to the hardware.
2005-02-14 22:28:51 +00:00
/*
* Vendor types
*/
#define ED_VENDOR_WD_SMC 0x00 /* Western Digital/SMC */
#define ED_VENDOR_3COM 0x01 /* 3Com */
#define ED_VENDOR_NOVELL 0x02 /* Novell */
#define ED_VENDOR_HP 0x03 /* Hewlett Packard */
#define ED_VENDOR_SIC 0x04 /* Allied-Telesis SIC */
/*
minor nit in comment about what kind of flags these are
2006-01-27 07:51:26 +00:00
* Configure time flags
Move the #defines from edreg to edvar which don't have anything to do with talking to the hardware.
2005-02-14 22:28:51 +00:00
*/
/*
* this sets the default for enabling/disabling the transceiver
*/
#define ED_FLAGS_DISABLE_TRANCEIVER 0x0001
/*
* This forces the board to be used in 8/16bit mode even if it
* autoconfigs differently
*/
#define ED_FLAGS_FORCE_8BIT_MODE 0x0002
#define ED_FLAGS_FORCE_16BIT_MODE 0x0004
/*
* This disables the use of double transmit buffers.
*/
#define ED_FLAGS_NO_MULTI_BUFFERING 0x0008
/*
* This forces all operations with the NIC memory to use Programmed
* I/O (i.e. not via shared memory)
*/
#define ED_FLAGS_FORCE_PIO 0x0010
/*
* These are flags describing the chip type.
*/
#define ED_FLAGS_TOSH_ETHER 0x10000
#define ED_FLAGS_GWETHER 0x20000
#define ED_FLAGS_AX88190 0x30000
#define ED_FLAGS_LINKSYS 0x80000
#define ED_FLAGS_GETTYPE(flg) ((flg) & 0xff0000)
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
#define ED_MUTEX(_sc) (&(_sc)->sc_mtx)
#define ED_LOCK(_sc) mtx_lock(ED_MUTEX(_sc))
#define ED_UNLOCK(_sc) mtx_unlock(ED_MUTEX(_sc))
#define ED_LOCK_INIT(_sc) \
mtx_init(ED_MUTEX(_sc), device_get_nameunit(_sc->dev), \
MTX_NETWORK_LOCK, MTX_DEF)
#define ED_LOCK_DESTROY(_sc) mtx_destroy(ED_MUTEX(_sc));
#define ED_ASSERT_LOCKED(_sc) mtx_assert(ED_MUTEX(_sc), MA_OWNED);
#define ED_ASSERT_UNLOCKED(_sc) mtx_assert(ED_MUTEX(_sc), MA_NOTOWNED);
Minor newbus/style(9) cleanups. o Move the ax88190 code to its own function. o Move all device_method_t, driver_t and DRIVER_MODULE definitions to the end of files. o Wrap a few lines > 80 characters. o Use the same devclass for all ed drivers. This allows machines with multiple types of cards to have their cards numbered correctly. Before, you could wind up with two ed0's. o Protect if_edvar.h from multiple includes because I was there.
2000-12-26 06:38:04 +00:00
#endif /* SYS_DEV_ED_IF_EDVAR_H */
Reference in New Issue Copy Permalink