diff options
| author | dfr <dfr@FreeBSD.org> | 1998-06-07 17:13:14 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1998-06-07 17:13:14 +0000 |
| commit | 1d5f38ac2264102518a09c66a7b285f57e81e67e (patch) | |
| tree | 83ce2f0e2b8041d2c933d3beffc1f4465ea5b929 /sys/dev/sr | |
| parent | 83423d0e5a4ad035e44392f0427cb39232031e45 (diff) | |
| download | FreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.zip FreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.tar.gz | |
This commit fixes various 64bit portability problems required for
FreeBSD/alpha. The most significant item is to change the command
argument to ioctl functions from int to u_long. This change brings us
inline with various other BSD versions. Driver writers may like to
use (__FreeBSD_version == 300003) to detect this change.
The prototype FreeBSD/alpha machdep will follow in a couple of days
time.
Diffstat (limited to 'sys/dev/sr')
| -rw-r--r-- | sys/dev/sr/if_sr.c | 6 | ||||
| -rw-r--r-- | sys/dev/sr/if_sr_isa.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 546756f..00427ba 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr.c,v 1.11 1998/01/30 19:49:54 jhay Exp $ + * $Id: if_sr.c,v 1.12 1998/04/17 22:36:35 des Exp $ */ /* @@ -273,7 +273,7 @@ void srintr_hc(struct sr_hardc *hc); static int srattach(struct sr_hardc *hc); static void sr_xmit(struct sr_softc *sc); static void srstart(struct ifnet *ifp); -static int srioctl(struct ifnet *ifp, int cmd, caddr_t data); +static int srioctl(struct ifnet *ifp, u_long cmd, caddr_t data); static void srwatchdog(struct ifnet *ifp); static int sr_packet_avail(struct sr_softc *sc, int *len, u_char *rxstat); static void sr_copy_rxbuf(struct mbuf *m, struct sr_softc *sc, int len); @@ -1243,7 +1243,7 @@ static int bug_splats[] = {0, 0, 0, 0, 0, 0, 0, 0}; #endif static int -srioctl(struct ifnet *ifp, int cmd, caddr_t data) +srioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { int s, error, was_up, should_be_up; struct sppp *sp = (struct sppp *)ifp; diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c index 546756f..00427ba 100644 --- a/sys/dev/sr/if_sr_isa.c +++ b/sys/dev/sr/if_sr_isa.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr.c,v 1.11 1998/01/30 19:49:54 jhay Exp $ + * $Id: if_sr.c,v 1.12 1998/04/17 22:36:35 des Exp $ */ /* @@ -273,7 +273,7 @@ void srintr_hc(struct sr_hardc *hc); static int srattach(struct sr_hardc *hc); static void sr_xmit(struct sr_softc *sc); static void srstart(struct ifnet *ifp); -static int srioctl(struct ifnet *ifp, int cmd, caddr_t data); +static int srioctl(struct ifnet *ifp, u_long cmd, caddr_t data); static void srwatchdog(struct ifnet *ifp); static int sr_packet_avail(struct sr_softc *sc, int *len, u_char *rxstat); static void sr_copy_rxbuf(struct mbuf *m, struct sr_softc *sc, int len); @@ -1243,7 +1243,7 @@ static int bug_splats[] = {0, 0, 0, 0, 0, 0, 0, 0}; #endif static int -srioctl(struct ifnet *ifp, int cmd, caddr_t data) +srioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { int s, error, was_up, should_be_up; struct sppp *sp = (struct sppp *)ifp; |
