Hi,
this patch fix warnings produced by macros like outb (see the comment to
outb macro in sys/i386/include/cpufunc.h)
Index: /usr/src1/sys/i386/isa/clock.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/i386/isa/clock.c,v
retrieving revision 1.45
diff -u -r1.45 clock.c
--- /usr/src1/sys/i386/isa/clock.c 24 Dec 2005 20:34:04 -0000 1.45
+++ /usr/src1/sys/i386/isa/clock.c 16 Jan 2006 00:07:46 -0000
@@ -109,7 +109,7 @@
#endif
static uint8_t i8254_walltimer_sel;
-static uint16_t i8254_walltimer_cntr;
+static uint32_t i8254_walltimer_cntr;
int adjkerntz; /* local offset from GMT in seconds */
int disable_rtc_set; /* disable resettodr() if != 0 */
Index: ./sys/i386/include/cronyx.h
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/i386/include/cronyx.h,v
retrieving revision 1.3
diff -u -r1.3 cronyx.h
--- ./sys/i386/include/cronyx.h 28 Jun 2003 04:16:03 -0000 1.3
+++ ./sys/i386/include/cronyx.h 16 Jan 2006 22:48:02 -0000
@@ -430,7 +430,7 @@
} cx_chan_t;
typedef struct _chip_t {
- unsigned short port; /* base port address, or 0 if no chip */
+ unsigned int port; /* base port address, or 0 if no chip */
unsigned char num; /* controller number, 0..3 */
struct _board_t *board; /* board pointer */
unsigned long oscfreq; /* oscillator frequency in Hz */
@@ -451,7 +451,7 @@
} cx_stat_t;
typedef struct _board_t {
- unsigned short port; /* base board port, 0..3f0 */
+ unsigned int port; /* base board port, 0..3f0 */
unsigned short num; /* board number, 0..2 */
unsigned char irq; /* interrupt request {3 5 7 10 11 12 15} */
unsigned char dma; /* DMA request {5 6 7} */
Index: /usr/src1/sys/dev/serial/cronyx/cronyx.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/serial/cronyx/cronyx.c,v
retrieving revision 1.4
diff -u -r1.4 cronyx.c
--- /usr/src1/sys/dev/serial/cronyx/cronyx.c 13 Feb 2004 01:45:14 -0000
1.4
+++ /usr/src1/sys/dev/serial/cronyx/cronyx.c 16 Jan 2006 22:49:24 -0000
@@ -235,7 +235,7 @@
*/
void cx_cmd (int base, int cmd)
{
- unsigned short port = CCR(base);
+ unsigned int port = CCR(base);
unsigned short count;
/* Wait 10 msec for the previous command to complete. */
@@ -253,7 +253,7 @@
/*
* Reset the chip.
*/
-static int cx_reset (unsigned short port)
+static int cx_reset (unsigned int port)
{
int count;
@@ -780,7 +780,7 @@
*/
void cx_setup_chan (cx_chan_t *c)
{
- unsigned short port = c->chip->port;
+ unsigned int port = c->chip->port;
int clock, period;
if (c->num == 0) {
Index: if_ie.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/ie/if_ie.c,v
retrieving revision 1.26
diff -u -r1.26 if_ie.c
--- if_ie.c 28 Nov 2005 17:13:42 -0000 1.26
+++ if_ie.c 15 Jan 2006 22:53:35 -0000
@@ -285,7 +285,7 @@
int hard_vers;
int unit;
- u_short port; /* i/o base address for this interface */
+ u_int port; /* i/o base address for this interface */
caddr_t iomem; /* memory size */
caddr_t iomembot; /* memory base address */
unsigned iosize;
Index: if_rdp.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/rdp/if_rdp.c,v
retrieving revision 1.21
diff -u -r1.21 if_rdp.c
--- if_rdp.c 28 Nov 2005 17:13:43 -0000 1.21
+++ if_rdp.c 16 Jan 2006 22:58:19 -0000
@@ -130,7 +130,7 @@
/*
* 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
Index: if_sr_isa.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/sr/if_sr_isa.c,v
retrieving revision 1.4
diff -u -r1.4 if_sr_isa.c
--- if_sr_isa.c 29 Aug 2005 10:19:52 -0000 1.4
+++ if_sr_isa.c 15 Jan 2006 23:01:23 -0000
@@ -113,7 +113,7 @@
int error;
u_int32_t flags;
u_int i, tmp;
- u_short port;
+ u_int port;
u_long irq, junk, membase, memsize, port_start, port_count;
sca_regs *sca = 0;
@@ -357,7 +357,7 @@
src_dpram_size(device_t device)
{
u_int pgs, i;
- u_short port;
+ u_int port;
u_short *smem;
u_char mar;
u_long membase;
Index: if_srregs.h
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/sr/if_srregs.h,v
retrieving revision 1.2
diff -u -r1.2 if_srregs.h
--- if_srregs.h 17 Jun 2003 04:28:31 -0000 1.2
+++ if_srregs.h 15 Jan 2006 22:57:48 -0000
@@ -151,7 +151,7 @@
struct sr_softc *sc; /* software channels */
int cunit; /* card w/in system */
- u_short iobase; /* I/O Base Address */
+ u_int iobase; /* I/O Base Address */
int cardtype;
int numports; /* # of ports on cd */
int mempages;
Index: /usr/src1/sys/dev/misc/spic/spic.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/misc/spic/spic.c,v
retrieving revision 1.13
diff -u -r1.13 spic.c
--- /usr/src1/sys/dev/misc/spic/spic.c 27 Oct 2005 13:33:19 -0000 1.13
+++ /usr/src1/sys/dev/misc/spic/spic.c 16 Jan 2006 23:03:26 -0000
@@ -109,7 +109,7 @@
#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;
