PERFORCE change 107746 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=107746

Change 107746 by hselasky at hselasky_mini_itx on 2006/10/12 07:45:59

	Keep packet counters unsigned in udbp.h. Compile fixes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#9 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ucomvar.h#9 (text+ko) ====

@@ -80,7 +80,7 @@
 	void (*ucom_set_rts)(struct ucom_softc *, uint8_t);
 	void (*ucom_set_break)(struct ucom_softc *, uint8_t);
 	int  (*ucom_param)(struct ucom_softc *, struct termios *);
-	int  (*ucom_ioctl)(struct ucom_softc *, ulong, caddr_t, int,
+	int  (*ucom_ioctl)(struct ucom_softc *, uint32_t, caddr_t, int,
 	    struct thread *);
 	int  (*ucom_open)(struct ucom_softc *);
 	void (*ucom_close)(struct ucom_softc *);

==== //depot/projects/usb/src/sys/dev/usb/udbp.h#6 (text+ko) ====

@@ -60,8 +60,8 @@
 
 /* This structure is returned by the NGM_UDBP_GET_STATUS command */
 struct ngudbpstat {
-	int	packets_in;	/* packets in from downstream */
-	int	packets_out;	/* packets out towards downstream */
+	uint32_t	packets_in;	/* packets in from downstream */
+	uint32_t	packets_out;	/* packets out towards downstream */
 };
 
 /*

==== //depot/projects/usb/src/sys/dev/usb/umodem.c#13 (text+ko) ====

@@ -191,7 +191,7 @@
 umodem_param(struct ucom_softc *ucom, struct termios *t);
 
 static int
-umodem_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, 
+umodem_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, 
 	     int flag, struct thread *td);
 static void
 umodem_set_dtr(struct ucom_softc *ucom, u_int8_t onoff);
@@ -669,13 +669,13 @@
 }
 
 static int
-umodem_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, 
+umodem_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, 
 	     int flag, struct thread *td)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 	int error = 0;
 
-	DPRINTF(0, "cmd=0x%08lx\n", cmd);
+	DPRINTF(0, "cmd=0x%08x\n", cmd);
 
 	switch (cmd) {
 	case USB_GET_CM_OVER_DATA:

==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#12 (text+ko) ====

@@ -217,7 +217,7 @@
 uplcom_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr);
 
 static int
-uplcom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int flag,
+uplcom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag,
 	     struct thread *td);
 static void
 uplcom_set_line_state_callback(struct usbd_xfer *xfer);
@@ -843,14 +843,14 @@
 }
 
 static int
-uplcom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int flag,
+uplcom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag,
 	     struct thread *td)
 {
 	int error = ENOTTY;
 
 	/* TODO: */
 
-	DPRINTF(0, "cmd = 0x%08lx\n", cmd);
+	DPRINTF(0, "cmd = 0x%08x\n", cmd);
 
 	switch (cmd) {
 	case TIOCNOTTY:

==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#14 (text+ko) ====

@@ -246,7 +246,7 @@
 uvscom_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr);
 
 static int
-uvscom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int fflag,
+uvscom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int fflag,
 	     struct thread *td);
 
 static const struct usbd_config uvscom_config[UVSCOM_N_TRANSFER] = {
@@ -1046,12 +1046,12 @@
 }
 
 static int
-uvscom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int fflag,
+uvscom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int fflag,
 	     struct thread *td)
 {
 	int error = ENOTTY;
 
-	DPRINTF(0, "cmd = 0x%08lx\n", cmd);
+	DPRINTF(0, "cmd = 0x%08x\n", cmd);
 
 	switch (cmd) {
 	case TIOCNOTTY: