d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit fixes various 64bit portability problems required for

Browse Source 
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.
This commit is contained in:
Doug Rabson 1998-06-07 17:13:14 +00:00
parent 37a8b7dcb8
commit ecbb00a262
247 changed files with 1871 additions and 1498 deletions

24
sys/alpha/linux/linux_sysvec.c

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: linux_sysvec.c,v 1.28 1998/04/28 18:15:06 eivind Exp $
* $Id: linux_sysvec.c,v 1.29 1998/05/07 00:42:25 eivind Exp $
*/
/* XXX we use functions that might not exist. */
@ -56,9 +56,9 @@
#include <i386/linux/linux.h>
#include <i386/linux/linux_proto.h>
static int linux_fixup __P((int **stack_base,
static int linux_fixup __P((long **stack_base,
struct image_params *iparams));
static int elf_linux_fixup __P((int **stack_base,
static int elf_linux_fixup __P((long **stack_base,
struct image_params *iparams));
static void linux_prepsyscall __P((struct trapframe *tf, int *args,
u_int *code, caddr_t *params));
@ -119,26 +119,26 @@ translate_traps(int signal, int trap_code)
}
static int
linux_fixup(int **stack_base, struct image_params *imgp)
linux_fixup(long **stack_base, struct image_params *imgp)
{
int *argv, *envp;
long *argv, *envp;
argv = *stack_base;
envp = *stack_base + (imgp->argc + 1);
(*stack_base)--;
**stack_base = (int)envp;
**stack_base = (long)envp;
(*stack_base)--;
**stack_base = (int)argv;
**stack_base = (long)argv;
(*stack_base)--;
**stack_base = (int)imgp->argc;
**stack_base = (long)imgp->argc;
return 0;
}
static int
elf_linux_fixup(int **stack_base, struct image_params *imgp)
elf_linux_fixup(long **stack_base, struct image_params *imgp)
{
Elf32_Auxargs *args = (Elf32_Auxargs *)imgp->auxargs;
int *pos;
long *pos;
pos = *stack_base + (imgp->argc + imgp->envc + 2);
@ -165,7 +165,7 @@ elf_linux_fixup(int **stack_base, struct image_params *imgp)
imgp->auxargs = NULL;
(*stack_base)--;
**stack_base = (int)imgp->argc;
**stack_base = (long)imgp->argc;
return 0;
}
@ -316,7 +316,7 @@ linux_sigreturn(p, args)
* It is unsafe to keep track of it ourselves, in the event that a
* program jumps out of a signal handler.
*/
scp = args->scp;
scp = SCARG(args,scp);
if (copyin((caddr_t)scp, &context, sizeof(*scp)) != 0)
return (EFAULT);

6
sys/amd64/amd64/db_interface.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_interface.c,v 1.37 1997/10/27 17:23:12 bde Exp $
* $Id: db_interface.c,v 1.38 1997/11/20 18:09:36 bde Exp $
*/
/*
@ -213,7 +213,7 @@ kdb_trap(type, code, regs)
void
db_read_bytes(addr, size, data)
vm_offset_t addr;
register int size;
register size_t size;
register char *data;
{
register char *src;
@ -233,7 +233,7 @@ db_read_bytes(addr, size, data)
void
db_write_bytes(addr, size, data)
vm_offset_t addr;
register int size;
register size_t size;
register char *data;
{
register char *dst;

34
sys/amd64/amd64/db_trace.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_trace.c,v 1.26 1997/10/27 17:23:18 bde Exp $
* $Id: db_trace.c,v 1.27 1997/11/20 18:24:52 bde Exp $
*/
#include <sys/param.h>
@ -44,24 +44,24 @@
* Machine register set.
*/
struct db_variable db_regs[] = {
"cs", (int *)&ddb_regs.tf_cs, FCN_NULL,
"ds", (int *)&ddb_regs.tf_ds, FCN_NULL,
"es", (int *)&ddb_regs.tf_es, FCN_NULL,
"cs", (long *)&ddb_regs.tf_cs, FCN_NULL,
"ds", (long *)&ddb_regs.tf_ds, FCN_NULL,
"es", (long *)&ddb_regs.tf_es, FCN_NULL,
#if 0
"fs", (int *)&ddb_regs.tf_fs, FCN_NULL,
"gs", (int *)&ddb_regs.tf_gs, FCN_NULL,
"fs", (long *)&ddb_regs.tf_fs, FCN_NULL,
"gs", (long *)&ddb_regs.tf_gs, FCN_NULL,
#endif
"ss", (int *)&ddb_regs.tf_ss, FCN_NULL,
"eax", (int *)&ddb_regs.tf_eax, FCN_NULL,
"ecx", (int *)&ddb_regs.tf_ecx, FCN_NULL,
"edx", (int *)&ddb_regs.tf_edx, FCN_NULL,
"ebx", (int *)&ddb_regs.tf_ebx, FCN_NULL,
"esp", (int *)&ddb_regs.tf_esp,FCN_NULL,
"ebp", (int *)&ddb_regs.tf_ebp, FCN_NULL,
"esi", (int *)&ddb_regs.tf_esi, FCN_NULL,
"edi", (int *)&ddb_regs.tf_edi, FCN_NULL,
"eip", (int *)&ddb_regs.tf_eip, FCN_NULL,
"efl", (int *)&ddb_regs.tf_eflags, FCN_NULL,
"ss", (long *)&ddb_regs.tf_ss, FCN_NULL,
"eax", (long *)&ddb_regs.tf_eax, FCN_NULL,
"ecx", (long *)&ddb_regs.tf_ecx, FCN_NULL,
"edx", (long *)&ddb_regs.tf_edx, FCN_NULL,
"ebx", (long *)&ddb_regs.tf_ebx, FCN_NULL,
"esp", (long *)&ddb_regs.tf_esp,FCN_NULL,
"ebp", (long *)&ddb_regs.tf_ebp, FCN_NULL,
"esi", (long *)&ddb_regs.tf_esi, FCN_NULL,
"edi", (long *)&ddb_regs.tf_edi, FCN_NULL,
"eip", (long *)&ddb_regs.tf_eip, FCN_NULL,
"efl", (long *)&ddb_regs.tf_eflags, FCN_NULL,
};
struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);

6
sys/amd64/amd64/machdep.c

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.297 1998/05/28 09:29:57 phk Exp $
* $Id: machdep.c,v 1.298 1998/06/03 07:56:59 bde Exp $
*/
#include "apm.h"
@ -1614,7 +1614,7 @@ f00f_hack(void *unused) {
int
ptrace_set_pc(p, addr)
struct proc *p;
unsigned int addr;
unsigned long addr;
{
p->p_md.md_regs->tf_eip = addr;
return (0);
@ -1653,7 +1653,7 @@ int ptrace_read_u_check(p, addr, len)
int ptrace_write_u(p, off, data)
struct proc *p;
vm_offset_t off;
int data;
long data;
{
struct trapframe frame_copy;
vm_offset_t min;

4
sys/amd64/amd64/mem.c

@ -38,7 +38,7 @@
*
* from: Utah $Hdr: mem.c 1.13 89/10/08$
* from: @(#)mem.c 7.2 (Berkeley) 5/9/91
* $Id: mem.c,v 1.49 1998/01/24 02:54:13 eivind Exp $
* $Id: mem.c,v 1.50 1998/03/12 09:14:18 bde Exp $
*/
/*
@ -405,7 +405,7 @@ memmmap(dev_t dev, int offset, int nprot)
static int
mmioctl(dev, cmd, cmdarg, flags, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t cmdarg;
int flags;
struct proc *p;

4
sys/compat/linux/linux_ioctl.c

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: linux_ioctl.c,v 1.22 1997/11/17 04:00:32 ahasty Exp $
* $Id: linux_ioctl.c,v 1.23 1997/12/15 06:09:11 msmith Exp $
*/
#include <sys/param.h>
@ -455,7 +455,7 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args)
struct linux_termio linux_termio;
struct filedesc *fdp = p->p_fd;
struct file *fp;
int (*func)(struct file *fp, int com, caddr_t data, struct proc *p);
int (*func)(struct file *fp, u_long com, caddr_t data, struct proc *p);
int bsd_line, linux_line;
int error;

5
sys/conf/options

@ -1,4 +1,4 @@
# $Id: options,v 1.75 1998/05/25 10:37:40 julian Exp $
# $Id: options,v 1.76 1998/06/05 22:39:49 julian Exp $
#
# On the handling of kernel options
#
@ -233,3 +233,6 @@ KEY_DEBUG opt_key.h
# Size of the kernel message buffer
MSGBUF_SIZE opt_msgbuf.h
# Include tweaks for running under the SimOS machine simulator.
SIMOS opt_simos.h

4
sys/ddb/db_aout.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_aout.c,v 1.18 1997/04/01 14:31:04 bde Exp $
* $Id: db_aout.c,v 1.19 1997/09/28 08:34:46 phk Exp $
*/
/*
@ -324,11 +324,13 @@ X_db_sym_numargs(symtab, cursym, nargp, argnamep)
void
kdb_init()
{
#ifdef __i386__
if (bootinfo.bi_esymtab != bootinfo.bi_symtab)
X_db_sym_init((int *)bootinfo.bi_symtab,
(char *)((bootinfo.bi_esymtab + sizeof(int) - 1)
& ~(sizeof(int) - 1)),
"kernel");
#endif
}
#if 0

9
sys/ddb/db_break.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_break.c,v 1.13 1997/02/22 09:28:20 peter Exp $
* $Id: db_break.c,v 1.14 1997/06/14 11:52:36 bde Exp $
*/
/*
@ -208,13 +208,13 @@ db_clear_breakpoints()
}
}
#ifdef notused
#ifdef SOFTWARE_SSTEP
/*
* Set a temporary breakpoint.
* The instruction is changed immediately,
* so the breakpoint does not have to be on the breakpoint list.
*/
static db_breakpoint_t
db_breakpoint_t
db_set_temp_breakpoint(addr)
db_addr_t addr;
{
@ -237,13 +237,14 @@ db_set_temp_breakpoint(addr)
return bkpt;
}
static void
void
db_delete_temp_breakpoint(bkpt)
db_breakpoint_t bkpt;
{
db_put_value(bkpt->address, BKPT_SIZE, bkpt->bkpt_inst);
db_breakpoint_free(bkpt);
}
#endif
/*

4
sys/ddb/db_break.h

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id$
* $Id: db_break.h,v 1.9 1997/02/22 09:28:20 peter Exp $
*/
/*
@ -53,5 +53,7 @@ typedef struct db_breakpoint *db_breakpoint_t;
void db_clear_breakpoints __P((void));
db_breakpoint_t db_find_breakpoint_here __P((db_addr_t addr));
void db_set_breakpoints __P((void));
db_breakpoint_t db_set_temp_breakpoint __P((db_addr_t));
void db_delete_temp_breakpoint __P((db_breakpoint_t));
#endif /* !_DDB_DB_BREAK_H_ */

4
sys/ddb/db_examine.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_examine.c,v 1.16 1997/02/22 09:28:22 peter Exp $
* $Id: db_examine.c,v 1.17 1997/04/01 14:31:05 bde Exp $
*/
/*
@ -257,7 +257,7 @@ db_search_cmd(dummy1, dummy2, dummy3, dummy4)
int size;
db_expr_t value;
db_expr_t mask;
unsigned int count;
db_expr_t count;
t = db_read_token();
if (t == tSLASH) {

4
sys/ddb/db_lex.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_lex.c,v 1.13 1997/02/22 09:28:25 peter Exp $
* $Id: db_lex.c,v 1.14 1997/06/14 11:52:36 bde Exp $
*/
/*
@ -117,7 +117,7 @@ db_read_token()
int db_tok_number;
char db_tok_string[TOK_STRING_SIZE];
int db_radix = 16;
long db_radix = 16;
void
db_flush_lex()

6
sys/ddb/db_output.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_output.c,v 1.21 1997/02/22 09:28:26 peter Exp $
* $Id: db_output.c,v 1.22 1997/04/01 14:31:06 bde Exp $
*/
/*
@ -58,10 +58,10 @@
*/
static int db_output_position = 0; /* output column */
static int db_last_non_space = 0; /* last non-space character */
int db_tab_stop_width = 8; /* how wide are tab stops? */
long db_tab_stop_width = 8; /* how wide are tab stops? */
#define NEXT_TAB(i) \
((((i) + db_tab_stop_width) / db_tab_stop_width) * db_tab_stop_width)
int db_max_width = 79; /* output line width */
long db_max_width = 79; /* output line width */
static void db_putchar __P((int c, void *arg));

4
sys/ddb/db_print.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_print.c,v 1.16 1998/05/19 18:42:06 phk Exp $
* $Id: db_print.c,v 1.17 1998/05/28 09:29:50 phk Exp $
*/
/*
@ -55,7 +55,7 @@ db_show_regs(dummy1, dummy2, dummy3, dummy4)
db_read_variable(regp, &value);
db_printf("%-12s%#10n", regp->name, value);
db_find_xtrn_sym_and_offset((db_addr_t)value, &name, &offset);
if (name != 0 && offset <= db_maxoff && offset != value) {
if (name != 0 && offset <= db_maxoff && offset != value) {
db_printf("\t%s", name);
if (offset != 0)
db_printf("+%+#n", offset);

10
sys/ddb/db_run.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_run.c,v 1.12 1997/02/22 09:28:29 peter Exp $
* $Id: db_run.c,v 1.13 1997/06/14 11:52:37 bde Exp $
*/
/*
@ -60,7 +60,7 @@ int db_load_count;
int db_store_count;
#ifndef db_set_single_step
extern void db_set_single_step __P((db_regs_t *regs);
extern void db_set_single_step __P((db_regs_t *regs));
#endif
#ifndef db_clear_single_step
extern void db_clear_single_step __P((db_regs_t *regs));
@ -104,7 +104,9 @@ db_stop_at_pc(is_breakpoint)
return (TRUE); /* stop here */
}
} else if (*is_breakpoint) {
#ifdef __i386__ /* XXx */
ddb_regs.tf_eip += 1;
#endif
}
*is_breakpoint = FALSE;
@ -270,9 +272,7 @@ db_set_single_step(regs)
*/
inst = db_get_value(pc, sizeof(int), FALSE);
if (inst_branch(inst) || inst_call(inst)) {
extern unsigned getreg_val();
brpc = branch_taken(inst, pc, getreg_val, regs);
brpc = branch_taken(inst, pc, regs);
if (brpc != pc) { /* self-branches are hopeless */
db_taken_bkpt = db_set_temp_breakpoint(brpc);
}

6
sys/ddb/db_sym.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_sym.c,v 1.19 1997/06/30 23:49:16 bde Exp $
* $Id: db_sym.c,v 1.20 1997/06/30 23:54:49 bde Exp $
*/
/*
@ -222,7 +222,7 @@ db_search_symbol( val, strategy, offp)
{
register
unsigned int diff;
unsigned int newdiff;
size_t newdiff;
register int i;
db_sym_t ret = DB_SYM_NULL, sym;
@ -281,7 +281,7 @@ db_symbol_values(sym, namep, valuep)
* not accept symbols whose value is "small" (and use plain hex).
*/
unsigned int db_maxoff = 0x10000;
unsigned long db_maxoff = 0x10000;
void
db_printsym(off, strategy)

4
sys/ddb/db_variables.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_variables.c,v 1.13 1997/02/22 09:28:31 peter Exp $
* $Id: db_variables.c,v 1.14 1997/06/14 11:52:37 bde Exp $
*/
/*
@ -46,7 +46,7 @@ static int db_set_variable __P((db_expr_t value));
static struct db_variable db_vars[] = {
{ "radix", &db_radix, FCN_NULL },
{ "maxoff", (int *)&db_maxoff, FCN_NULL },
{ "maxoff", (long *)&db_maxoff, FCN_NULL },
{ "maxwidth", &db_max_width, FCN_NULL },
{ "tabstops", &db_tab_stop_width, FCN_NULL },
};

4
sys/ddb/db_variables.h

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_variables.h,v 1.7 1997/02/22 09:28:32 peter Exp $
* $Id: db_variables.h,v 1.8 1997/06/30 23:54:50 bde Exp $
*/
/*
@ -42,7 +42,7 @@ typedef int db_varfcn_t __P((struct db_variable *vp, db_expr_t *valuep,
int op));
struct db_variable {
char *name; /* Name of variable */
int *valuep; /* value of variable */
long *valuep; /* value of variable */
/* function to call when reading/writing */
db_varfcn_t *fcn;
#define DB_VAR_GET 0

14
sys/ddb/ddb.h

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ddb.h,v 1.16 1998/05/19 11:02:24 phk Exp $
* $Id: ddb.h,v 1.17 1998/05/19 18:42:09 phk Exp $
*/
/*
@ -66,14 +66,14 @@ func_name(addr, have_addr, count, modif) \
char *modif;
extern char *esym;
extern unsigned int db_maxoff;
extern unsigned long db_maxoff;
extern int db_indent;
extern int db_inst_count;
extern int db_load_count;
extern int db_store_count;
extern int db_radix;
extern int db_max_width;
extern int db_tab_stop_width;
extern long db_radix;
extern long db_max_width;
extern long db_tab_stop_width;
struct vm_map;
@ -91,7 +91,7 @@ boolean_t db_map_current __P((struct vm_map *));
boolean_t db_map_equal __P((struct vm_map *, struct vm_map *));
void db_print_loc_and_inst __P((db_addr_t loc));
void db_printf __P((const char *fmt, ...));
void db_read_bytes __P((vm_offset_t addr, int size, char *data));
void db_read_bytes __P((vm_offset_t addr, size_t size, char *data));
/* machine-dependent */
int db_readline __P((char *lstart, int lsize));
void db_restart_at_pc __P((boolean_t watchpt));
@ -101,7 +101,7 @@ boolean_t db_stop_at_pc __P((boolean_t *is_breakpoint));
#define db_strcpy strcpy
void db_trap __P((int type, int code));
int db_value_of_name __P((char *name, db_expr_t *valuep));
void db_write_bytes __P((vm_offset_t addr, int size, char *data));
void db_write_bytes __P((vm_offset_t addr, size_t size, char *data));
/* machine-dependent */
void kdb_init __P((void));
void kdbprintf __P((const char *fmt, ...));

6
sys/dev/ar/if_ar.c

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.17 1998/01/08 23:40:37 eivind Exp $
* $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
*/
/*
@ -181,7 +181,7 @@ struct isa_driver ardriver = {arprobe, arattach, "arc"};
static void ar_xmit(struct ar_softc *sc);
static void arstart(struct ifnet *ifp);
static int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
static void arwatchdog(struct ifnet *ifp);
static int ar_packet_avail(struct ar_softc *sc, int *len, u_char *rxstat);
static void ar_copy_rxbuf(struct mbuf *m, struct ar_softc *sc, int len);
@ -597,7 +597,7 @@ top_arstart:
}
static int
arioctl(struct ifnet *ifp, int cmd, caddr_t data)
arioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
int s, error;
int was_up, should_be_up;

6
sys/dev/ar/if_ar_isa.c

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.17 1998/01/08 23:40:37 eivind Exp $
* $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
*/
/*
@ -181,7 +181,7 @@ struct isa_driver ardriver = {arprobe, arattach, "arc"};
static void ar_xmit(struct ar_softc *sc);
static void arstart(struct ifnet *ifp);
static int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
static void arwatchdog(struct ifnet *ifp);
static int ar_packet_avail(struct ar_softc *sc, int *len, u_char *rxstat);
static void ar_copy_rxbuf(struct mbuf *m, struct ar_softc *sc, int len);
@ -597,7 +597,7 @@ top_arstart:
}
static int
arioctl(struct ifnet *ifp, int cmd, caddr_t data)
arioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
int s, error;
int was_up, should_be_up;

2
sys/dev/bktr/bktr_core.c

@ -309,7 +309,7 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, card, CTLFLAG_RW, &bt848_card, -1, "");
SYSCTL_INT(_hw_bt848, OID_AUTO, tuner, CTLFLAG_RW, &bt848_tuner, -1, "");
SYSCTL_INT(_hw_bt848, OID_AUTO, reverse_mute, CTLFLAG_RW, &bt848_reverse_mute, -1, "");
typedef int ioctl_cmd_t;
typedef u_long ioctl_cmd_t;
#endif /* __FreeBSD__ */
#ifdef __bsdi__

4
sys/dev/ccd/ccd.c

@ -1,4 +1,4 @@
/* $Id: ccd.c,v 1.31 1998/02/22 10:01:23 jkh Exp $ */
/* $Id: ccd.c,v 1.32 1998/03/09 20:39:26 julian Exp $ */
/* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */
@ -1027,7 +1027,7 @@ ccdiodone(cbp)
static int
ccdioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

4
sys/dev/cy/cy.c

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.61 1998/02/13 12:45:47 phk Exp $
* $Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
*/
#include "opt_compat.h"
@ -1383,7 +1383,7 @@ siointr1(com)
static int
sioioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

4
sys/dev/cy/cy_isa.c

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.61 1998/02/13 12:45:47 phk Exp $
* $Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
*/
#include "opt_compat.h"
@ -1383,7 +1383,7 @@ siointr1(com)
static int
sioioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

4
sys/dev/de/if_devar.h

@ -1,5 +1,5 @@
/* $NetBSD: if_devar.h,v 1.26 1998/02/11 01:28:29 thorpej Exp $ */
/* $Id: if_devar.h,v 1.4 1997/11/08 14:46:58 peter Exp $ */
/* $Id: if_devar.h,v 1.5 1998/03/08 16:54:00 peter Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -913,7 +913,7 @@ static void tulip_softintr(void);
#if defined(__FreeBSD__)
typedef void ifnet_ret_t;
typedef int ioctl_cmd_t;
typedef u_long ioctl_cmd_t;
#if defined(TULIP_HDR_DATA)
static tulip_softc_t *tulips[TULIP_MAX_DEVICES];
#endif

4
sys/dev/dgb/dgb.c

@ -1,5 +1,5 @@
/*-
* dgb.c $Id: dgb.c,v 1.34 1998/04/21 21:06:22 brian Exp $
* dgb.c $Id: dgb.c,v 1.35 1998/04/21 21:06:56 brian Exp $
*
* Digiboard driver.
*
@ -1567,7 +1567,7 @@ dgbpoll(unit_c)
static int
dgbioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

6
sys/dev/dpt/dpt_control.c

@ -36,7 +36,7 @@
* future.
*/
#ident "$Id: dpt_control.c,v 1.4 1998/04/17 22:36:20 des Exp $"
#ident "$Id: dpt_control.c,v 1.5 1998/06/02 00:32:38 eivind Exp $"
#include "opt_dpt.h"
@ -74,7 +74,7 @@ static int dpt_open(dev_t dev, int flags, int fmt, struct proc * p);
static int dpt_close(dev_t dev, int flags, int fmt, struct proc * p);
static int dpt_write(dev_t dev, struct uio * uio, int ioflag);
static int dpt_read(dev_t dev, struct uio * uio, int ioflag);
static int dpt_ioctl(dev_t dev, int cmd, caddr_t cmdarg, int flags, struct proc * p);
static int dpt_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct proc * p);
/* This has to be modified as the processor and CPU are not known yet */
@ -666,7 +666,7 @@ dpt_read(dev_t dev, struct uio * uio, int ioflag)
*/
static int
dpt_ioctl(dev_t dev, int cmd, caddr_t cmdarg, int flags, struct proc * p)
dpt_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct proc * p)
{
int minor_no;
dpt_softc_t *dpt;

6
sys/dev/ed/if_ed.c

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.139 1998/04/15 17:45:15 bde Exp $
* $Id: if_ed.c,v 1.140 1998/04/17 22:36:34 des Exp $
*/
/*
@ -139,7 +139,7 @@ static int ed_attach __P((struct ed_softc *, int, int));
static int ed_attach_isa __P((struct isa_device *));
static void ed_init __P((void *));
static int ed_ioctl __P((struct ifnet *, int, caddr_t));
static int ed_ioctl __P((struct ifnet *, u_long, caddr_t));
static int ed_probe __P((struct isa_device *));
static void ed_start __P((struct ifnet *));
static void ed_reset __P((struct ifnet *));
@ -2582,7 +2582,7 @@ edintr(unit)
static int
ed_ioctl(ifp, command, data)
register struct ifnet *ifp;
int command;
u_long command;
caddr_t data;
{
struct ed_softc *sc = ifp->if_softc;

2
sys/dev/en/midwayvar.h

@ -72,7 +72,7 @@
#define EN_INTR_TYPE void
#define EN_INTR_RET(X) return
#define EN_IOCTL_CMDT int
#define EN_IOCTL_CMDT u_long
struct device {
char dv_xname[IFNAMSIZ];

6
sys/dev/ep/if_ep.c

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.73 1998/02/27 05:38:30 msmith Exp $
* $Id: if_ep.c,v 1.74 1998/03/28 13:24:01 bde Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -116,7 +116,7 @@ static int eeprom_rdy __P((struct ep_softc *sc));
static int ep_isa_probe __P((struct isa_device *));
static struct ep_board * ep_look_for_board_at __P((struct isa_device *is));
static int ep_isa_attach __P((struct isa_device *));
static int epioctl __P((struct ifnet * ifp, int, caddr_t));
static int epioctl __P((struct ifnet * ifp, u_long, caddr_t));
static void epinit __P((struct ep_softc *));
static void epread __P((struct ep_softc *));
@ -1197,7 +1197,7 @@ out:
static int
epioctl(ifp, cmd, data)
register struct ifnet *ifp;
int cmd;
u_long cmd;
caddr_t data;
{
register struct ifaddr *ifa = (struct ifaddr *) data;

6
sys/dev/ex/if_ex.c

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ex.c,v 1.10 1998/01/08 23:40:52 eivind Exp $
* $Id: if_ex.c,v 1.11 1998/03/28 13:24:06 bde Exp $
*/
/*
@ -119,7 +119,7 @@ static int ex_attach __P((struct isa_device *));
static void ex_init __P((void *));
static void ex_start __P((struct ifnet *));
static void ex_stop __P((int));
static int ex_ioctl __P((struct ifnet *, int, caddr_t));
static int ex_ioctl __P((struct ifnet *, u_long, caddr_t));
static void ex_reset __P((int));
static void ex_watchdog __P((struct ifnet *));
@ -760,7 +760,7 @@ void ex_rx_intr(int unit)
}
int ex_ioctl(register struct ifnet *ifp, int cmd, caddr_t data)
int ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
{
register struct ifaddr *ifa = (struct ifaddr *) data;
struct ex_softc *sc = &ex_sc[ifp->if_unit];

4
sys/dev/fdc/fdc.c

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.111 1998/05/06 22:14:41 julian Exp $
* $Id: fd.c,v 1.112 1998/05/06 23:35:36 julian Exp $
*
*/
@ -2040,7 +2040,7 @@ fdformat(dev, finfo, p)
static int
fdioctl(dev, cmd, addr, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t addr;
int flag;
struct proc *p;

6
sys/dev/fe/if_fe.c

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.39 1998/02/27 06:39:31 msmith Exp $
* $Id: if_fe.c,v 1.40 1998/03/28 13:24:09 bde Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@ -239,7 +239,7 @@ static struct fe_softc {
static int fe_probe ( struct isa_device * );
static int fe_attach ( struct isa_device * );
static void fe_init ( int );
static int fe_ioctl ( struct ifnet *, int, caddr_t );
static int fe_ioctl ( struct ifnet *, u_long, caddr_t );
static void fe_start ( struct ifnet * );
static void fe_reset ( int );
static void fe_watchdog ( struct ifnet * );
@ -2471,7 +2471,7 @@ feintr ( int unit )
* pretty ugly.
*/
static int
fe_ioctl ( struct ifnet * ifp, int command, caddr_t data )
fe_ioctl ( struct ifnet * ifp, u_long command, caddr_t data )
{
struct fe_softc *sc = ifp->if_softc;
int s, error = 0;

4
sys/dev/fxp/if_fxpvar.h

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_fxpvar.h,v 1.3 1997/09/29 11:27:43 davidg Exp $
* $Id: if_fxpvar.h,v 1.4 1997/11/29 08:11:01 davidg Exp $
*/
/*
@ -107,6 +107,6 @@ struct fxp_softc {
#define FXP_FORMAT "fxp%d"
#define FXP_ARGS(sc) (sc)->arpcom.ac_if.if_unit
#define FXP_INTR_TYPE void
#define FXP_IOCTLCMD_TYPE int
#define FXP_IOCTLCMD_TYPE u_long
#define FXP_BPFTAP_ARG(ifp) ifp
#endif /* __NetBSD__ */

6
sys/dev/ie/if_ie.c

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.51 1998/03/28 13:24:13 bde Exp $
* $Id: if_ie.c,v 1.52 1998/04/15 17:45:20 bde Exp $
*/
/*
@ -184,7 +184,7 @@ static int ee16_probe(struct isa_device * dvp);
static int check_ie_present(int unit, caddr_t where, unsigned size);
static void ieinit(int unit);
static void ie_stop(int unit);
static int ieioctl(struct ifnet * ifp, int command, caddr_t data);
static int ieioctl(struct ifnet * ifp, u_long command, caddr_t data);
static void iestart(struct ifnet * ifp);
static void el_reset_586(int unit);
@ -2251,7 +2251,7 @@ ie_stop(int unit)
}
static int
ieioctl(struct ifnet *ifp, int command, caddr_t data)
ieioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct ifaddr *ifa = (struct ifaddr *) data;
struct ie_softc *ie = ifp->if_softc;

2
sys/dev/joy/joy.c

@ -188,7 +188,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
}
static int
joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
joyioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
int unit = UNIT (dev);
int i = joypart (dev);

6
sys/dev/lnc/if_lnc.c

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_lnc.c,v 1.41 1998/05/27 09:59:13 paul Exp $
* $Id: if_lnc.c,v 1.42 1998/05/27 11:05:17 paul Exp $
*/
/*
@ -175,7 +175,7 @@ static void lnc_init __P((struct lnc_softc *sc));
static __inline int mbuf_to_buffer __P((struct mbuf *m, char *buffer));
static __inline struct mbuf *chain_to_cluster __P((struct mbuf *m));
static void lnc_start __P((struct ifnet *ifp));
static int lnc_ioctl __P((struct ifnet *ifp, int command, caddr_t data));
static int lnc_ioctl __P((struct ifnet *ifp, u_long command, caddr_t data));
static void lnc_watchdog __P((struct ifnet *ifp));
#ifdef DEBUG
static void lnc_dump_state __P((struct lnc_softc *sc));
@ -1749,7 +1749,7 @@ lnc_start(struct ifnet *ifp)
}
static int
lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
lnc_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
{
struct lnc_softc *sc = ifp->if_softc;

4
sys/dev/mcd/mcd.c

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.96 1997/12/02 21:06:25 phk Exp $
* $Id: mcd.c,v 1.97 1998/01/24 02:54:22 eivind Exp $
*/
static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -506,7 +506,7 @@ static void mcd_start(int unit)
return;
}
int mcdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
int mcdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
{
struct mcd_data *cd;
int unit,part,retry,r;

4
sys/dev/mse/mse.c

@ -11,7 +11,7 @@
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* $Id: mse.c,v 1.36 1997/12/07 08:09:16 yokota Exp $
* $Id: mse.c,v 1.37 1998/01/24 02:54:22 eivind Exp $
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@ -401,7 +401,7 @@ mseread(dev, uio, ioflag)
static int
mseioctl(dev, cmd, addr, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t addr;
int flag;
struct proc *p;

10
sys/dev/pci/pci.c

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pci.c,v 1.81 1998/01/24 02:54:47 eivind Exp $
* $Id: pci.c,v 1.82 1998/04/01 21:07:36 tegge Exp $
*
*/
@ -31,6 +31,7 @@
#if NPCI > 0
#include "opt_devfs.h"
#include "opt_simos.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -434,6 +435,11 @@ pci_probebus(int bus)
pcicfgregs probe;
int bushigh = bus;
#ifdef SIMOS
#undef PCI_SLOTMAX
#define PCI_SLOTMAX 0
#endif
bzero(&probe, sizeof probe);
probe.parent = pci_bridgeto(bus);
probe.bus = bus;
@ -509,7 +515,7 @@ pci_close(dev_t dev, int flag, int devtype, struct proc *p)
}
static int
pci_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
struct pci_io *io;
int error;

4
sys/dev/pdq/pdqvar.h

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pdqvar.h,v 1.19 1996/07/31 21:38:44 thomas Exp $
* $Id: pdqvar.h,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $
*
*/
@ -105,7 +105,7 @@ enum _pdq_type_t {
#include <machine/cpufunc.h>
#include <machine/clock.h>
typedef void ifnet_ret_t;
typedef int ioctl_cmd_t;
typedef u_long ioctl_cmd_t;
typedef enum { PDQ_BUS_EISA, PDQ_BUS_PCI } pdq_bus_t;
typedef u_int16_t pdq_bus_ioport_t;
typedef volatile pdq_uint32_t *pdq_bus_memaddr_t;

4
sys/dev/ppbus/nlpt.c

@ -47,7 +47,7 @@
*
* from: unknown origin, 386BSD 0.1
* From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
* $Id: nlpt.c,v 1.6 1997/12/02 21:06:09 phk Exp $
* $Id: nlpt.c,v 1.7 1998/01/24 02:54:05 eivind Exp $
*/
/*
@ -760,7 +760,7 @@ nlptintr(int unit)
}
static int
nlptioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
nlptioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
{
int error = 0;
struct lpt_data *sc;

4
sys/dev/ppbus/ppi.c

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ppi.c,v 1.5 1997/09/01 00:51:49 bde Exp $
* $Id: ppi.c,v 1.6 1998/01/02 09:30:39 msmith Exp $
*
*/
#include "ppi.h"
@ -164,7 +164,7 @@ ppiclose(dev_t dev, int flags, int fmt, struct proc *p)
}
static int
ppiioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
ppiioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
{
u_int unit = minor(dev);
struct ppi_data *ppi = ppidata[unit];

3
sys/dev/rc/rc.c

@ -1090,7 +1090,8 @@ struct rc_softc *rcb;
static int
rcioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd, flag;
u_long cmd;
int flag;
caddr_t data;
struct proc *p;
{

2
sys/dev/rp/rp.c

@ -1586,7 +1586,7 @@ rpdtrwakeup(void *chan)
int
rpioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

4
sys/dev/scd/scd.c

@ -41,7 +41,7 @@
*/
/* $Id: scd.c,v 1.35 1998/01/24 02:54:24 eivind Exp $ */
/* $Id: scd.c,v 1.36 1998/04/15 17:45:48 bde Exp $ */
/* Please send any comments to micke@dynas.se */
@ -418,7 +418,7 @@ scd_start(int unit)
}
static int
scdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
scdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
{
struct scd_data *cd;
int unit,part;

4
sys/dev/si/si.c

@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
* $Id: si.c,v 1.69 1998/03/23 16:27:37 peter Exp $
* $Id: si.c,v 1.70 1998/03/28 13:24:39 bde Exp $
*/
#ifndef lint
@ -1481,7 +1481,7 @@ sidevtotty(dev_t dev)
static int
siioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

4
sys/dev/sio/sio.c

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.204 1998/06/03 09:43:38 bde Exp $
* $Id: sio.c,v 1.205 1998/06/03 12:30:10 bde Exp $
*/
#include "opt_comconsole.h"
@ -1688,7 +1688,7 @@ cont:
static int
sioioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

2
sys/dev/snp/snp.c

@ -395,7 +395,7 @@ snpdown(snp)
static int
snpioctl(dev, cmd, data, flags, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flags;
struct proc *p;

4
sys/dev/speaker/spkr.c

@ -4,7 +4,7 @@
* v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
* modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
*
* $Id: spkr.c,v 1.32 1998/02/09 06:08:41 eivind Exp $
* $Id: spkr.c,v 1.33 1998/02/20 13:46:55 bde Exp $
*/
#include "speaker.h"
@ -540,7 +540,7 @@ spkrclose(dev, flags, fmt, p)
int
spkrioctl(dev, cmd, cmdarg, flags, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t cmdarg;
int flags;
struct proc *p;

6
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;

6
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;

4
sys/dev/syscons/syscons.c

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.260 1998/04/17 10:03:11 des Exp $
* $Id: syscons.c,v 1.261 1998/05/17 11:52:18 phk Exp $
*/
#include "sc.h"
@ -984,7 +984,7 @@ scparam(struct tty *tp, struct termios *t)
}
int
scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
int error;
u_int i;

4
sys/dev/tx/if_tx.c

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_tx.c,v 1.9 1998/04/13 14:15:40 semenu Exp $
* $Id: if_tx.c,v 1.10 1998/04/15 17:47:05 bde Exp $
*
*/
@ -106,7 +106,7 @@ DATA_SET ( pcidevice_set, txdevice );
static int
epic_ifioctl __P((
register struct ifnet * ifp,
int command, caddr_t data))
u_long command, caddr_t data))
{
epic_softc_t *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;

4
sys/dev/vn/vn.c

@ -38,7 +38,7 @@
* from: Utah Hdr: vn.c 1.13 94/04/02
*
* from: @(#)vn.c 8.6 (Berkeley) 4/1/94
* $Id: vn.c,v 1.58 1998/04/24 07:53:59 julian Exp $
* $Id: vn.c,v 1.59 1998/05/06 22:14:38 julian Exp $
*/
/*
@ -605,7 +605,7 @@ vniodone( struct buf *bp) {
/* ARGSUSED */
static int
vnioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
vnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
struct vn_softc *vn = vn_softc[vnunit(dev)];
struct vn_ioctl *vio;

6
sys/dev/vx/if_vx.c

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
* $Id: if_vx.c,v 1.16 1998/02/21 05:35:02 gpalmer Exp $
*
*/
@ -118,7 +118,7 @@ static struct connector_entry {
static void vxtxstat __P((struct vx_softc *));
static int vxstatus __P((struct vx_softc *));
static void vxinit __P((void *));
static int vxioctl __P((struct ifnet *, int, caddr_t));
static int vxioctl __P((struct ifnet *, u_long, caddr_t));
static void vxstart __P((struct ifnet *ifp));
static void vxwatchdog __P((struct ifnet *));
static void vxreset __P((struct vx_softc *));
@ -896,7 +896,7 @@ vxget(sc, totlen)
static int
vxioctl(ifp, cmd, data)
register struct ifnet *ifp;
int cmd;
u_long cmd;
caddr_t data;
{
struct vx_softc *sc = vx_softc[ifp->if_unit];

6
sys/dev/wl/if_wl.c

@ -1,4 +1,4 @@
/* $Id: if_wl.c,v 1.10 1998/01/08 23:41:04 eivind Exp $ */
/* $Id: if_wl.c,v 1.11 1998/02/20 13:11:47 bde Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -301,7 +301,7 @@ SYSCTL_INT(_machdep, OID_AUTO, wl_gather_snr, CTLFLAG_RW, &gathersnr, 0, "");
static void wlstart(struct ifnet *ifp);
static void wlinit(void *xsc);
static int wlioctl(struct ifnet *ifp, int cmd, caddr_t data);
static int wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
static timeout_t wlwatchdog;
static void wlxmt(int unt, struct mbuf *m);
static int wldiag(int unt);
@ -1169,7 +1169,7 @@ wlread(int unit, u_short fd_p)
*
*/
static int
wlioctl(struct ifnet *ifp, int cmd, caddr_t data)
wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
register struct ifaddr *ifa = (struct ifaddr *)data;
register struct ifreq *ifr = (struct ifreq *)data;

4
sys/fs/cd9660/cd9660_vfsops.c

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
* $Id: cd9660_vfsops.c,v 1.38 1998/04/20 23:18:46 julian Exp $
* $Id: cd9660_vfsops.c,v 1.39 1998/05/06 05:29:30 msmith Exp $
*/
#include <sys/param.h>
@ -197,7 +197,7 @@ cd9660_mount(mp, path, data, ndp, p)
{
struct vnode *devvp;
struct iso_args args;
u_int size;
size_t size;
int error;
struct iso_mnt *imp = 0;

4
sys/fs/procfs/procfs_mem.c

@ -37,7 +37,7 @@
*
* @(#)procfs_mem.c 8.5 (Berkeley) 6/15/94
*
* $Id: procfs_mem.c,v 1.31 1998/04/17 22:36:55 des Exp $
* $Id: procfs_mem.c,v 1.32 1998/05/19 00:00:14 tegge Exp $
*/
/*
@ -159,7 +159,7 @@ procfs_rwmem(curp, p, uio)
fill_eproc (p, &p->p_addr->u_kproc.kp_eproc);
/* locate the in-core address */
tkva = (u_int)p->p_addr + uva - VM_MAXUSER_ADDRESS;
tkva = (u_long)p->p_addr + uva - VM_MAXUSER_ADDRESS;
/* transfer it */
error = uiomove((caddr_t)tkva, len, uio);

4
sys/fs/procfs/procfs_vfsops.c

@ -36,7 +36,7 @@
*
* @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95
*
* $Id: procfs_vfsops.c,v 1.20 1998/03/01 22:46:22 msmith Exp $
* $Id: procfs_vfsops.c,v 1.21 1998/05/06 05:29:36 msmith Exp $
*/
/*
@ -75,7 +75,7 @@ procfs_mount(mp, path, data, ndp, p)
struct nameidata *ndp;
struct proc *p;
{
u_int size;
size_t size;
if (UIO_MX & (UIO_MX-1)) {
log(LOG_ERR, "procfs: invalid directory entry size\n");

4
sys/fs/specfs/spec_vnops.c

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
* $Id: spec_vnops.c,v 1.61 1998/04/19 23:32:26 julian Exp $
* $Id: spec_vnops.c,v 1.62 1998/05/21 07:47:49 dyson Exp $
*/
#include <sys/param.h>
@ -431,7 +431,7 @@ spec_ioctl(ap)
ap->a_fflag, ap->a_p));
case VBLK:
if (ap->a_command == 0 && (int)ap->a_data == B_TAPE)
if (ap->a_command == 0 && (long)ap->a_data == B_TAPE)
if ((bdevsw[major(dev)]->d_flags & D_TYPEMASK) ==
D_TAPE)
return (0);

4
sys/geom/geom_ccd.c

@ -1,4 +1,4 @@
/* $Id: ccd.c,v 1.31 1998/02/22 10:01:23 jkh Exp $ */
/* $Id: ccd.c,v 1.32 1998/03/09 20:39:26 julian Exp $ */
/* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */
@ -1027,7 +1027,7 @@ ccdiodone(cbp)
static int
ccdioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

4
sys/gnu/i386/isa/dgb.c

@ -1,5 +1,5 @@
/*-
* dgb.c $Id: dgb.c,v 1.34 1998/04/21 21:06:22 brian Exp $
* dgb.c $Id: dgb.c,v 1.35 1998/04/21 21:06:56 brian Exp $
*
* Digiboard driver.
*
@ -1567,7 +1567,7 @@ dgbpoll(unit_c)
static int
dgbioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

4
sys/i386/apm/apm.c

@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
* $Id: apm.c,v 1.70 1998/03/30 09:47:57 phk Exp $
* $Id: apm.c,v 1.71 1998/06/03 01:59:32 msmith Exp $
*/
#include "opt_devfs.h"
@ -917,7 +917,7 @@ apmclose(dev_t dev, int flag, int fmt, struct proc *p)
}
static int
apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
struct apm_softc *sc = &apm_softc;
int error = 0;

4
sys/i386/bios/apm.c

@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
* $Id: apm.c,v 1.70 1998/03/30 09:47:57 phk Exp $
* $Id: apm.c,v 1.71 1998/06/03 01:59:32 msmith Exp $
*/
#include "opt_devfs.h"
@ -917,7 +917,7 @@ apmclose(dev_t dev, int flag, int fmt, struct proc *p)
}
static int
apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
struct apm_softc *sc = &apm_softc;
int error = 0;

4
sys/i386/i386/cons.c

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
* $Id: cons.c,v 1.56 1998/01/24 02:54:12 eivind Exp $
* $Id: cons.c,v 1.57 1998/03/28 10:32:56 bde Exp $
*/
#include "opt_devfs.h"
@ -352,7 +352,7 @@ cnwrite(dev, uio, flag)
static int
cnioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

6
sys/i386/i386/db_interface.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_interface.c,v 1.37 1997/10/27 17:23:12 bde Exp $
* $Id: db_interface.c,v 1.38 1997/11/20 18:09:36 bde Exp $
*/
/*
@ -213,7 +213,7 @@ kdb_trap(type, code, regs)
void
db_read_bytes(addr, size, data)
vm_offset_t addr;
register int size;
register size_t size;
register char *data;
{
register char *src;
@ -233,7 +233,7 @@ db_read_bytes(addr, size, data)
void
db_write_bytes(addr, size, data)
vm_offset_t addr;
register int size;
register size_t size;
register char *data;
{
register char *dst;

34
sys/i386/i386/db_trace.c

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: db_trace.c,v 1.26 1997/10/27 17:23:18 bde Exp $
* $Id: db_trace.c,v 1.27 1997/11/20 18:24:52 bde Exp $
*/
#include <sys/param.h>
@ -44,24 +44,24 @@
* Machine register set.
*/
struct db_variable db_regs[] = {
"cs", (int *)&ddb_regs.tf_cs, FCN_NULL,
"ds", (int *)&ddb_regs.tf_ds, FCN_NULL,
"es", (int *)&ddb_regs.tf_es, FCN_NULL,
"cs", (long *)&ddb_regs.tf_cs, FCN_NULL,
"ds", (long *)&ddb_regs.tf_ds, FCN_NULL,
"es", (long *)&ddb_regs.tf_es, FCN_NULL,
#if 0
"fs", (int *)&ddb_regs.tf_fs, FCN_NULL,
"gs", (int *)&ddb_regs.tf_gs, FCN_NULL,
"fs", (long *)&ddb_regs.tf_fs, FCN_NULL,
"gs", (long *)&ddb_regs.tf_gs, FCN_NULL,
#endif
"ss", (int *)&ddb_regs.tf_ss, FCN_NULL,
"eax", (int *)&ddb_regs.tf_eax, FCN_NULL,
"ecx", (int *)&ddb_regs.tf_ecx, FCN_NULL,
"edx", (int *)&ddb_regs.tf_edx, FCN_NULL,
"ebx", (int *)&ddb_regs.tf_ebx, FCN_NULL,
"esp", (int *)&ddb_regs.tf_esp,FCN_NULL,
"ebp", (int *)&ddb_regs.tf_ebp, FCN_NULL,
"esi", (int *)&ddb_regs.tf_esi, FCN_NULL,
"edi", (int *)&ddb_regs.tf_edi, FCN_NULL,
"eip", (int *)&ddb_regs.tf_eip, FCN_NULL,
"efl", (int *)&ddb_regs.tf_eflags, FCN_NULL,
"ss", (long *)&ddb_regs.tf_ss, FCN_NULL,
"eax", (long *)&ddb_regs.tf_eax, FCN_NULL,
"ecx", (long *)&ddb_regs.tf_ecx, FCN_NULL,
"edx", (long *)&ddb_regs.tf_edx, FCN_NULL,
"ebx", (long *)&ddb_regs.tf_ebx, FCN_NULL,
"esp", (long *)&ddb_regs.tf_esp,FCN_NULL,
"ebp", (long *)&ddb_regs.tf_ebp, FCN_NULL,
"esi", (long *)&ddb_regs.tf_esi, FCN_NULL,
"edi", (long *)&ddb_regs.tf_edi, FCN_NULL,
"eip", (long *)&ddb_regs.tf_eip, FCN_NULL,
"efl", (long *)&ddb_regs.tf_eflags, FCN_NULL,
};
struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);

6
sys/i386/i386/machdep.c

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.297 1998/05/28 09:29:57 phk Exp $
* $Id: machdep.c,v 1.298 1998/06/03 07:56:59 bde Exp $
*/
#include "apm.h"
@ -1614,7 +1614,7 @@ f00f_hack(void *unused) {
int
ptrace_set_pc(p, addr)
struct proc *p;
unsigned int addr;
unsigned long addr;
{
p->p_md.md_regs->tf_eip = addr;
return (0);
@ -1653,7 +1653,7 @@ int ptrace_read_u_check(p, addr, len)
int ptrace_write_u(p, off, data)
struct proc *p;
vm_offset_t off;
int data;
long data;
{
struct trapframe frame_copy;
vm_offset_t min;

4
sys/i386/i386/mem.c

@ -38,7 +38,7 @@
*
* from: Utah $Hdr: mem.c 1.13 89/10/08$
* from: @(#)mem.c 7.2 (Berkeley) 5/9/91
* $Id: mem.c,v 1.49 1998/01/24 02:54:13 eivind Exp $
* $Id: mem.c,v 1.50 1998/03/12 09:14:18 bde Exp $
*/
/*
@ -405,7 +405,7 @@ memmmap(dev_t dev, int offset, int nprot)
static int
mmioctl(dev, cmd, cmdarg, flags, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t cmdarg;
int flags;
struct proc *p;

2
sys/i386/ibcs2/ibcs2_ioctl.c

@ -338,7 +338,7 @@ ibcs2_ioctl(p, uap)
{
struct filedesc *fdp = p->p_fd;
struct file *fp;
int (*ctl) __P((struct file *, int, caddr_t, struct proc *));
int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *));
int error;
if (SCARG(uap, fd) < 0 || SCARG(uap, fd) >= fdp->fd_nfiles ||

2
sys/i386/ibcs2/ibcs2_isc_sysent.c

@ -5,6 +5,8 @@
* created from Id: syscalls.isc,v 1.4 1997/04/09 15:44:44 bde Exp
*/
#include "opt_compat.h"
#include <sys/param.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>

293
sys/i386/ibcs2/ibcs2_proto.h

@ -10,260 +10,265 @@
#include <sys/signal.h>
struct proc;
#define PAD_(t) sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t)
struct ibcs2_read_args {
int fd;
char * buf;
u_int nbytes;
int fd; char fd_[PAD_(int)];
char * buf; char buf_[PAD_(char *)];
u_int nbytes; char nbytes_[PAD_(u_int)];
};
struct ibcs2_open_args {
char * path;
int flags;
int mode;
char * path; char path_[PAD_(char *)];
int flags; char flags_[PAD_(int)];
int mode; char mode_[PAD_(int)];
};
struct ibcs2_wait_args {
int a1;
int a2;
int a3;
int a1; char a1_[PAD_(int)];
int a2; char a2_[PAD_(int)];
int a3; char a3_[PAD_(int)];
};
struct ibcs2_creat_args {
char * path;
int mode;
char * path; char path_[PAD_(char *)];
int mode; char mode_[PAD_(int)];
};
struct ibcs2_unlink_args {
char * path;
char * path; char path_[PAD_(char *)];
};
struct ibcs2_execv_args {
char * path;
char ** argp;
char * path; char path_[PAD_(char *)];
char ** argp; char argp_[PAD_(char **)];
};
struct ibcs2_chdir_args {
char * path;
char * path; char path_[PAD_(char *)];
};
struct ibcs2_time_args {
ibcs2_time_t * tp;
ibcs2_time_t * tp; char tp_[PAD_(ibcs2_time_t *)];
};
struct ibcs2_mknod_args {
char * path;
int mode;
int dev;
char * path; char path_[PAD_(char *)];
int mode; char mode_[PAD_(int)];
int dev; char dev_[PAD_(int)];
};
struct ibcs2_chmod_args {
char * path;
int mode;
char * path; char path_[PAD_(char *)];
int mode; char mode_[PAD_(int)];
};
struct ibcs2_chown_args {
char * path;
int uid;
int gid;
char * path; char path_[PAD_(char *)];
int uid; char uid_[PAD_(int)];
int gid; char gid_[PAD_(int)];
};
struct ibcs2_stat_args {
char * path;
struct ibcs2_stat * st;
char * path; char path_[PAD_(char *)];
struct ibcs2_stat * st; char st_[PAD_(struct ibcs2_stat *)];
};
struct ibcs2_lseek_args {
int fd;
long offset;
int whence;
int fd; char fd_[PAD_(int)];
long offset; char offset_[PAD_(long)];
int whence; char whence_[PAD_(int)];
};
struct ibcs2_mount_args {
char * special;
char * dir;
int flags;
int fstype;
char * data;
int len;
char * special; char special_[PAD_(char *)];
char * dir; char dir_[PAD_(char *)];
int flags; char flags_[PAD_(int)];
int fstype; char fstype_[PAD_(int)];
char * data; char data_[PAD_(char *)];
int len; char len_[PAD_(int)];
};
struct ibcs2_umount_args {
char * name;
char * name; char name_[PAD_(char *)];
};
struct ibcs2_setuid_args {
int uid;
int uid; char uid_[PAD_(int)];
};
struct ibcs2_stime_args {
long * timep;
long * timep; char timep_[PAD_(long *)];
};
struct ibcs2_alarm_args {
unsigned sec;
unsigned sec; char sec_[PAD_(unsigned)];
};
struct ibcs2_fstat_args {
int fd;
struct ibcs2_stat * st;
int fd; char fd_[PAD_(int)];
struct ibcs2_stat * st; char st_[PAD_(struct ibcs2_stat *)];
};
struct ibcs2_pause_args {
int dummy;
register_t dummy;
};
struct ibcs2_utime_args {
char * path;
struct ibcs2_utimbuf * buf;
char * path; char path_[PAD_(char *)];
struct ibcs2_utimbuf * buf; char buf_[PAD_(struct ibcs2_utimbuf *)];
};
struct ibcs2_stty_args {
int fd;
struct sgttyb * buf;
int fd; char fd_[PAD_(int)];
struct sgttyb * buf; char buf_[PAD_(struct sgttyb *)];
};
struct ibcs2_gtty_args {
int fd;
struct sgttyb * buf;
int fd; char fd_[PAD_(int)];
struct sgttyb * buf; char buf_[PAD_(struct sgttyb *)];
};
struct ibcs2_access_args {
char * path;
int flags;
char * path; char path_[PAD_(char *)];
int flags; char flags_[PAD_(int)];
};
struct ibcs2_nice_args {
int incr;
int incr; char incr_[PAD_(int)];
};
struct ibcs2_statfs_args {
char * path;
struct ibcs2_statfs * buf;
int len;
int fstype;
char * path; char path_[PAD_(char *)];
struct ibcs2_statfs * buf; char buf_[PAD_(struct ibcs2_statfs *)];
int len; char len_[PAD_(int)];
int fstype; char fstype_[PAD_(int)];
};
struct ibcs2_kill_args {
int pid;
int signo;
int pid; char pid_[PAD_(int)];
int signo; char signo_[PAD_(int)];
};
struct ibcs2_fstatfs_args {
int fd;
struct ibcs2_statfs * buf;
int len;
int fstype;
int fd; char fd_[PAD_(int)];
struct ibcs2_statfs * buf; char buf_[PAD_(struct ibcs2_statfs *)];
int len; char len_[PAD_(int)];
int fstype; char fstype_[PAD_(int)];
};
struct ibcs2_pgrpsys_args {
int type;
caddr_t dummy;
int pid;
int pgid;
int type; char type_[PAD_(int)];
caddr_t dummy; char dummy_[PAD_(caddr_t)];
int pid; char pid_[PAD_(int)];
int pgid; char pgid_[PAD_(int)];
};
struct ibcs2_xenix_args {
int a1;
int a2;
int a3;
int a4;
int a5;
int a1; char a1_[PAD_(int)];
int a2; char a2_[PAD_(int)];
int a3; char a3_[PAD_(int)];
int a4; char a4_[PAD_(int)];
int a5; char a5_[PAD_(int)];
};
struct ibcs2_times_args {
struct tms * tp;
struct tms * tp; char tp_[PAD_(struct tms *)];
};
struct ibcs2_plock_args {
int cmd;
int cmd; char cmd_[PAD_(int)];
};
struct ibcs2_setgid_args {
int gid;
int gid; char gid_[PAD_(int)];
};
struct ibcs2_sigsys_args {
int sig;
ibcs2_sig_t fp;
int sig; char sig_[PAD_(int)];
ibcs2_sig_t fp; char fp_[PAD_(ibcs2_sig_t)];
};
struct ibcs2_msgsys_args {
int which;
int a2;
int a3;
int a4;
int a5;
int a6;
int which; char which_[PAD_(int)];
int a2; char a2_[PAD_(int)];
int a3; char a3_[PAD_(int)];
int a4; char a4_[PAD_(int)];
int a5; char a5_[PAD_(int)];
int a6; char a6_[PAD_(int)];
};
struct ibcs2_sysi86_args {
int cmd;
int * arg;
int cmd; char cmd_[PAD_(int)];
int * arg; char arg_[PAD_(int *)];
};
struct ibcs2_shmsys_args {
int which;
int a2;
int a3;
int a4;
int which; char which_[PAD_(int)];
int a2; char a2_[PAD_(int)];
int a3; char a3_[PAD_(int)];
int a4; char a4_[PAD_(int)];
};
struct ibcs2_semsys_args {
int which;
int a2;
int a3;
int a4;
int a5;
int which; char which_[PAD_(int)];
int a2; char a2_[PAD_(int)];
int a3; char a3_[PAD_(int)];
int a4; char a4_[PAD_(int)];
int a5; char a5_[PAD_(int)];
};
struct ibcs2_ioctl_args {
int fd;
int cmd;
caddr_t data;
int fd; char fd_[PAD_(int)];
int cmd; char cmd_[PAD_(int)];
caddr_t data; char data_[PAD_(caddr_t)];
};
struct ibcs2_uadmin_args {
int cmd;
int func;
caddr_t data;
int cmd; char cmd_[PAD_(int)];
int func; char func_[PAD_(int)];
caddr_t data; char data_[PAD_(caddr_t)];
};
struct ibcs2_utssys_args {
int a1;
int a2;
int flag;
int a1; char a1_[PAD_(int)];
int a2; char a2_[PAD_(int)];
int flag; char flag_[PAD_(int)];
};
struct ibcs2_execve_args {
char * path;
char ** argp;
char ** envp;
char * path; char path_[PAD_(char *)];
char ** argp; char argp_[PAD_(char **)];
char ** envp; char envp_[PAD_(char **)];
};
struct ibcs2_fcntl_args {
int fd;
int cmd;
char * arg;
int fd; char fd_[PAD_(int)];
int cmd; char cmd_[PAD_(int)];
char * arg; char arg_[PAD_(char *)];
};
struct ibcs2_ulimit_args {
int cmd;
int newlimit;
int cmd; char cmd_[PAD_(int)];
int newlimit; char newlimit_[PAD_(int)];
};
struct ibcs2_rmdir_args {
char * path;
char * path; char path_[PAD_(char *)];
};
struct ibcs2_mkdir_args {
char * path;
int mode;
char * path; char path_[PAD_(char *)];
int mode; char mode_[PAD_(int)];
};
struct ibcs2_getdents_args {
int fd;
char * buf;
int nbytes;
int fd; char fd_[PAD_(int)];
char * buf; char buf_[PAD_(char *)];
int nbytes; char nbytes_[PAD_(int)];
};
struct ibcs2_sysfs_args {
int cmd;
caddr_t d1;
char * buf;
int cmd; char cmd_[PAD_(int)];
caddr_t d1; char d1_[PAD_(caddr_t)];
char * buf; char buf_[PAD_(char *)];
};
struct ibcs2_getmsg_args {
int fd;
struct ibcs2_stropts * ctl;
struct ibcs2_stropts * dat;
int * flags;
int fd; char fd_[PAD_(int)];
struct ibcs2_stropts * ctl; char ctl_[PAD_(struct ibcs2_stropts *)];
struct ibcs2_stropts * dat; char dat_[PAD_(struct ibcs2_stropts *)];
int * flags; char flags_[PAD_(int *)];
};
struct ibcs2_putmsg_args {
int fd;
struct ibcs2_stropts * ctl;
struct ibcs2_stropts * dat;
int flags;
int fd; char fd_[PAD_(int)];
struct ibcs2_stropts * ctl; char ctl_[PAD_(struct ibcs2_stropts *)];
struct ibcs2_stropts * dat; char dat_[PAD_(struct ibcs2_stropts *)];
int flags; char flags_[PAD_(int)];
};
struct ibcs2_poll_args {
struct ibcs2_poll * fds;
long nfds;
int timeout;
struct ibcs2_poll * fds; char fds_[PAD_(struct ibcs2_poll *)];
long nfds; char nfds_[PAD_(long)];
int timeout; char timeout_[PAD_(int)];
};
struct ibcs2_secure_args {
int cmd;
int a1;
int a2;
int a3;
int a4;
int a5;
int cmd; char cmd_[PAD_(int)];
int a1; char a1_[PAD_(int)];
int a2; char a2_[PAD_(int)];
int a3; char a3_[PAD_(int)];
int a4; char a4_[PAD_(int)];
int a5; char a5_[PAD_(int)];
};
struct ibcs2_symlink_args {
char * path;
char * link;
char * path; char path_[PAD_(char *)];
char * link; char link_[PAD_(char *)];
};
struct ibcs2_lstat_args {
char * path;
struct ibcs2_stat * st;
char * path; char path_[PAD_(char *)];
struct ibcs2_stat * st; char st_[PAD_(struct ibcs2_stat *)];
};
struct ibcs2_readlink_args {
char * path;
char * buf;
int count;
char * path; char path_[PAD_(char *)];
char * buf; char buf_[PAD_(char *)];
int count; char count_[PAD_(int)];
};
struct ibcs2_isc_args {
int dummy;
register_t dummy;
};
int ibcs2_read __P((struct proc *, struct ibcs2_read_args *));
int ibcs2_open __P((struct proc *, struct ibcs2_open_args *));
@ -327,4 +332,6 @@ int ibcs2_isc __P((struct proc *, struct ibcs2_isc_args *));
#endif /* COMPAT_43 */
#undef PAD_
#endif /* !_IBCS2_SYSPROTO_H_ */

2
sys/i386/ibcs2/ibcs2_sysent.c

@ -5,6 +5,8 @@
* created from Id: syscalls.master,v 1.8 1997/04/09 15:44:46 bde Exp
*/
#include "opt_compat.h"
#include <sys/param.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>

68
sys/i386/ibcs2/ibcs2_xenix.h

@ -10,67 +10,72 @@
#include <sys/signal.h>
struct proc;
#define PAD_(t) sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t)
struct xenix_rdchk_args {
int fd;
int fd; char fd_[PAD_(int)];
};
struct xenix_chsize_args {
int fd;
long size;
int fd; char fd_[PAD_(int)];
long size; char size_[PAD_(long)];
};
struct xenix_ftime_args {
struct timeb * tp;
struct timeb * tp; char tp_[PAD_(struct timeb *)];
};
struct xenix_nap_args {
int millisec;
int millisec; char millisec_[PAD_(int)];
};
struct xenix_scoinfo_args {
int dummy;
register_t dummy;
};
struct xenix_eaccess_args {
char * path;
int flags;
char * path; char path_[PAD_(char *)];
int flags; char flags_[PAD_(int)];
};
struct ibcs2_sigaction_args {
int sig;
struct ibcs2_sigaction * act;
struct ibcs2_sigaction * oact;
int sig; char sig_[PAD_(int)];
struct ibcs2_sigaction * act; char act_[PAD_(struct ibcs2_sigaction *)];
struct ibcs2_sigaction * oact; char oact_[PAD_(struct ibcs2_sigaction *)];
};
struct ibcs2_sigprocmask_args {
int how;
ibcs2_sigset_t * set;
ibcs2_sigset_t * oset;
int how; char how_[PAD_(int)];
ibcs2_sigset_t * set; char set_[PAD_(ibcs2_sigset_t *)];
ibcs2_sigset_t * oset; char oset_[PAD_(ibcs2_sigset_t *)];
};
struct ibcs2_sigpending_args {
ibcs2_sigset_t * mask;
ibcs2_sigset_t * mask; char mask_[PAD_(ibcs2_sigset_t *)];
};
struct ibcs2_sigsuspend_args {
ibcs2_sigset_t * mask;
ibcs2_sigset_t * mask; char mask_[PAD_(ibcs2_sigset_t *)];
};
struct ibcs2_getgroups_args {
int gidsetsize;
ibcs2_gid_t * gidset;
int gidsetsize; char gidsetsize_[PAD_(int)];
ibcs2_gid_t * gidset; char gidset_[PAD_(ibcs2_gid_t *)];
};
struct ibcs2_setgroups_args {
int gidsetsize;
ibcs2_gid_t * gidset;
int gidsetsize; char gidsetsize_[PAD_(int)];
ibcs2_gid_t * gidset; char gidset_[PAD_(ibcs2_gid_t *)];
};
struct ibcs2_sysconf_args {
int name;
int name; char name_[PAD_(int)];
};
struct ibcs2_pathconf_args {
char * path;
int name;
char * path; char path_[PAD_(char *)];
int name; char name_[PAD_(int)];
};
struct ibcs2_fpathconf_args {
int fd;
int name;
int fd; char fd_[PAD_(int)];
int name; char name_[PAD_(int)];
};
struct ibcs2_rename_args {
char * from;
char * to;
char * from; char from_[PAD_(char *)];
char * to; char to_[PAD_(char *)];
};
struct xenix_utsname_args {
long addr;
long addr; char addr_[PAD_(long)];
};
int xenix_rdchk __P((struct proc *, struct xenix_rdchk_args *));
int xenix_chsize __P((struct proc *, struct xenix_chsize_args *));
@ -90,4 +95,11 @@ int ibcs2_fpathconf __P((struct proc *, struct ibcs2_fpathconf_args *));
int ibcs2_rename __P((struct proc *, struct ibcs2_rename_args *));
int xenix_utsname __P((struct proc *, struct xenix_utsname_args *));
#ifdef COMPAT_43
#endif /* COMPAT_43 */
#undef PAD_
#endif /* !_IBCS2_XENIX_H_ */

2
sys/i386/ibcs2/ibcs2_xenix_sysent.c

@ -5,6 +5,8 @@
* created from Id: syscalls.xenix,v 1.5 1997/04/09 15:44:47 bde Exp
*/
#include "opt_compat.h"
#include <sys/param.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>

3
sys/i386/ibcs2/syscalls.conf

@ -1,8 +1,9 @@
# syscalls.conf $Id$
# syscalls.conf $Id: syscalls.conf,v 1.4 1997/02/22 09:33:32 peter Exp $
sysnames="/dev/null"
sysproto="ibcs2_proto.h"
sysproto_h=_IBCS2_SYSPROTO_H_
syshdr="ibcs2_syscall.h"
sysmk="/dev/null"
syssw="ibcs2_sysent.c"
syshide="/dev/null"
syscallprefix="IBCS2_SYS_"

3
sys/i386/ibcs2/syscalls.isc.conf

@ -1,9 +1,10 @@
# syscalls.conf $Id$
# syscalls.conf $Id: syscalls.isc.conf,v 1.3 1997/02/22 09:33:37 peter Exp $
sysnames="/dev/null"
#sysproto="ibcs2_isc.h"
sysproto="/dev/null"
sysproto_h=_IBCS2_ISC_H_
syshdr="ibcs2_isc_syscall.h"
sysmk="/dev/null"
syssw="ibcs2_isc_sysent.c"
syshide="/dev/null"
syscallprefix="IBCS2_ISC_"

3
sys/i386/ibcs2/syscalls.xenix.conf

@ -1,8 +1,9 @@
# syscalls.conf $Id$
# syscalls.conf $Id: syscalls.xenix.conf,v 1.3 1997/02/22 09:33:40 peter Exp $
sysnames="/dev/null"
sysproto="ibcs2_xenix.h"
sysproto_h=_IBCS2_XENIX_H_
syshdr="ibcs2_xenix_syscall.h"
sysmk="/dev/null"
syssw="ibcs2_xenix_sysent.c"
syshide="/dev/null"
syscallprefix="IBCS2_XENIX_"

4
sys/i386/isa/alog.c

@ -193,7 +193,7 @@ static int sync_clock2 (int unit, long period); /* setup clock 2 period */
static int putfifo (talog_chan *pchan, u_short fifoent);
static int alog_open (dev_t dev, int oflags, int devtype, struct proc *p);
static int alog_close (dev_t dev, int fflag, int devtype, struct proc *p);
static int alog_ioctl (dev_t dev, int cmd, caddr_t data,
static int alog_ioctl (dev_t dev, u_long cmd, caddr_t data,
int fflag, struct proc *p);
static int alog_read (dev_t dev, struct uio *uio, int ioflag);
static int alog_poll (dev_t dev, int events, struct proc *p);
@ -215,7 +215,7 @@ struct isa_driver alogdriver = { alog_probe, alog_attach, "alog", 0 };
/* handle the ioctls */
static int alog_ioctl (dev_t dev, int cmd, caddr_t data,
static int alog_ioctl (dev_t dev, u_long cmd, caddr_t data,
int fflag, struct proc *p)
{
int unit = UNIT(dev);

4
sys/i386/isa/asc.c

@ -34,7 +34,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
* $Id: asc.c,v 1.28 1998/01/24 02:54:15 eivind Exp $
* $Id: asc.c,v 1.29 1998/03/28 10:32:59 bde Exp $
*/
#include "asc.h"
@ -831,7 +831,7 @@ ascread(dev_t dev, struct uio *uio, int ioflag)
***/
STATIC int
ascioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
ascioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
{
int unit = UNIT(minor(dev));
struct asc_unit *scu = unittab + unit;

2
sys/i386/isa/b004.c

@ -487,7 +487,7 @@ bqupoll(dev_t dev, int events, struct proc *p)
*/
static int
bquioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
bquioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
unsigned int dev_min = minor(dev) & 7;
int result = 0;

4
sys/i386/isa/ctx.c

@ -8,7 +8,7 @@
* of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
* $Id: ctx.c,v 1.25 1997/07/20 14:09:52 bde Exp $
* $Id: ctx.c,v 1.26 1998/01/24 02:54:17 eivind Exp $
*/
/*
@ -360,7 +360,7 @@ ctxread(dev_t dev, struct uio * uio, int ioflag)
}
static int
ctxioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
ctxioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
{
int error;
int unit, i;

2
sys/i386/isa/cx.c

@ -295,7 +295,7 @@ int cxwrite (dev_t dev, struct uio *uio, int flag)
return ((*linesw[tp->t_line].l_write) (tp, uio, flag));
}
int cxioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
int cxioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
int unit = UNIT (dev);
cx_chan_t *c, *m;

4
sys/i386/isa/cy.c

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.61 1998/02/13 12:45:47 phk Exp $
* $Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
*/
#include "opt_compat.h"
@ -1383,7 +1383,7 @@ siointr1(com)
static int
sioioctl(dev, cmd, data, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t data;
int flag;
struct proc *p;

4
sys/i386/isa/fd.c

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.111 1998/05/06 22:14:41 julian Exp $
* $Id: fd.c,v 1.112 1998/05/06 23:35:36 julian Exp $
*
*/
@ -2040,7 +2040,7 @@ fdformat(dev, finfo, p)
static int
fdioctl(dev, cmd, addr, flag, p)
dev_t dev;
int cmd;
u_long cmd;
caddr_t addr;
int flag;
struct proc *p;

2
sys/i386/isa/gpib.c

@ -387,7 +387,7 @@ gpwrite(dev, uio, ioflag)
write to using a minor device = its GPIB address */
static int
gpioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
gpioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
{
struct gpibdata *gd = (struct gpibdata *)data;
int error,result;

2
sys/i386/isa/gsc.c

@ -742,7 +742,7 @@ gscread (dev_t dev, struct uio *uio, int ioflag)
*/
static int
gscioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
gscioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
int unit = UNIT(minor(dev));
struct gsc_unit *scu = unittab + unit;

6
sys/i386/isa/if_ar.c

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.17 1998/01/08 23:40:37 eivind Exp $
* $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
*/
/*
@ -181,7 +181,7 @@ struct isa_driver ardriver = {arprobe, arattach, "arc"};
static void ar_xmit(struct ar_softc *sc);
static void arstart(struct ifnet *ifp);
static int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
static void arwatchdog(struct ifnet *ifp);
static int ar_packet_avail(struct ar_softc *sc, int *len, u_char *rxstat);
static void ar_copy_rxbuf(struct mbuf *m, struct ar_softc *sc, int len);
@ -597,7 +597,7 @@ top_arstart:
}
static int
arioctl(struct ifnet *ifp, int cmd, caddr_t data)
arioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
int s, error;
int was_up, should_be_up;

4
sys/i386/isa/if_cx.c

@ -83,7 +83,7 @@ static int cxtinth __P((cx_chan_t *c));
#define IFSTRUCTSZ (sizeof (struct sppp))
#define IFNETSZ (sizeof (struct ifnet))
static int cxsioctl (struct ifnet *ifp, int cmd, caddr_t data);
static int cxsioctl (struct ifnet *ifp, u_long cmd, caddr_t data);
static void cxstart (struct ifnet *ifp);
static void cxwatchdog (struct ifnet *ifp);
static void cxinput (cx_chan_t *c, void *buf, unsigned len);
@ -316,7 +316,7 @@ struct isa_driver cxdriver = { cxprobe, cxattach, "cx" };
* Process an ioctl request.
*/
static int
cxsioctl (struct ifnet *ifp, int cmd, caddr_t data)
cxsioctl (struct ifnet *ifp, u_long cmd, caddr_t data)
{
cx_chan_t *q, *c = ifp->if_softc;
int error, s, was_up, should_be_up;

6
sys/i386/isa/if_ed.c

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.139 1998/04/15 17:45:15 bde Exp $
* $Id: if_ed.c,v 1.140 1998/04/17 22:36:34 des Exp $
*/
/*
@ -139,7 +139,7 @@ static int ed_attach __P((struct ed_softc *, int, int));
static int ed_attach_isa __P((struct isa_device *));
static void ed_init __P((void *));
static int ed_ioctl __P((struct ifnet *, int, caddr_t));
static int ed_ioctl __P((struct ifnet *, u_long, caddr_t));
static int ed_probe __P((struct isa_device *));
static void ed_start __P((struct ifnet *));
static void ed_reset __P((struct ifnet *));
@ -2582,7 +2582,7 @@ edintr(unit)
static int
ed_ioctl(ifp, command, data)
register struct ifnet *ifp;
int command;
u_long command;
caddr_t data;
{
struct ed_softc *sc = ifp->if_softc;

6
sys/i386/isa/if_eg.c

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_eg.c,v 1.26 1998/01/08 23:40:47 eivind Exp $
* $Id: if_eg.c,v 1.27 1998/03/28 13:23:56 bde Exp $
*
* Support for 3Com 3c505 Etherlink+ card.
*/
@ -104,7 +104,7 @@ static int egreadPCBready __P((struct eg_softc *sc));
static int egwritePCB __P((struct eg_softc *sc));
static int egreadPCB __P((struct eg_softc *sc));
static void eginit __P((struct eg_softc *sc));
static int egioctl (struct ifnet *, int, caddr_t);
static int egioctl (struct ifnet *, u_long, caddr_t);
static void egrecv(struct eg_softc *);
static void egstart(struct ifnet *);
static void egread __P((struct eg_softc *, caddr_t, int));
@ -699,7 +699,7 @@ egget(sc, buf, totlen)
static int
egioctl(ifp, command, data)
register struct ifnet *ifp;
int command;
u_long command;
caddr_t data;
{
struct eg_softc *sc = ifp->if_softc;

6
sys/i386/isa/if_el.c

@ -6,7 +6,7 @@
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
*
* $Id: if_el.c,v 1.34 1998/03/28 13:23:58 bde Exp $
* $Id: if_el.c,v 1.35 1998/04/15 17:45:18 bde Exp $
*/
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
@ -75,7 +75,7 @@ static struct el_softc {
/* Prototypes */
static int el_attach(struct isa_device *);
static void el_init(int);
static int el_ioctl(struct ifnet *,int,caddr_t);
static int el_ioctl(struct ifnet *,u_long,caddr_t);
static int el_probe(struct isa_device *);
static void el_start(struct ifnet *);
static void el_reset(int);
@ -645,7 +645,7 @@ elget(buf, totlen, off0, ifp)
static int
el_ioctl(ifp, command, data)
register struct ifnet *ifp;
int command;
u_long command;
caddr_t data;
{
register struct ifaddr *ifa = (struct ifaddr *)data;

6
sys/i386/isa/if_ep.c

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.73 1998/02/27 05:38:30 msmith Exp $
* $Id: if_ep.c,v 1.74 1998/03/28 13:24:01 bde Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -116,7 +116,7 @@ static int eeprom_rdy __P((struct ep_softc *sc));
static int ep_isa_probe __P((struct isa_device *));
static struct ep_board * ep_look_for_board_at __P((struct isa_device *is));
static int ep_isa_attach __P((struct isa_device *));
static int epioctl __P((struct ifnet * ifp, int, caddr_t));
static int epioctl __P((struct ifnet * ifp, u_long, caddr_t));
static void epinit __P((struct ep_softc *));
static void epread __P((struct ep_softc *));
@ -1197,7 +1197,7 @@ out:
static int
epioctl(ifp, cmd, data)
register struct ifnet *ifp;
int cmd;
u_long cmd;
caddr_t data;
{
register struct ifaddr *ifa = (struct ifaddr *) data;

6
sys/i386/isa/if_ex.c

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ex.c,v 1.10 1998/01/08 23:40:52 eivind Exp $
* $Id: if_ex.c,v 1.11 1998/03/28 13:24:06 bde Exp $
*/
/*
@ -119,7 +119,7 @@ static int ex_attach __P((struct isa_device *));
static void ex_init __P((void *));
static void ex_start __P((struct ifnet *));
static void ex_stop __P((int));
static int ex_ioctl __P((struct ifnet *, int, caddr_t));
static int ex_ioctl __P((struct ifnet *, u_long, caddr_t));
static void ex_reset __P((int));
static void ex_watchdog __P((struct ifnet *));
@ -760,7 +760,7 @@ void ex_rx_intr(int unit)
}
int ex_ioctl(register struct ifnet *ifp, int cmd, caddr_t data)
int ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
{
register struct ifaddr *ifa = (struct ifaddr *) data;
struct ex_softc *sc = &ex_sc[ifp->if_unit];

6
sys/i386/isa/if_fe.c

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.39 1998/02/27 06:39:31 msmith Exp $
* $Id: if_fe.c,v 1.40 1998/03/28 13:24:09 bde Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@ -239,7 +239,7 @@ static struct fe_softc {
static int fe_probe ( struct isa_device * );
static int fe_attach ( struct isa_device * );
static void fe_init ( int );
static int fe_ioctl ( struct ifnet *, int, caddr_t );
static int fe_ioctl ( struct ifnet *, u_long, caddr_t );
static void fe_start ( struct ifnet * );
static void fe_reset ( int );
static void fe_watchdog ( struct ifnet * );
@ -2471,7 +2471,7 @@ feintr ( int unit )
* pretty ugly.
*/
static int
fe_ioctl ( struct ifnet * ifp, int command, caddr_t data )
fe_ioctl ( struct ifnet * ifp, u_long command, caddr_t data )
{
struct fe_softc *sc = ifp->if_softc;
int s, error = 0;

6
sys/i386/isa/if_ie.c

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.51 1998/03/28 13:24:13 bde Exp $
* $Id: if_ie.c,v 1.52 1998/04/15 17:45:20 bde Exp $
*/
/*
@ -184,7 +184,7 @@ static int ee16_probe(struct isa_device * dvp);
static int check_ie_present(int unit, caddr_t where, unsigned size);
static void ieinit(int unit);
static void ie_stop(int unit);
static int ieioctl(struct ifnet * ifp, int command, caddr_t data);
static int ieioctl(struct ifnet * ifp, u_long command, caddr_t data);
static void iestart(struct ifnet * ifp);
static void el_reset_586(int unit);
@ -2251,7 +2251,7 @@ ie_stop(int unit)
}
static int
ieioctl(struct ifnet *ifp, int command, caddr_t data)
ieioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct ifaddr *ifa = (struct ifaddr *) data;
struct ie_softc *ie = ifp->if_softc;

6
sys/i386/isa/if_le.c

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_le.c,v 1.43 1998/01/08 23:40:58 eivind Exp $
* $Id: if_le.c,v 1.44 1998/03/28 13:24:17 bde Exp $
*/
/*
@ -241,7 +241,7 @@ struct le_softc {
static int le_probe(struct isa_device *dvp);
static int le_attach(struct isa_device *dvp);
static int le_ioctl(struct ifnet *ifp, int command, caddr_t data);
static int le_ioctl(struct ifnet *ifp, u_long command, caddr_t data);
static void le_input(le_softc_t *sc, caddr_t seg1, size_t total_len,
size_t len2, caddr_t seg2);
static void le_multi_filter(le_softc_t *sc);
@ -504,7 +504,7 @@ le_input(
static int
le_ioctl(
struct ifnet *ifp,
int cmd,
u_long cmd,
caddr_t data)
{
le_softc_t *sc = ifp->if_softc;

6
sys/i386/isa/if_lnc.c

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_lnc.c,v 1.41 1998/05/27 09:59:13 paul Exp $
* $Id: if_lnc.c,v 1.42 1998/05/27 11:05:17 paul Exp $
*/
/*
@ -175,7 +175,7 @@ static void lnc_init __P((struct lnc_softc *sc));
static __inline int mbuf_to_buffer __P((struct mbuf *m, char *buffer));
static __inline struct mbuf *chain_to_cluster __P((struct mbuf *m));
static void lnc_start __P((struct ifnet *ifp));
static int lnc_ioctl __P((struct ifnet *ifp, int command, caddr_t data));
static int lnc_ioctl __P((struct ifnet *ifp, u_long command, caddr_t data));
static void lnc_watchdog __P((struct ifnet *ifp));
#ifdef DEBUG
static void lnc_dump_state __P((struct lnc_softc *sc));
@ -1749,7 +1749,7 @@ lnc_start(struct ifnet *ifp)
}
static int
lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
lnc_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
{
struct lnc_softc *sc = ifp->if_softc;

Some files were not shown because too many files have changed in this diff Show More