Cleanup, make things static.

This commit is contained in:
phk 1995-10-31 18:41:49 +00:00
parent 4a33745158
commit b068a32fbf
10 changed files with 212 additions and 203 deletions

View File

@ -13,7 +13,7 @@
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
* and a variety of similar clones.
*
* $Id: if_ed.c,v 1.81 1995/10/28 15:39:01 phk Exp $
* $Id: if_ed.c,v 1.82 1995/10/28 22:46:26 pst Exp $
*/
#include "ed.h"
@ -107,21 +107,21 @@ struct ed_softc {
struct kern_devconf kdc; /* kernel configuration database info */
} ed_softc[NED];
int ed_attach(struct isa_device *);
void ed_init(int);
static int ed_attach(struct isa_device *);
static void ed_init(int);
void edintr(int);
int ed_ioctl(struct ifnet *, int, caddr_t);
int ed_probe(struct isa_device *);
void ed_start(struct ifnet *);
void ed_reset(int);
void ed_watchdog(int);
int ed_probe_generic8390(struct ed_softc *);
int ed_probe_WD80x3(struct isa_device *);
int ed_probe_3Com(struct isa_device *);
int ed_probe_Novell(struct isa_device *);
int ed_probe_pccard(struct isa_device *, u_char *);
static int ed_ioctl(struct ifnet *, int, caddr_t);
static int ed_probe(struct isa_device *);
static void ed_start(struct ifnet *);
static void ed_reset(int);
static void ed_watchdog(int);
static int ed_probe_generic8390(struct ed_softc *);
static int ed_probe_WD80x3(struct isa_device *);
static int ed_probe_3Com(struct isa_device *);
static int ed_probe_Novell(struct isa_device *);
static int ed_probe_pccard(struct isa_device *, u_char *);
void ds_getmcaf();
static void ds_getmcaf();
static void ed_get_packet(struct ed_softc *, char *, int /* u_short */ , int);
static void ed_stop(int);
@ -130,10 +130,11 @@ static inline void ed_rint();
static inline void ed_xmit();
static inline char *ed_ring_copy();
void ed_pio_readmem(), ed_pio_writemem();
u_short ed_pio_write_mbufs();
static void ed_pio_readmem(), ed_pio_writemem();
static u_short ed_pio_write_mbufs();
void ed_setrcr(struct ifnet *, struct ed_softc *);
static void ed_setrcr(struct ifnet *, struct ed_softc *);
static u_long ds_crc(u_char *ep);
#include "crd.h"
#if NCRD > 0
@ -144,8 +145,8 @@ void ed_setrcr(struct ifnet *, struct ed_softc *);
* PC-Card (PCMCIA) specific code.
*/
static int card_intr(struct pccard_dev *); /* Interrupt handler */
void edunload(struct pccard_dev *); /* Disable driver */
void edsuspend(struct pccard_dev *); /* Suspend driver */
static void edunload(struct pccard_dev *); /* Disable driver */
static void edsuspend(struct pccard_dev *); /* Suspend driver */
static int edinit(struct pccard_dev *, int); /* init device */
static struct pccard_drv ed_info =
@ -166,7 +167,7 @@ static struct pccard_drv ed_info =
* edinit with first=0. This is called when the user suspends
* the system, or the APM code suspends the system.
*/
void
static void
edsuspend(struct pccard_dev *dp)
{
printf("ed%d: suspending\n", dp->isahd.id_unit);
@ -177,10 +178,9 @@ edsuspend(struct pccard_dev *dp)
* the device's existence before initialising it.
* Once initialised, the device table may be set up.
*/
int
static int
edinit(struct pccard_dev *dp, int first)
{
int s;
struct ed_softc *sc = &ed_softc[dp->isahd.id_unit];
/*
* validate unit number.
@ -219,7 +219,7 @@ edinit(struct pccard_dev *dp, int first)
* and ensure that any driver entry points such as
* read and write do not hang.
*/
void
static void
edunload(struct pccard_dev *dp)
{
struct ed_softc *sc = &ed_softc[dp->isahd.id_unit];
@ -2788,7 +2788,7 @@ ed_setrcr(ifp, sc)
/*
* Compute crc for ethernet address
*/
u_long
static u_long
ds_crc(ep)
u_char *ep;
{

View File

@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: i82586.h,v 1.1 1993/10/12 06:53:10 rgrimes Exp $
*/
/*
@ -309,14 +309,14 @@ ie_setup_config(volatile struct ie_config_cmd *cmd,
cmd->ie_junk = 0xff;
}
inline caddr_t
static inline caddr_t
Align(caddr_t ptr) {
unsigned long l = (unsigned long)ptr;
l = (l + 3) & ~3L;
return (caddr_t)l;
}
inline void
static inline void
ie_ack(volatile struct ie_sys_ctl_block *scb,
u_int mask, int unit,
void (*ca)(int)) {

View File

@ -128,18 +128,20 @@ struct lnc_softc {
} lnc_softc[NLNC];
/* Function prototypes */
int bicc_probe(struct isa_device *);
int depca_probe(struct isa_device *);
int lance_probe(int);
int ne2100_probe(struct isa_device *);
int pcnet_probe(int);
void lnc_init(int);
void lnc_start(struct ifnet *);
int lnc_ioctl(struct ifnet *, int, caddr_t);
void lnc_watchdog(int);
int lnc_probe(struct isa_device *);
int lnc_attach(struct isa_device *);
void lnc_dump_state(int);
static int bicc_probe(struct isa_device *);
static int depca_probe(struct isa_device *);
static int lance_probe(int);
static int ne2100_probe(struct isa_device *);
static int pcnet_probe(int);
static void lnc_init(int);
static void lnc_start(struct ifnet *);
static int lnc_ioctl(struct ifnet *, int, caddr_t);
static void lnc_watchdog(int);
static int lnc_probe(struct isa_device *);
static int lnc_attach(struct isa_device *);
#ifdef DEBUG
static void lnc_dump_state(int);
#endif /* DEBUG */
struct isa_driver lncdriver = {lnc_probe, lnc_attach, "lnc"};
@ -214,25 +216,27 @@ lnc_registerdev(struct isa_device *isa_dev)
}
void
#ifdef notyet
static void
lnc_setladrf(struct ifnet *ifp, struct lnc_softc *sc)
{
}
#endif /* notyet */
void
static void
lnc_stop(int unit)
{
write_csr(unit, CSR0, STOP);
}
void
static void
lnc_reset(int unit)
{
lnc_init(unit);
}
void
static void
lnc_free_mbufs(struct lnc_softc *sc)
{
int i;
@ -254,7 +258,7 @@ lnc_free_mbufs(struct lnc_softc *sc)
m_freem(sc->mbufs);
}
inline int
static inline int
alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc)
{
register struct mds *md = desc->md;
@ -287,7 +291,7 @@ alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc)
return(0);
}
inline struct mbuf *
static inline struct mbuf *
chain_mbufs(struct lnc_softc *sc, int start_of_packet, int pkt_len)
{
struct mbuf *head, *m;
@ -321,7 +325,7 @@ chain_mbufs(struct lnc_softc *sc, int start_of_packet, int pkt_len)
return(head);
}
inline struct mbuf *
static inline struct mbuf *
mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
{
@ -396,7 +400,7 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
}
inline void
static inline void
lnc_rint(int unit)
{
register struct lnc_softc *sc = &lnc_softc[unit];
@ -586,7 +590,7 @@ lnc_rint(int unit)
outw(sc->rdp, RINT | INEA);
}
inline void
static inline void
lnc_tint(int unit)
{
register struct lnc_softc *sc = &lnc_softc[unit];
@ -821,7 +825,7 @@ lnc_tint(int unit)
}
int
static int
lnc_probe(struct isa_device * isa_dev)
{
int nports;
@ -849,7 +853,7 @@ lnc_probe(struct isa_device * isa_dev)
return (0);
}
int
static int
ne2100_probe(struct isa_device * isa_dev)
{
struct lnc_softc *sc = &lnc_softc[isa_dev->id_unit];
@ -876,7 +880,7 @@ ne2100_probe(struct isa_device * isa_dev)
}
}
int
static int
bicc_probe(struct isa_device * isa_dev)
{
struct lnc_softc *sc = &lnc_softc[isa_dev->id_unit];
@ -919,7 +923,7 @@ int i;
* you get the next byte in the ring. The mac address is stored after a
* signature so keep searching for the signature first.
*/
int
static int
dec_macaddr_extract(u_char ring[], struct lnc_softc * sc)
{
const unsigned char signature[] = {0xff, 0x00, 0x55, 0xaa, 0xff, 0x00, 0x55, 0xaa};
@ -945,7 +949,7 @@ dec_macaddr_extract(u_char ring[], struct lnc_softc * sc)
return (0);
}
int
static int
depca_probe(struct isa_device * isa_dev)
{
int i;
@ -970,7 +974,7 @@ depca_probe(struct isa_device * isa_dev)
return (0);
}
int
static int
lance_probe(int unit)
{
write_csr(unit, CSR0, STOP);
@ -990,7 +994,7 @@ lance_probe(int unit)
return (UNKNOWN);
}
int
static int
pcnet_probe(int unit)
{
u_long chip_id;
@ -1026,7 +1030,7 @@ pcnet_probe(int unit)
return (type);
}
int
static int
lnc_attach(struct isa_device * isa_dev)
{
struct lnc_softc *sc = &lnc_softc[isa_dev->id_unit];
@ -1113,7 +1117,7 @@ lnc_attach(struct isa_device * isa_dev)
return (1);
}
void
static void
lnc_init(int unit)
{
struct lnc_softc *sc = &lnc_softc[unit];
@ -1371,7 +1375,7 @@ lncintr(int unit)
inline int
static inline int
mbuf_to_buffer(struct mbuf *m, char *buffer)
{
@ -1386,7 +1390,7 @@ mbuf_to_buffer(struct mbuf *m, char *buffer)
return(len);
}
inline struct mbuf *
static inline struct mbuf *
chain_to_cluster(struct mbuf *m)
{
struct mbuf *new;
@ -1411,7 +1415,7 @@ chain_to_cluster(struct mbuf *m)
* flags should be ok at those points too.
*/
void
static void
lnc_start(struct ifnet *ifp)
{
@ -1569,7 +1573,7 @@ lnc_start(struct ifnet *ifp)
LNCSTATS(trans_ring_full)
}
int
static int
lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
{
@ -1663,7 +1667,7 @@ lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
return error;
}
void
static void
lnc_watchdog(int unit)
{
log(LOG_ERR, "lnc%d: Device timeout -- Resetting\n", unit);
@ -1672,7 +1676,7 @@ lnc_watchdog(int unit)
}
#ifdef DEBUG
void
static void
lnc_dump_state(int unit)
{
struct lnc_softc *sc = &lnc_softc[unit];
@ -1723,7 +1727,7 @@ lnc_dump_state(int unit)
outw(sc->rap, CSR0);
}
void
static void
mbuf_dump_chain(struct mbuf * m)
{

View File

@ -100,12 +100,12 @@
#define TRANS_MD3 \
"\20\6BUFF\5UFLO\4RES\3LCOL\2LCAR\1RTRY"
char *nic_ident[] = {"Unknown",
static char *nic_ident[] = {"Unknown",
"BICC",
"NE2100",
"DEPCA"};
char *ic_ident[] = {"Unknown",
static char *ic_ident[] = {"Unknown",
"LANCE, Am7990",
"C-LANCE, Am79C90",
"PCnet-ISA, Am79C960",

View File

@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: i82586.h,v 1.1 1993/10/12 06:53:10 rgrimes Exp $
*/
/*
@ -309,14 +309,14 @@ ie_setup_config(volatile struct ie_config_cmd *cmd,
cmd->ie_junk = 0xff;
}
inline caddr_t
static inline caddr_t
Align(caddr_t ptr) {
unsigned long l = (unsigned long)ptr;
l = (l + 3) & ~3L;
return (caddr_t)l;
}
inline void
static inline void
ie_ack(volatile struct ie_sys_ctl_block *scb,
u_int mask, int unit,
void (*ca)(int)) {

View File

@ -13,7 +13,7 @@
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
* and a variety of similar clones.
*
* $Id: if_ed.c,v 1.81 1995/10/28 15:39:01 phk Exp $
* $Id: if_ed.c,v 1.82 1995/10/28 22:46:26 pst Exp $
*/
#include "ed.h"
@ -107,21 +107,21 @@ struct ed_softc {
struct kern_devconf kdc; /* kernel configuration database info */
} ed_softc[NED];
int ed_attach(struct isa_device *);
void ed_init(int);
static int ed_attach(struct isa_device *);
static void ed_init(int);
void edintr(int);
int ed_ioctl(struct ifnet *, int, caddr_t);
int ed_probe(struct isa_device *);
void ed_start(struct ifnet *);
void ed_reset(int);
void ed_watchdog(int);
int ed_probe_generic8390(struct ed_softc *);
int ed_probe_WD80x3(struct isa_device *);
int ed_probe_3Com(struct isa_device *);
int ed_probe_Novell(struct isa_device *);
int ed_probe_pccard(struct isa_device *, u_char *);
static int ed_ioctl(struct ifnet *, int, caddr_t);
static int ed_probe(struct isa_device *);
static void ed_start(struct ifnet *);
static void ed_reset(int);
static void ed_watchdog(int);
static int ed_probe_generic8390(struct ed_softc *);
static int ed_probe_WD80x3(struct isa_device *);
static int ed_probe_3Com(struct isa_device *);
static int ed_probe_Novell(struct isa_device *);
static int ed_probe_pccard(struct isa_device *, u_char *);
void ds_getmcaf();
static void ds_getmcaf();
static void ed_get_packet(struct ed_softc *, char *, int /* u_short */ , int);
static void ed_stop(int);
@ -130,10 +130,11 @@ static inline void ed_rint();
static inline void ed_xmit();
static inline char *ed_ring_copy();
void ed_pio_readmem(), ed_pio_writemem();
u_short ed_pio_write_mbufs();
static void ed_pio_readmem(), ed_pio_writemem();
static u_short ed_pio_write_mbufs();
void ed_setrcr(struct ifnet *, struct ed_softc *);
static void ed_setrcr(struct ifnet *, struct ed_softc *);
static u_long ds_crc(u_char *ep);
#include "crd.h"
#if NCRD > 0
@ -144,8 +145,8 @@ void ed_setrcr(struct ifnet *, struct ed_softc *);
* PC-Card (PCMCIA) specific code.
*/
static int card_intr(struct pccard_dev *); /* Interrupt handler */
void edunload(struct pccard_dev *); /* Disable driver */
void edsuspend(struct pccard_dev *); /* Suspend driver */
static void edunload(struct pccard_dev *); /* Disable driver */
static void edsuspend(struct pccard_dev *); /* Suspend driver */
static int edinit(struct pccard_dev *, int); /* init device */
static struct pccard_drv ed_info =
@ -166,7 +167,7 @@ static struct pccard_drv ed_info =
* edinit with first=0. This is called when the user suspends
* the system, or the APM code suspends the system.
*/
void
static void
edsuspend(struct pccard_dev *dp)
{
printf("ed%d: suspending\n", dp->isahd.id_unit);
@ -177,10 +178,9 @@ edsuspend(struct pccard_dev *dp)
* the device's existence before initialising it.
* Once initialised, the device table may be set up.
*/
int
static int
edinit(struct pccard_dev *dp, int first)
{
int s;
struct ed_softc *sc = &ed_softc[dp->isahd.id_unit];
/*
* validate unit number.
@ -219,7 +219,7 @@ edinit(struct pccard_dev *dp, int first)
* and ensure that any driver entry points such as
* read and write do not hang.
*/
void
static void
edunload(struct pccard_dev *dp)
{
struct ed_softc *sc = &ed_softc[dp->isahd.id_unit];
@ -2788,7 +2788,7 @@ ed_setrcr(ifp, sc)
/*
* Compute crc for ethernet address
*/
u_long
static u_long
ds_crc(ep)
u_char *ep;
{

View File

@ -28,7 +28,7 @@
* (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: if_ix.c,v 1.11 1995/10/26 20:29:45 julian Exp $
* $Id: if_ix.c,v 1.12 1995/10/28 15:39:06 phk Exp $
*/
#include "ix.h"
@ -145,30 +145,30 @@ int ixdebug=IXDEBUG;
static inline void ixinterrupt_enable(int);
static inline void ixinterrupt_disable(int);
static inline void ixchannel_attention(int);
u_short ixacknowledge(int);
int ix_cb_wait(cb_t *, char *);
int ix_scb_wait(scb_t *, u_short, char *);
int ixprobe(struct isa_device *);
int ixattach(struct isa_device *);
void ixinit(int);
void ixinit_rfa(int);
void ixinit_tfa(int);
static u_short ixacknowledge(int);
static int ix_cb_wait(cb_t *, char *);
static int ix_scb_wait(scb_t *, u_short, char *);
static int ixprobe(struct isa_device *);
static int ixattach(struct isa_device *);
static void ixinit(int);
static void ixinit_rfa(int);
static void ixinit_tfa(int);
inthand2_t ixintr;
static inline void ixintr_cx(int);
static inline void ixintr_cx_free(int, cb_t *);
static inline void ixintr_fr(int);
static inline void ixintr_fr_copy(int, rfd_t *);
static inline void ixintr_fr_free(int, rfd_t *);
void ixstart(struct ifnet *);
int ixstop(struct ifnet *);
int ixdone(struct ifnet *);
int ixioctl(struct ifnet *, int, caddr_t);
void ixreset(int);
void ixwatchdog(int);
u_short ixeeprom_read(int, int);
void ixeeprom_outbits(int, int, int);
int ixeeprom_inbits(int);
void ixeeprom_clock(int, int);
static void ixstart(struct ifnet *);
static int ixstop(struct ifnet *);
static int ixdone(struct ifnet *);
static int ixioctl(struct ifnet *, int, caddr_t);
static void ixreset(int);
static void ixwatchdog(int);
static u_short ixeeprom_read(int, int);
static void ixeeprom_outbits(int, int, int);
static int ixeeprom_inbits(int);
static void ixeeprom_clock(int, int);
/*
RRR */
@ -515,7 +515,7 @@ ixprobe(struct isa_device *dvp) {
}
sc->irq_encoded = irq_encode[ffs(irq) - 1];
if (sc->irq_encoded == 0) {
printf("ix%d: invalid irq (%d)\n", ffs(irq) - 1);
printf("ix%d: invalid irq (%d)\n", unit, ffs(irq) - 1);
goto ixprobe_exit;
}

View File

@ -128,18 +128,20 @@ struct lnc_softc {
} lnc_softc[NLNC];
/* Function prototypes */
int bicc_probe(struct isa_device *);
int depca_probe(struct isa_device *);
int lance_probe(int);
int ne2100_probe(struct isa_device *);
int pcnet_probe(int);
void lnc_init(int);
void lnc_start(struct ifnet *);
int lnc_ioctl(struct ifnet *, int, caddr_t);
void lnc_watchdog(int);
int lnc_probe(struct isa_device *);
int lnc_attach(struct isa_device *);
void lnc_dump_state(int);
static int bicc_probe(struct isa_device *);
static int depca_probe(struct isa_device *);
static int lance_probe(int);
static int ne2100_probe(struct isa_device *);
static int pcnet_probe(int);
static void lnc_init(int);
static void lnc_start(struct ifnet *);
static int lnc_ioctl(struct ifnet *, int, caddr_t);
static void lnc_watchdog(int);
static int lnc_probe(struct isa_device *);
static int lnc_attach(struct isa_device *);
#ifdef DEBUG
static void lnc_dump_state(int);
#endif /* DEBUG */
struct isa_driver lncdriver = {lnc_probe, lnc_attach, "lnc"};
@ -214,25 +216,27 @@ lnc_registerdev(struct isa_device *isa_dev)
}
void
#ifdef notyet
static void
lnc_setladrf(struct ifnet *ifp, struct lnc_softc *sc)
{
}
#endif /* notyet */
void
static void
lnc_stop(int unit)
{
write_csr(unit, CSR0, STOP);
}
void
static void
lnc_reset(int unit)
{
lnc_init(unit);
}
void
static void
lnc_free_mbufs(struct lnc_softc *sc)
{
int i;
@ -254,7 +258,7 @@ lnc_free_mbufs(struct lnc_softc *sc)
m_freem(sc->mbufs);
}
inline int
static inline int
alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc)
{
register struct mds *md = desc->md;
@ -287,7 +291,7 @@ alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc)
return(0);
}
inline struct mbuf *
static inline struct mbuf *
chain_mbufs(struct lnc_softc *sc, int start_of_packet, int pkt_len)
{
struct mbuf *head, *m;
@ -321,7 +325,7 @@ chain_mbufs(struct lnc_softc *sc, int start_of_packet, int pkt_len)
return(head);
}
inline struct mbuf *
static inline struct mbuf *
mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
{
@ -396,7 +400,7 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
}
inline void
static inline void
lnc_rint(int unit)
{
register struct lnc_softc *sc = &lnc_softc[unit];
@ -586,7 +590,7 @@ lnc_rint(int unit)
outw(sc->rdp, RINT | INEA);
}
inline void
static inline void
lnc_tint(int unit)
{
register struct lnc_softc *sc = &lnc_softc[unit];
@ -821,7 +825,7 @@ lnc_tint(int unit)
}
int
static int
lnc_probe(struct isa_device * isa_dev)
{
int nports;
@ -849,7 +853,7 @@ lnc_probe(struct isa_device * isa_dev)
return (0);
}
int
static int
ne2100_probe(struct isa_device * isa_dev)
{
struct lnc_softc *sc = &lnc_softc[isa_dev->id_unit];
@ -876,7 +880,7 @@ ne2100_probe(struct isa_device * isa_dev)
}
}
int
static int
bicc_probe(struct isa_device * isa_dev)
{
struct lnc_softc *sc = &lnc_softc[isa_dev->id_unit];
@ -919,7 +923,7 @@ int i;
* you get the next byte in the ring. The mac address is stored after a
* signature so keep searching for the signature first.
*/
int
static int
dec_macaddr_extract(u_char ring[], struct lnc_softc * sc)
{
const unsigned char signature[] = {0xff, 0x00, 0x55, 0xaa, 0xff, 0x00, 0x55, 0xaa};
@ -945,7 +949,7 @@ dec_macaddr_extract(u_char ring[], struct lnc_softc * sc)
return (0);
}
int
static int
depca_probe(struct isa_device * isa_dev)
{
int i;
@ -970,7 +974,7 @@ depca_probe(struct isa_device * isa_dev)
return (0);
}
int
static int
lance_probe(int unit)
{
write_csr(unit, CSR0, STOP);
@ -990,7 +994,7 @@ lance_probe(int unit)
return (UNKNOWN);
}
int
static int
pcnet_probe(int unit)
{
u_long chip_id;
@ -1026,7 +1030,7 @@ pcnet_probe(int unit)
return (type);
}
int
static int
lnc_attach(struct isa_device * isa_dev)
{
struct lnc_softc *sc = &lnc_softc[isa_dev->id_unit];
@ -1113,7 +1117,7 @@ lnc_attach(struct isa_device * isa_dev)
return (1);
}
void
static void
lnc_init(int unit)
{
struct lnc_softc *sc = &lnc_softc[unit];
@ -1371,7 +1375,7 @@ lncintr(int unit)
inline int
static inline int
mbuf_to_buffer(struct mbuf *m, char *buffer)
{
@ -1386,7 +1390,7 @@ mbuf_to_buffer(struct mbuf *m, char *buffer)
return(len);
}
inline struct mbuf *
static inline struct mbuf *
chain_to_cluster(struct mbuf *m)
{
struct mbuf *new;
@ -1411,7 +1415,7 @@ chain_to_cluster(struct mbuf *m)
* flags should be ok at those points too.
*/
void
static void
lnc_start(struct ifnet *ifp)
{
@ -1569,7 +1573,7 @@ lnc_start(struct ifnet *ifp)
LNCSTATS(trans_ring_full)
}
int
static int
lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
{
@ -1663,7 +1667,7 @@ lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
return error;
}
void
static void
lnc_watchdog(int unit)
{
log(LOG_ERR, "lnc%d: Device timeout -- Resetting\n", unit);
@ -1672,7 +1676,7 @@ lnc_watchdog(int unit)
}
#ifdef DEBUG
void
static void
lnc_dump_state(int unit)
{
struct lnc_softc *sc = &lnc_softc[unit];
@ -1723,7 +1727,7 @@ lnc_dump_state(int unit)
outw(sc->rap, CSR0);
}
void
static void
mbuf_dump_chain(struct mbuf * m)
{

View File

@ -100,12 +100,12 @@
#define TRANS_MD3 \
"\20\6BUFF\5UFLO\4RES\3LCOL\2LCAR\1RTRY"
char *nic_ident[] = {"Unknown",
static char *nic_ident[] = {"Unknown",
"BICC",
"NE2100",
"DEPCA"};
char *ic_ident[] = {"Unknown",
static char *ic_ident[] = {"Unknown",
"LANCE, Am7990",
"C-LANCE, Am79C90",
"PCnet-ISA, Am79C960",

View File

@ -24,7 +24,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aic7xxx.c,v 1.40 1995/10/28 17:27:21 gibbs Exp $
* $Id: aic7xxx.c,v 1.41 1995/10/29 05:57:48 gibbs Exp $
*/
/*
* TODO:
@ -57,27 +57,30 @@
struct ahc_data *ahcdata[NAHC];
int ahc_init __P((int unit));
void ahc_loadseq __P((u_long iobase));
int32 ahc_scsi_cmd();
timeout_t ahc_timeout;
void ahc_done __P((int unit, struct scb *scbp));
struct scb *ahc_get_scb __P((int unit, int flags));
void ahc_free_scb();
void ahc_scb_timeout __P((int unit, struct ahc_data *ahc, struct scb *scb));
u_char ahc_abort_wscb __P((int unit, struct scb *scbp, u_char prev,
u_long iobase, u_char timedout_scb, u_int32 xs_error));
int ahc_match_scb __P((struct scb *scb, int target, char channel));
int ahc_reset_device __P((int unit, struct ahc_data *ahc, int target,
char channel, u_char timedout_scb, u_int32 xs_error));
void ahc_reset_current_bus __P((u_long iobase));
int ahc_reset_channel __P((int unit, struct ahc_data *ahc, char channel,
u_char timedout_scb, u_int32 xs_error));
void ahcminphys();
void ahc_unbusy_target __P((int target, char channel, u_long iobase));
struct scb *ahc_scb_phys_kv();
int ahc_poll __P((int unit, int wait));
u_int32 ahc_adapter_info();
static int ahc_init __P((int unit));
static void ahc_loadseq __P((u_long iobase));
static int32 ahc_scsi_cmd();
static timeout_t ahc_timeout;
static void ahc_done __P((int unit, struct scb *scbp));
static struct scb *ahc_get_scb __P((int unit, int flags));
static void ahc_free_scb();
static void ahc_scb_timeout __P((int unit, struct ahc_data *ahc,
struct scb *scb));
static u_char ahc_abort_wscb __P((int unit, struct scb *scbp, u_char prev,
u_long iobase, u_char timedout_scb, u_int32 xs_error));
static int ahc_match_scb __P((struct scb *scb, int target, char channel));
static int ahc_reset_device __P((int unit, struct ahc_data *ahc,
int target, char channel, u_char timedout_scb,
u_int32 xs_error));
static void ahc_reset_current_bus __P((u_long iobase));
static int ahc_reset_channel __P((int unit, struct ahc_data *ahc,
char channel, u_char timedout_scb, u_int32 xs_error));
static void ahcminphys();
static void ahc_unbusy_target __P((int target, char channel,
u_long iobase));
struct scb *ahc_scb_phys_kv();
static int ahc_poll __P((int unit, int wait));
static u_int32 ahc_adapter_info();
int ahc_unit = 0;
@ -88,7 +91,7 @@ int ahc_unit = 0;
#define AHC_SHOWABORTS 0x0008
#define AHC_SHOWSENSE 0x0010
#define AHC_DEBUG
int ahc_debug = AHC_SHOWABORTS;
static int ahc_debug = AHC_SHOWABORTS;
/**** bit definitions for SCSIDEF ****/
#define HSCSIID 0x07 /* our SCSI ID */
@ -100,7 +103,7 @@ typedef enum {
list_tail
}insert_t;
struct scsi_adapter ahc_switch =
static struct scsi_adapter ahc_switch =
{
ahc_scsi_cmd,
ahcminphys,
@ -112,7 +115,7 @@ struct scsi_adapter ahc_switch =
};
/* the below structure is so we have a default dev struct for our link struct */
struct scsi_device ahc_dev =
static struct scsi_device ahc_dev =
{
NULL, /* Use default error handler */
NULL, /* have a queue, served by this */
@ -711,7 +714,7 @@ struct seeprom_config {
UNPAUSE_SEQUENCER(ahc);
#ifdef AHC_DEBUG
void
static void
ahc_print_scb(scb)
struct scb *scb;
{
@ -734,7 +737,7 @@ ahc_print_scb(scb)
,(int)&(scb->next) - (int)scb);
}
void
static void
ahc_print_active_scb(ahc)
struct ahc_data *ahc;
{
@ -855,8 +858,8 @@ ahcprobe(unit, iobase, type, flags)
/*
* Look up the valid period to SCSIRATE conversion in our table.
*/
static
void ahc_scsirate(scsirate, period, offset, unit, target )
static void
ahc_scsirate(scsirate, period, offset, unit, target )
u_char *scsirate;
u_char period, offset;
int unit, target;
@ -970,7 +973,7 @@ ahc_attach(unit)
return 1;
}
void
static void
ahc_send_scb( ahc, scb )
struct ahc_data *ahc;
struct scb *scb;
@ -1692,7 +1695,7 @@ ahcintr(unit)
}
int
static int
enable_seeprom(u_long offset,
u_short CS, /* chip select */
u_short CK, /* clock */
@ -1721,7 +1724,7 @@ enable_seeprom(u_long offset,
return(1);
}
void
static void
release_seeprom(u_long offset,
u_short CS, /* chip select */
u_short CK, /* clock */
@ -1739,7 +1742,7 @@ release_seeprom(u_long offset,
* adaptor, now we look to see how the operation
* went.
*/
void
static void
ahc_done(unit, scb)
int unit;
struct scb *scb;
@ -1794,7 +1797,7 @@ ahc_done(unit, scb)
/*
* Start the board, ready for normal operation
*/
int
static int
ahc_init(unit)
int unit;
{
@ -2237,7 +2240,7 @@ ahc_init(unit)
return (0);
}
void
static void
ahcminphys(bp)
struct buf *bp;
{
@ -2258,7 +2261,7 @@ ahcminphys(bp)
* the data address, target, and lun all of which
* are stored in the scsi_xfer struct
*/
int32
static int32
ahc_scsi_cmd(xs)
struct scsi_xfer *xs;
{
@ -2448,7 +2451,7 @@ ahc_scsi_cmd(xs)
* Return some information to the caller about
* the adapter and it's capabilities.
*/
u_int32
static u_int32
ahc_adapter_info(unit)
int unit;
{
@ -2459,7 +2462,7 @@ ahc_adapter_info(unit)
* A scb (and hence an scb entry on the board is put onto the
* free list.
*/
void
static void
ahc_free_scb(unit, scb, flags)
int unit, flags;
struct scb *scb;
@ -2490,7 +2493,7 @@ ahc_free_scb(unit, scb, flags)
* If there are none, see if we can allocate a
* new one. Otherwise either return an error or sleep
*/
struct scb *
static struct scb *
ahc_get_scb(unit, flags)
int unit, flags;
{
@ -2572,13 +2575,12 @@ ahc_get_scb(unit, flags)
#endif
}
gottit:
splx(opri);
return (scbp);
}
void ahc_loadseq(iobase)
static void ahc_loadseq(iobase)
u_long iobase;
{
static unsigned char seqprog[] = {
@ -2600,7 +2602,7 @@ void ahc_loadseq(iobase)
/*
* Function to poll for command completion when in poll mode
*/
int
static int
ahc_poll(int unit, int wait)
{ /* in msec */
struct ahc_data *ahc = ahcdata[unit];
@ -2619,7 +2621,7 @@ ahc_poll(int unit, int wait)
return (0);
}
void
static void
ahc_scb_timeout(unit, ahc, scb)
int unit;
struct ahc_data *ahc;
@ -2627,7 +2629,6 @@ ahc_scb_timeout(unit, ahc, scb)
{
u_long iobase = ahc->baseport;
int found = 0;
u_char scb_control;
char channel = scb->target_channel_lun & SELBUSB ? 'B': 'A';
/*
@ -2770,7 +2771,7 @@ ahc_scb_timeout(unit, ahc, scb)
}
}
void
static void
ahc_timeout(void *arg1)
{
struct scb *scb = (struct scb *)arg1;
@ -2819,7 +2820,7 @@ ahc_timeout(void *arg1)
* The device at the given target/channel has been reset. Abort
* all active and queued scbs for that target/channel.
*/
int
static int
ahc_reset_device(unit, ahc, target, channel, timedout_scb, xs_error)
int unit;
struct ahc_data *ahc;
@ -2924,7 +2925,7 @@ ahc_reset_device(unit, ahc, target, channel, timedout_scb, xs_error)
* Manipulate the waiting for selection list and return the
* scb that follows the one that we remove.
*/
u_char
static u_char
ahc_abort_wscb (unit, scbp, prev, iobase, timedout_scb, xs_error)
int unit;
struct scb *scbp;
@ -2979,7 +2980,7 @@ ahc_abort_wscb (unit, scbp, prev, iobase, timedout_scb, xs_error)
return next;
}
void
static void
ahc_unbusy_target(target, channel, iobase)
u_char target;
char channel;
@ -3000,7 +3001,7 @@ ahc_unbusy_target(target, channel, iobase)
outb(active_port, active);
}
void
static void
ahc_reset_current_bus(iobase)
u_long iobase;
{
@ -3009,7 +3010,7 @@ ahc_reset_current_bus(iobase)
outb(SCSISEQ + iobase, 0);
}
int
static int
ahc_reset_channel(unit, ahc, channel, timedout_scb, xs_error)
int unit;
struct ahc_data *ahc;
@ -3090,7 +3091,7 @@ ahc_reset_channel(unit, ahc, channel, timedout_scb, xs_error)
return found;
}
int
static int
ahc_match_scb (scb, target, channel)
struct scb *scb;
int target;