diff options
author | bde <bde@FreeBSD.org> | 1996-11-11 17:11:08 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1996-11-11 17:11:08 +0000 |
commit | cec56fb682f2b6f835f39950ff1eaee6d2bac204 (patch) | |
tree | 9c298019432e0d49f8747e82e4f8eee4e043f687 /sys/i386/isa | |
parent | 94f72a8124c5e9451ffa605f69fbbab413325e75 (diff) | |
download | FreeBSD-src-cec56fb682f2b6f835f39950ff1eaee6d2bac204.zip FreeBSD-src-cec56fb682f2b6f835f39950ff1eaee6d2bac204.tar.gz |
Fixed pessimized (short) i/o port type.
The change in if_epreg.h affects if_epreg.o and 3c5x9.o.
These changes are probably harmless, but I can't test them.
Diffstat (limited to 'sys/i386/isa')
-rw-r--r-- | sys/i386/isa/ctx.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/if_epreg.h | 4 | ||||
-rw-r--r-- | sys/i386/isa/if_zp.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c index b35f2a3..20b9d82 100644 --- a/sys/i386/isa/ctx.c +++ b/sys/i386/isa/ctx.c @@ -8,7 +8,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: ctx.c,v 1.19 1996/06/25 20:29:52 bde Exp $ + * $Id: ctx.c,v 1.20 1996/09/06 23:07:14 phk Exp $ */ /* @@ -129,7 +129,7 @@ #include <machine/ioctl_ctx.h> #include <machine/md_var.h> -static int waitvb(short); +static int waitvb(int port); /* state flags */ #define OPEN (0x01) /* device is open */ @@ -165,7 +165,7 @@ static struct ctx_soft_registers { u_char cp0; u_char cp1; u_char flag; - short iobase; + int iobase; caddr_t maddr; int msize; void *devfs_token; @@ -424,7 +424,7 @@ ctxioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p) } static int -waitvb(short port) +waitvb(int port) { /* wait for a vertical blank, */ if (inb(port) == 0xff) /* 0xff means no board present */ return (1); diff --git a/sys/i386/isa/if_epreg.h b/sys/i386/isa/if_epreg.h index 5685832..1bef615 100644 --- a/sys/i386/isa/if_epreg.h +++ b/sys/i386/isa/if_epreg.h @@ -31,7 +31,7 @@ */ /* - * $Id: if_epreg.h,v 1.16 1996/08/06 21:14:06 phk Exp $ + * $Id: if_epreg.h,v 1.17 1996/09/08 10:44:10 phk Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -54,7 +54,7 @@ */ struct ep_softc { struct arpcom arpcom; /* Ethernet common part */ - short ep_io_addr; /* i/o bus address */ + int ep_io_addr; /* i/o bus address */ #define MAX_MBS 8 /* # of mbufs we keep around */ struct mbuf *mb[MAX_MBS]; /* spare mbuf storage. */ int next_mb; /* Which mbuf to use next. */ diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index be676c1..f4b1a7b 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $ - * $Id: if_zp.c,v 1.25 1996/09/07 17:52:56 nate Exp $ + * $Id: if_zp.c,v 1.26 1996/09/11 16:11:21 nate Exp $ */ /*- * TODO: @@ -168,7 +168,7 @@ static struct zp_softc { struct mbuf *mb[MAX_MBS]; /* spare mbuf storage. */ int next_mb; /* Which mbuf to use next. */ int last_mb; /* Last mbuf. */ - short ep_io_addr; /* i/o bus address */ + int ep_io_addr; /* i/o bus address */ char ep_connectors; /* Connectors on this card. */ int tx_start_thresh;/* Current TX_start_thresh. */ char bus32bit; /* 32bit access possible */ |