Module Name: src
Committed By: matt
Date: Wed Sep 9 21:15:59 UTC 2009
Modified Files:
src/sys/compat/ultrix [matt-nb5-mips64]: ultrix_flock.h ultrix_fs.c
ultrix_ioctl.c ultrix_pathname.c ultrix_tty.h
Log Message:
Change to use fixed sized types.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.162.1 src/sys/compat/ultrix/ultrix_flock.h
cvs rdiff -u -r1.49 -r1.49.16.1 src/sys/compat/ultrix/ultrix_fs.c
cvs rdiff -u -r1.35 -r1.35.22.1 src/sys/compat/ultrix/ultrix_ioctl.c
cvs rdiff -u -r1.35 -r1.35.12.1 src/sys/compat/ultrix/ultrix_pathname.c
cvs rdiff -u -r1.2 -r1.2.186.1 src/sys/compat/ultrix/ultrix_tty.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ultrix/ultrix_flock.h
diff -u src/sys/compat/ultrix/ultrix_flock.h:1.1 src/sys/compat/ultrix/ultrix_flock.h:1.1.162.1
--- src/sys/compat/ultrix/ultrix_flock.h:1.1 Fri Jul 30 16:03:49 1999
+++ src/sys/compat/ultrix/ultrix_flock.h Wed Sep 9 21:15:58 2009
@@ -1,12 +1,12 @@
-/* $NetBSD: ultrix_flock.h,v 1.1 1999/07/30 16:03:49 drochner Exp $ */
+/* $NetBSD: ultrix_flock.h,v 1.1.162.1 2009/09/09 21:15:58 matt Exp $ */
struct ultrix_flock {
- short l_type;
+ int16_t l_type;
#define ULTRIX_F_RDLCK 1
#define ULTRIX_F_WRLCK 2
#define ULTRIX_F_UNLCK 3
- short l_whence;
- long l_start;
- long l_len;
- int l_pid;
+ int16_t l_whence;
+ int32_t l_start;
+ int32_t l_len;
+ int32_t l_pid;
};
Index: src/sys/compat/ultrix/ultrix_fs.c
diff -u src/sys/compat/ultrix/ultrix_fs.c:1.49 src/sys/compat/ultrix/ultrix_fs.c:1.49.16.1
--- src/sys/compat/ultrix/ultrix_fs.c:1.49 Tue May 6 18:43:44 2008
+++ src/sys/compat/ultrix/ultrix_fs.c Wed Sep 9 21:15:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_fs.c,v 1.49 2008/05/06 18:43:44 ad Exp $ */
+/* $NetBSD: ultrix_fs.c,v 1.49.16.1 2009/09/09 21:15:59 matt Exp $ */
/*
* Copyright (c) 1995, 1997 Jonathan Stone
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.49 2008/05/06 18:43:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.49.16.1 2009/09/09 21:15:59 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,24 +75,24 @@
* compatibility with the size the Ultrix kernel and user apps expect.
*/
struct ultrix_fs_data {
- u_int32_t ufsd_flags; /* how mounted */
- u_int32_t ufsd_mtsize; /* max transfer size in bytes */
- u_int32_t ufsd_otsize; /* optimal transfer size in bytes */
- u_int32_t ufsd_bsize; /* fs block size (bytes) for vm code */
- u_int32_t ufsd_fstype; /* see ../h/fs_types.h */
- u_int32_t ufsd_gtot; /* total number of gnodes */
- u_int32_t ufsd_gfree; /* # of free gnodes */
- u_int32_t ufsd_btot; /* total number of 1K blocks */
- u_int32_t ufsd_bfree; /* # of free 1K blocks */
- u_int32_t ufsd_bfreen; /* user consumable 1K blocks */
- u_int32_t ufsd_pgthresh; /* min size in bytes before paging*/
+ uint32_t ufsd_flags; /* how mounted */
+ uint32_t ufsd_mtsize; /* max transfer size in bytes */
+ uint32_t ufsd_otsize; /* optimal transfer size in bytes */
+ uint32_t ufsd_bsize; /* fs block size (bytes) for vm code */
+ uint32_t ufsd_fstype; /* see ../h/fs_types.h */
+ uint32_t ufsd_gtot; /* total number of gnodes */
+ uint32_t ufsd_gfree; /* # of free gnodes */
+ uint32_t ufsd_btot; /* total number of 1K blocks */
+ uint32_t ufsd_bfree; /* # of free 1K blocks */
+ uint32_t ufsd_bfreen; /* user consumable 1K blocks */
+ uint32_t ufsd_pgthresh; /* min size in bytes before paging*/
int32_t ufsd_uid; /* uid that mounted me */
int16_t ufsd_dev; /* major/minor of fs */
int16_t ufsd_exroot; /* root mapping from exports */
char ufsd_devname[ULTRIX_MAXPATHLEN + 4]; /* name of dev */
char ufsd_path[ULTRIX_MAXPATHLEN + 4]; /* name of mnt point */
- u_int32_t ufsd_nupdate; /* number of writes */
- u_int32_t ufsd_pad[112]; /* pad to 2560 bytes. */
+ uint32_t ufsd_nupdate; /* number of writes */
+ uint32_t ufsd_pad[112]; /* pad to 2560 bytes. */
};
/*
@@ -337,8 +337,8 @@
* mounting local (4.2bsd FFS) filesystems
*/
struct ultrix_ufs_args {
- u_long ufs_flags; /* mount flags?*/
- u_long ufs_pgthresh; /* minimum file size to page */
+ uint32_t ufs_flags; /* mount flags?*/
+ uint32_t ufs_pgthresh; /* minimum file size to page */
};
int
Index: src/sys/compat/ultrix/ultrix_ioctl.c
diff -u src/sys/compat/ultrix/ultrix_ioctl.c:1.35 src/sys/compat/ultrix/ultrix_ioctl.c:1.35.22.1
--- src/sys/compat/ultrix/ultrix_ioctl.c:1.35 Fri Mar 21 21:54:59 2008
+++ src/sys/compat/ultrix/ultrix_ioctl.c Wed Sep 9 21:15:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_ioctl.c,v 1.35 2008/03/21 21:54:59 ad Exp $ */
+/* $NetBSD: ultrix_ioctl.c,v 1.35.22.1 2009/09/09 21:15:59 matt Exp $ */
/* from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.35 2008/03/21 21:54:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.35.22.1 2009/09/09 21:15:59 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_ultrix.h"
@@ -87,7 +87,7 @@
{ -1, -1 }
};
-static const u_long s2btab[] = {
+static const uint16_t s2btab[] = {
0,
50,
75,
@@ -143,7 +143,7 @@
static void
stios2btios(struct emul_termios *st, struct termios *bt)
{
- u_long l, r;
+ uint32_t l, r;
l = st->c_iflag;
r = ((l & 0x00000001) ? IGNBRK : 0);
@@ -273,7 +273,7 @@
static void
btios2stios(struct termios *bt, struct emul_termios *st)
{
- u_long l, r;
+ uint32_t l, r;
int speed;
l = bt->c_iflag;
Index: src/sys/compat/ultrix/ultrix_pathname.c
diff -u src/sys/compat/ultrix/ultrix_pathname.c:1.35 src/sys/compat/ultrix/ultrix_pathname.c:1.35.12.1
--- src/sys/compat/ultrix/ultrix_pathname.c:1.35 Tue Jun 24 11:18:15 2008
+++ src/sys/compat/ultrix/ultrix_pathname.c Wed Sep 9 21:15:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_pathname.c,v 1.35 2008/06/24 11:18:15 ad Exp $ */
+/* $NetBSD: ultrix_pathname.c,v 1.35.12.1 2009/09/09 21:15:59 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_pathname.c,v 1.35 2008/06/24 11:18:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_pathname.c,v 1.35.12.1 2009/09/09 21:15:59 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,15 +191,15 @@
struct ultrix_statfs {
- long f_type; /* type of info, zero for now */
- long f_bsize; /* fundamental file system block size */
- long f_blocks; /* total blocks in file system */
- long f_bfree; /* free blocks */
- long f_bavail; /* free blocks available to non-super-user */
- long f_files; /* total file nodes in file system */
- long f_ffree; /* free file nodes in fs */
+ int32_t f_type; /* type of info, zero for now */
+ int32_t f_bsize; /* fundamental file system block size */
+ int32_t f_blocks; /* total blocks in file system */
+ int32_t f_bfree; /* free blocks */
+ int32_t f_bavail; /* free blocks available to non-super-user */
+ int32_t f_files; /* total file nodes in file system */
+ int32_t f_ffree; /* free file nodes in fs */
fsid_t f_fsid; /* file system id */
- long f_spare[7]; /* spare for later */
+ int32_t f_spare[7]; /* spare for later */
};
/*
Index: src/sys/compat/ultrix/ultrix_tty.h
diff -u src/sys/compat/ultrix/ultrix_tty.h:1.2 src/sys/compat/ultrix/ultrix_tty.h:1.2.186.1
--- src/sys/compat/ultrix/ultrix_tty.h:1.2 Thu Jan 4 19:03:36 1996
+++ src/sys/compat/ultrix/ultrix_tty.h Wed Sep 9 21:15:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_tty.h,v 1.2 1996/01/04 19:03:36 jonathan Exp $ */
+/* $NetBSD: ultrix_tty.h,v 1.2.186.1 2009/09/09 21:15:59 matt Exp $ */
/* From: NetBSD sunos.h,v 1.4 1995/03/04 09:50:00 pk Exp */
@@ -31,10 +31,10 @@
* Very similar to SunOS but with more c_cc entries (gag)
*/
struct ultrix_termios {
- u_long c_iflag;
- u_long c_oflag;
- u_long c_cflag;
- u_long c_lflag;
+ __uint32_t c_iflag;
+ __uint32_t c_oflag;
+ __uint32_t c_cflag;
+ __uint32_t c_lflag;
u_char c_cc[19]; /* 17 for Sun */
u_char c_line;
};
