From 55a6f50b8d4c8f0e465cfde87eccf711be680e9f Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Tue, 5 Aug 2003 20:11:50 +0000 Subject: Don't use pessimal (u_short) types for i/o ports. This is mainly for completenss. The pessimization is tiny compared with i/o port slowness except on very old machines, but code that used signed short types for i/o ports was unpessimized long ago, and the macro that detected it recently started working for u_short types too. Use of bus space should have made this moot long ago. Not tested at runtime by: bde --- sys/dev/digi/digi.h | 4 ++-- sys/i386/isa/if_rdp.c | 2 +- sys/i386/isa/spic.c | 2 +- sys/i386/isa/wt.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/digi/digi.h b/sys/dev/digi/digi.h index e8f9e0fe2f14..c5c1a4c60342 100644 --- a/sys/dev/digi/digi.h +++ b/sys/dev/digi/digi.h @@ -152,8 +152,8 @@ struct digi_softc { const char *name; enum digi_board_status status; ushort numports; /* number of ports on card */ - ushort port; /* I/O port */ - ushort wport; /* window select I/O port */ + u_int port; /* I/O port */ + u_int wport; /* window select I/O port */ struct { struct resource *mem; diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c index be8a2a70006c..0fda86962a5e 100644 --- a/sys/i386/isa/if_rdp.c +++ b/sys/i386/isa/if_rdp.c @@ -121,7 +121,7 @@ struct rdp_softc { /* * local stuff, somewhat sorted by memory alignment class */ - u_short baseaddr; /* IO port address */ + u_int baseaddr; /* IO port address */ u_short txsize; /* tx size for next (buffered) packet, * there's only one additional packet * we can buffer, thus a single variable diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c index 9eace580cf28..a0afcb90447c 100644 --- a/sys/i386/isa/spic.c +++ b/sys/i386/isa/spic.c @@ -97,7 +97,7 @@ static struct cdevsw spic_cdevsw = { #define SCBUFLEN 128 struct spic_softc { - u_short sc_port_addr; + u_int sc_port_addr; u_char sc_intr; struct resource *sc_port_res,*sc_intr_res; int sc_port_rid,sc_intr_rid; diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index 1f9d16e668bf..22257f7eb030 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -157,7 +157,7 @@ typedef struct { wtstatus_t error; /* status of controller */ - unsigned short DATAPORT, CMDPORT, STATPORT, CTLPORT, SDMAPORT, RDMAPORT; + unsigned DATAPORT, CMDPORT, STATPORT, CTLPORT, SDMAPORT, RDMAPORT; unsigned char BUSY, NOEXCEP, RESETMASK, RESETVAL; unsigned char ONLINE, RESET, REQUEST, IEN; } wtinfo_t; -- cgit v1.3