u_intN_t -> uintN_t
This commit is contained in:
perry
parent
ddeaed4040
commit
144515ce1a
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: exec_macho.c,v 1.35 2005/12/11 12:24:29 christos Exp $ */
|
||||
/* $NetBSD: exec_macho.c,v 1.36 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: exec_macho.c,v 1.35 2005/12/11 12:24:29 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: exec_macho.c,v 1.36 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/proc.h>
|
||||
|
|
@ -381,7 +381,7 @@ exec_macho_load_vnode(struct lwp *l, struct exec_package *epp,
|
|||
int error = ENOEXEC, i;
|
||||
size_t size;
|
||||
void *bf = &lc;
|
||||
u_int32_t *sc = NULL;
|
||||
uint32_t *sc = NULL;
|
||||
|
||||
#ifdef DEBUG_MACHO
|
||||
exec_macho_print_fat_header(fat);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: init_sysctl.c,v 1.58 2005/12/11 12:24:29 christos Exp $ */
|
||||
/* $NetBSD: init_sysctl.c,v 1.59 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003 The NetBSD Foundation, Inc.
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.58 2005/12/11 12:24:29 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.59 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include "opt_sysv.h"
|
||||
#include "opt_multiprocessor.h"
|
||||
|
|
@ -1439,7 +1439,7 @@ sysctl_kern_cptime(SYSCTLFN_ARGS)
|
|||
|
||||
#else /* MULTIPROCESSOR */
|
||||
|
||||
u_int64_t *cp_time = NULL;
|
||||
uint64_t *cp_time = NULL;
|
||||
int error, n = sysctl_ncpus(), i;
|
||||
struct cpu_info *ci;
|
||||
CPU_INFO_ITERATOR cii;
|
||||
|
|
@ -1454,19 +1454,19 @@ sysctl_kern_cptime(SYSCTLFN_ARGS)
|
|||
*/
|
||||
switch (namelen) {
|
||||
case 0:
|
||||
if (*oldlenp == sizeof(u_int64_t) * CPUSTATES || oldp == NULL) {
|
||||
node.sysctl_size = sizeof(u_int64_t) * CPUSTATES;
|
||||
if (*oldlenp == sizeof(uint64_t) * CPUSTATES || oldp == NULL) {
|
||||
node.sysctl_size = sizeof(uint64_t) * CPUSTATES;
|
||||
n = -1; /* SUM */
|
||||
}
|
||||
else {
|
||||
node.sysctl_size = n * sizeof(u_int64_t) * CPUSTATES;
|
||||
node.sysctl_size = n * sizeof(uint64_t) * CPUSTATES;
|
||||
n = -2; /* ALL */
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
if (name[0] < 0 || name[0] >= n)
|
||||
return (ENOENT); /* ENOSUCHPROCESSOR */
|
||||
node.sysctl_size = sizeof(u_int64_t) * CPUSTATES;
|
||||
node.sysctl_size = sizeof(uint64_t) * CPUSTATES;
|
||||
n = name[0];
|
||||
/*
|
||||
* adjust these so that sysctl_lookup() will be happy
|
||||
|
|
@ -2524,7 +2524,7 @@ sysctl_kern_cpid(SYSCTLFN_ARGS)
|
|||
struct sysctlnode node = *rnode;
|
||||
|
||||
#ifndef MULTIPROCESSOR
|
||||
u_int64_t id;
|
||||
uint64_t id;
|
||||
|
||||
if (namelen == 1) {
|
||||
if (name[0] != 0)
|
||||
|
|
@ -2541,7 +2541,7 @@ sysctl_kern_cpid(SYSCTLFN_ARGS)
|
|||
return (sysctl_lookup(SYSCTLFN_CALL(&node)));
|
||||
|
||||
#else /* MULTIPROCESSOR */
|
||||
u_int64_t *cp_id = NULL;
|
||||
uint64_t *cp_id = NULL;
|
||||
int error, n = sysctl_ncpus();
|
||||
struct cpu_info *ci;
|
||||
CPU_INFO_ITERATOR cii;
|
||||
|
|
@ -2553,13 +2553,13 @@ sysctl_kern_cpid(SYSCTLFN_ARGS)
|
|||
*/
|
||||
switch (namelen) {
|
||||
case 0:
|
||||
node.sysctl_size = n * sizeof(u_int64_t);
|
||||
node.sysctl_size = n * sizeof(uint64_t);
|
||||
n = -2; /* ALL */
|
||||
break;
|
||||
case 1:
|
||||
if (name[0] < 0 || name[0] >= n)
|
||||
return (ENOENT); /* ENOSUCHPROCESSOR */
|
||||
node.sysctl_size = sizeof(u_int64_t);
|
||||
node.sysctl_size = sizeof(uint64_t);
|
||||
n = name[0];
|
||||
/*
|
||||
* adjust these so that sysctl_lookup() will be happy
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kern_proc.c,v 1.84 2005/12/24 19:12:23 perry Exp $ */
|
||||
/* $NetBSD: kern_proc.c,v 1.85 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.84 2005/12/24 19:12:23 perry Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.85 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include "opt_kstack.h"
|
||||
|
||||
|
|
@ -1130,8 +1130,8 @@ int kstackleftthres = KSTACK_SIZE / 8; /* warn if remaining stack is
|
|||
void
|
||||
kstack_setup_magic(const struct lwp *l)
|
||||
{
|
||||
u_int32_t *ip;
|
||||
u_int32_t const *end;
|
||||
uint32_t *ip;
|
||||
uint32_t const *end;
|
||||
|
||||
KASSERT(l != NULL);
|
||||
KASSERT(l != &lwp0);
|
||||
|
|
@ -1140,8 +1140,8 @@ kstack_setup_magic(const struct lwp *l)
|
|||
* fill all the stack with magic number
|
||||
* so that later modification on it can be detected.
|
||||
*/
|
||||
ip = (u_int32_t *)KSTACK_LOWEST_ADDR(l);
|
||||
end = (u_int32_t *)((caddr_t)KSTACK_LOWEST_ADDR(l) + KSTACK_SIZE);
|
||||
ip = (uint32_t *)KSTACK_LOWEST_ADDR(l);
|
||||
end = (uint32_t *)((caddr_t)KSTACK_LOWEST_ADDR(l) + KSTACK_SIZE);
|
||||
for (; ip < end; ip++) {
|
||||
*ip = KSTACK_MAGIC;
|
||||
}
|
||||
|
|
@ -1150,7 +1150,7 @@ kstack_setup_magic(const struct lwp *l)
|
|||
void
|
||||
kstack_check_magic(const struct lwp *l)
|
||||
{
|
||||
u_int32_t const *ip, *end;
|
||||
uint32_t const *ip, *end;
|
||||
int stackleft;
|
||||
|
||||
KASSERT(l != NULL);
|
||||
|
|
@ -1161,8 +1161,8 @@ kstack_check_magic(const struct lwp *l)
|
|||
|
||||
#ifdef __MACHINE_STACK_GROWS_UP
|
||||
/* stack grows upwards (eg. hppa) */
|
||||
ip = (u_int32_t *)((caddr_t)KSTACK_LOWEST_ADDR(l) + KSTACK_SIZE);
|
||||
end = (u_int32_t *)KSTACK_LOWEST_ADDR(l);
|
||||
ip = (uint32_t *)((caddr_t)KSTACK_LOWEST_ADDR(l) + KSTACK_SIZE);
|
||||
end = (uint32_t *)KSTACK_LOWEST_ADDR(l);
|
||||
for (ip--; ip >= end; ip--)
|
||||
if (*ip != KSTACK_MAGIC)
|
||||
break;
|
||||
|
|
@ -1170,8 +1170,8 @@ kstack_check_magic(const struct lwp *l)
|
|||
stackleft = (caddr_t)KSTACK_LOWEST_ADDR(l) + KSTACK_SIZE - (caddr_t)ip;
|
||||
#else /* __MACHINE_STACK_GROWS_UP */
|
||||
/* stack grows downwards (eg. i386) */
|
||||
ip = (u_int32_t *)KSTACK_LOWEST_ADDR(l);
|
||||
end = (u_int32_t *)((caddr_t)KSTACK_LOWEST_ADDR(l) + KSTACK_SIZE);
|
||||
ip = (uint32_t *)KSTACK_LOWEST_ADDR(l);
|
||||
end = (uint32_t *)((caddr_t)KSTACK_LOWEST_ADDR(l) + KSTACK_SIZE);
|
||||
for (; ip < end; ip++)
|
||||
if (*ip != KSTACK_MAGIC)
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kern_subr.c,v 1.120 2005/12/11 12:24:29 christos Exp $ */
|
||||
/* $NetBSD: kern_subr.c,v 1.121 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.120 2005/12/11 12:24:29 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.121 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_md.h"
|
||||
|
|
@ -1248,7 +1248,7 @@ humanize_number(char *buf, size_t len, uint64_t bytes, const char *suffix,
|
|||
/* prefixes are: (none), kilo, Mega, Giga, Tera, Peta, Exa */
|
||||
const char *prefixes;
|
||||
int r;
|
||||
u_int64_t umax;
|
||||
uint64_t umax;
|
||||
size_t i, suffixlen;
|
||||
|
||||
if (buf == NULL || suffix == NULL)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kern_synch.c,v 1.158 2005/12/24 19:12:23 perry Exp $ */
|
||||
/* $NetBSD: kern_synch.c,v 1.159 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.158 2005/12/24 19:12:23 perry Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.159 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_ktrace.h"
|
||||
|
|
@ -127,7 +127,7 @@ int rrticks; /* number of hardclock ticks per roundrobin() */
|
|||
* The global scheduler state.
|
||||
*/
|
||||
struct prochd sched_qs[RUNQUE_NQS]; /* run queues */
|
||||
volatile u_int32_t sched_whichqs; /* bitmap of non-empty queues */
|
||||
volatile uint32_t sched_whichqs; /* bitmap of non-empty queues */
|
||||
struct slpque sched_slpque[SLPQUE_TABLESIZE]; /* sleep queues */
|
||||
|
||||
struct simplelock sched_lock = SIMPLELOCK_INITIALIZER;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kern_systrace.c,v 1.48 2005/12/11 12:24:29 christos Exp $ */
|
||||
/* $NetBSD: kern_systrace.c,v 1.49 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002, 2003 Niels Provos <provos@citi.umich.edu>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_systrace.c,v 1.48 2005/12/11 12:24:29 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_systrace.c,v 1.49 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include "opt_systrace.h"
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ struct str_process {
|
|||
int flags;
|
||||
short answer;
|
||||
short error;
|
||||
u_int16_t seqnr; /* expected reply sequence number */
|
||||
uint16_t seqnr; /* expected reply sequence number */
|
||||
|
||||
uid_t seteuid;
|
||||
uid_t saveuid;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: subr_disk.c,v 1.72 2005/12/11 12:24:30 christos Exp $ */
|
||||
/* $NetBSD: subr_disk.c,v 1.73 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1999, 2000 The NetBSD Foundation, Inc.
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.72 2005/12/11 12:24:30 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.73 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include "opt_compat_netbsd.h"
|
||||
|
||||
|
|
@ -523,7 +523,7 @@ sysctl_hw_diskstats(SYSCTLFN_ARGS)
|
|||
* and the media size the size of the device in DEV_BSIZE sectors.
|
||||
*/
|
||||
int
|
||||
bounds_check_with_mediasize(struct buf *bp, int secsize, u_int64_t mediasize)
|
||||
bounds_check_with_mediasize(struct buf *bp, int secsize, uint64_t mediasize)
|
||||
{
|
||||
int64_t sz;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: tty.c,v 1.178 2005/12/11 12:24:30 christos Exp $ */
|
||||
/* $NetBSD: tty.c,v 1.179 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986, 1990, 1991, 1993
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.178 2005/12/11 12:24:30 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.179 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -174,10 +174,10 @@ int tty_count;
|
|||
POOL_INIT(tty_pool, sizeof(struct tty), 0, 0, 0, "ttypl",
|
||||
&pool_allocator_nointr);
|
||||
|
||||
u_int64_t tk_cancc;
|
||||
u_int64_t tk_nin;
|
||||
u_int64_t tk_nout;
|
||||
u_int64_t tk_rawcc;
|
||||
uint64_t tk_cancc;
|
||||
uint64_t tk_nin;
|
||||
uint64_t tk_nout;
|
||||
uint64_t tk_rawcc;
|
||||
|
||||
SYSCTL_SETUP(sysctl_kern_tkstat_setup, "sysctl kern.tkstat subtree setup")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: uipc_mbuf.c,v 1.103 2005/12/08 03:11:14 thorpej Exp $ */
|
||||
/* $NetBSD: uipc_mbuf.c,v 1.104 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.103 2005/12/08 03:11:14 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.104 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include "opt_mbuftrace.h"
|
||||
|
||||
|
|
@ -999,8 +999,8 @@ m_devget(char *buf, int totlen, int off0, struct ifnet *ifp,
|
|||
* If 'off' is non-zero, packet is trailer-encapsulated,
|
||||
* so we have to skip the type and length fields.
|
||||
*/
|
||||
cp += off + 2 * sizeof(u_int16_t);
|
||||
totlen -= 2 * sizeof(u_int16_t);
|
||||
cp += off + 2 * sizeof(uint16_t);
|
||||
totlen -= 2 * sizeof(uint16_t);
|
||||
}
|
||||
MGETHDR(m, M_DONTWAIT, MT_DATA);
|
||||
if (m == 0)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: uipc_syscalls.c,v 1.95 2005/12/11 12:24:30 christos Exp $ */
|
||||
/* $NetBSD: uipc_syscalls.c,v 1.96 2005/12/26 18:45:27 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1989, 1990, 1993
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.95 2005/12/11 12:24:30 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.96 2005/12/26 18:45:27 perry Exp $");
|
||||
|
||||
#include "opt_ktrace.h"
|
||||
#include "opt_pipe.h"
|
||||
|
|
@ -910,7 +910,7 @@ sys_getsockopt(struct lwp *l, void *v, register_t *retval)
|
|||
i = min(m->m_len, (valsize - op));
|
||||
error = copyout(mtod(m, caddr_t), SCARG(uap, val), i);
|
||||
op += i;
|
||||
SCARG(uap, val) = ((u_int8_t *)SCARG(uap, val)) + i;
|
||||
SCARG(uap, val) = ((uint8_t *)SCARG(uap, val)) + i;
|
||||
m = m_free(m);
|
||||
}
|
||||
valsize = op;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: acct.h,v 1.25 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: acct.h,v 1.26 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993, 1994
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
* exponent, 13 bit fraction ``floating point'' number. Units are 1/AHZ
|
||||
* seconds.
|
||||
*/
|
||||
typedef u_int16_t comp_t;
|
||||
typedef uint16_t comp_t;
|
||||
|
||||
struct acct {
|
||||
char ac_comm[10]; /* command name */
|
||||
|
|
@ -54,7 +54,7 @@ struct acct {
|
|||
time_t ac_btime; /* starting time */
|
||||
uid_t ac_uid; /* user id */
|
||||
gid_t ac_gid; /* group id */
|
||||
u_int16_t ac_mem; /* average memory usage */
|
||||
uint16_t ac_mem; /* average memory usage */
|
||||
comp_t ac_io; /* count of IO blocks */
|
||||
dev_t ac_tty; /* controlling tty */
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ struct acct {
|
|||
#define ACOMPAT 0x04 /* used compatibility mode */
|
||||
#define ACORE 0x08 /* dumped core */
|
||||
#define AXSIG 0x10 /* killed by a signal */
|
||||
u_int8_t ac_flag; /* accounting flags */
|
||||
uint8_t ac_flag; /* accounting flags */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: agpio.h,v 1.4 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: agpio.h,v 1.5 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 Doug Rabson
|
||||
|
|
@ -71,14 +71,14 @@
|
|||
#define AGPIOC_UNBIND _IOW (AGPIOC_BASE, 9, agp_unbind)
|
||||
|
||||
typedef struct _agp_version {
|
||||
u_int16_t major;
|
||||
u_int16_t minor;
|
||||
uint16_t major;
|
||||
uint16_t minor;
|
||||
} agp_version;
|
||||
|
||||
typedef struct _agp_info {
|
||||
agp_version version; /* version of the driver */
|
||||
u_int32_t bridge_id; /* bridge vendor/device */
|
||||
u_int32_t agp_mode; /* mode info of bridge */
|
||||
uint32_t bridge_id; /* bridge vendor/device */
|
||||
uint32_t agp_mode; /* mode info of bridge */
|
||||
off_t aper_base; /* base of aperture */
|
||||
size_t aper_size; /* size of aperture */
|
||||
size_t pg_total; /* max pages (swap + system) */
|
||||
|
|
@ -87,7 +87,7 @@ typedef struct _agp_info {
|
|||
} agp_info;
|
||||
|
||||
typedef struct _agp_setup {
|
||||
u_int32_t agp_mode; /* mode info of bridge */
|
||||
uint32_t agp_mode; /* mode info of bridge */
|
||||
} agp_setup;
|
||||
|
||||
#if 0
|
||||
|
|
@ -110,7 +110,7 @@ typedef struct _agp_region {
|
|||
typedef struct _agp_allocate {
|
||||
int key; /* tag of allocation */
|
||||
size_t pg_count; /* number of pages */
|
||||
u_int32_t type; /* 0 == normal, other devspec */
|
||||
uint32_t type; /* 0 == normal, other devspec */
|
||||
paddr_t physical; /* device specific (some devices
|
||||
* need a phys address of the
|
||||
* actual page behind the gatt
|
||||
|
|
@ -124,7 +124,7 @@ typedef struct _agp_bind {
|
|||
|
||||
typedef struct _agp_unbind {
|
||||
int key; /* tag of allocation */
|
||||
u_int32_t priority; /* priority for paging out */
|
||||
uint32_t priority; /* priority for paging out */
|
||||
} agp_unbind;
|
||||
|
||||
#endif /* !_SYS_AGPIO_H_ */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: bswap.h,v 1.4 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: bswap.h,v 1.5 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/* Written by Manuel Bouyer. Public domain */
|
||||
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
__BEGIN_DECLS
|
||||
#if defined(_KERNEL) || defined(_STANDALONE) || !defined(__BSWAP_RENAME)
|
||||
u_int16_t bswap16(u_int16_t);
|
||||
u_int32_t bswap32(u_int32_t);
|
||||
uint16_t bswap16(uint16_t);
|
||||
uint32_t bswap32(uint32_t);
|
||||
#else
|
||||
u_int16_t bswap16(u_int16_t) __RENAME(__bswap16);
|
||||
u_int32_t bswap32(u_int32_t) __RENAME(__bswap32);
|
||||
uint16_t bswap16(uint16_t) __RENAME(__bswap16);
|
||||
uint32_t bswap32(uint32_t) __RENAME(__bswap32);
|
||||
#endif
|
||||
u_int64_t bswap64(u_int64_t);
|
||||
uint64_t bswap64(uint64_t);
|
||||
__END_DECLS
|
||||
#endif /* !_LOCORE */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cdio.h,v 1.22 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: cdio.h,v 1.23 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
#ifndef _SYS_CDIO_H_
|
||||
#define _SYS_CDIO_H_
|
||||
|
|
@ -12,7 +12,7 @@ union msf_lba {
|
|||
u_char second;
|
||||
u_char frame;
|
||||
} msf;
|
||||
u_int32_t lba;
|
||||
uint32_t lba;
|
||||
u_char addr[4];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: chio.h,v 1.10 1999/09/09 23:24:11 thorpej Exp $ */
|
||||
/* $NetBSD: chio.h,v 1.11 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1999 The NetBSD Foundation, Inc.
|
||||
|
|
@ -123,7 +123,7 @@ struct changer_params {
|
|||
*/
|
||||
struct ochanger_element_status_request {
|
||||
int cesr_type; /* element type */
|
||||
u_int8_t *cesr_data; /* pre-allocated data storage */
|
||||
uint8_t *cesr_data; /* pre-allocated data storage */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -132,7 +132,7 @@ struct ochanger_element_status_request {
|
|||
#define CHANGER_VOLTAG_SIZE 32 /* same as SCSI voltag size */
|
||||
struct changer_voltag {
|
||||
char cv_tag[CHANGER_VOLTAG_SIZE + 1]; /* ASCII tag */
|
||||
u_int16_t cv_serial; /* serial number */
|
||||
uint16_t cv_serial; /* serial number */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -165,16 +165,16 @@ struct changer_element_status {
|
|||
* These two fields are only valid if CESTATUS_EXCEPT is
|
||||
* set in ces_flags, and are only valid on SCSI changers.
|
||||
*/
|
||||
u_int8_t ces_asc; /* Additional Sense Code */
|
||||
u_int8_t ces_ascq; /* Additional Sense Code Qualifier */
|
||||
uint8_t ces_asc; /* Additional Sense Code */
|
||||
uint8_t ces_ascq; /* Additional Sense Code Qualifier */
|
||||
|
||||
/*
|
||||
* These two fields may be useful if ces_xname is not valid.
|
||||
* They indicate the target and lun of a drive element. These
|
||||
* are only valid on SCSI changers.
|
||||
*/
|
||||
u_int8_t ces_target; /* SCSI target of drive */
|
||||
u_int8_t ces_lun; /* SCSI LUN of drive */
|
||||
uint8_t ces_target; /* SCSI target of drive */
|
||||
uint8_t ces_lun; /* SCSI LUN of drive */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: core.h,v 1.9 2001/08/20 12:00:54 wiz Exp $ */
|
||||
/* $NetBSD: core.h,v 1.10 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -76,12 +76,12 @@
|
|||
*/
|
||||
|
||||
struct core {
|
||||
u_int32_t c_midmag; /* magic, id, flags */
|
||||
u_int16_t c_hdrsize; /* Size of this header (machdep algn) */
|
||||
u_int16_t c_seghdrsize; /* Size of a segment header */
|
||||
u_int32_t c_nseg; /* # of core segments */
|
||||
uint32_t c_midmag; /* magic, id, flags */
|
||||
uint16_t c_hdrsize; /* Size of this header (machdep algn) */
|
||||
uint16_t c_seghdrsize; /* Size of a segment header */
|
||||
uint32_t c_nseg; /* # of core segments */
|
||||
char c_name[MAXCOMLEN+1]; /* Copy of p->p_comm */
|
||||
u_int32_t c_signo; /* Killing signal */
|
||||
uint32_t c_signo; /* Killing signal */
|
||||
u_long c_ucode; /* Hmm ? */
|
||||
u_long c_cpusize; /* Size of machine dependent segment */
|
||||
u_long c_tsize; /* Size of traditional text segment */
|
||||
|
|
@ -90,7 +90,7 @@ struct core {
|
|||
};
|
||||
|
||||
struct coreseg {
|
||||
u_int32_t c_midmag; /* magic, id, flags */
|
||||
uint32_t c_midmag; /* magic, id, flags */
|
||||
u_long c_addr; /* Virtual address of segment */
|
||||
u_long c_size; /* Size of this segment */
|
||||
};
|
||||
|
|
@ -99,12 +99,12 @@ struct coreseg {
|
|||
* 32-bit versions of the above.
|
||||
*/
|
||||
struct core32 {
|
||||
u_int32_t c_midmag; /* magic, id, flags */
|
||||
u_int16_t c_hdrsize; /* Size of this header (machdep algn) */
|
||||
u_int16_t c_seghdrsize; /* Size of a segment header */
|
||||
u_int32_t c_nseg; /* # of core segments */
|
||||
uint32_t c_midmag; /* magic, id, flags */
|
||||
uint16_t c_hdrsize; /* Size of this header (machdep algn) */
|
||||
uint16_t c_seghdrsize; /* Size of a segment header */
|
||||
uint32_t c_nseg; /* # of core segments */
|
||||
char c_name[MAXCOMLEN+1]; /* Copy of p->p_comm */
|
||||
u_int32_t c_signo; /* Killing signal */
|
||||
uint32_t c_signo; /* Killing signal */
|
||||
u_int c_ucode; /* Hmm ? */
|
||||
u_int c_cpusize; /* Size of machine dependent segment */
|
||||
u_int c_tsize; /* Size of traditional text segment */
|
||||
|
|
@ -113,7 +113,7 @@ struct core32 {
|
|||
};
|
||||
|
||||
struct coreseg32 {
|
||||
u_int32_t c_midmag; /* magic, id, flags */
|
||||
uint32_t c_midmag; /* magic, id, flags */
|
||||
u_int c_addr; /* Virtual address of segment */
|
||||
u_int c_size; /* Size of this segment */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dirent.h,v 1.22 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: dirent.h,v 1.23 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1989, 1993
|
||||
|
|
@ -48,9 +48,9 @@
|
|||
*/
|
||||
struct dirent {
|
||||
ino_t d_fileno; /* file number of entry */
|
||||
u_int16_t d_reclen; /* length of this record */
|
||||
u_int16_t d_namlen; /* length of string in d_name */
|
||||
u_int8_t d_type; /* file type, see below */
|
||||
uint16_t d_reclen; /* length of this record */
|
||||
uint16_t d_namlen; /* length of string in d_name */
|
||||
uint8_t d_type; /* file type, see below */
|
||||
#if defined(_NETBSD_SOURCE)
|
||||
#define MAXNAMLEN 511
|
||||
char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: disk.h,v 1.32 2005/12/26 10:36:47 yamt Exp $ */
|
||||
/* $NetBSD: disk.h,v 1.33 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
|
||||
|
|
@ -210,11 +210,11 @@ struct disk {
|
|||
* on certain types of disks.
|
||||
*/
|
||||
int dk_busy; /* busy counter */
|
||||
u_int64_t dk_rxfer; /* total number of read transfers */
|
||||
u_int64_t dk_wxfer; /* total number of write transfers */
|
||||
u_int64_t dk_seek; /* total independent seek operations */
|
||||
u_int64_t dk_rbytes; /* total bytes read */
|
||||
u_int64_t dk_wbytes; /* total bytes written */
|
||||
uint64_t dk_rxfer; /* total number of read transfers */
|
||||
uint64_t dk_wxfer; /* total number of write transfers */
|
||||
uint64_t dk_seek; /* total independent seek operations */
|
||||
uint64_t dk_rbytes; /* total bytes read */
|
||||
uint64_t dk_wbytes; /* total bytes written */
|
||||
struct timeval dk_attachtime; /* time disk was attached */
|
||||
struct timeval dk_timestamp; /* timestamp of last unbusy */
|
||||
struct timeval dk_time; /* total time spent busy */
|
||||
|
|
@ -250,20 +250,20 @@ struct disk_sysctl {
|
|||
char dk_name[DK_DISKNAMELEN];
|
||||
int32_t dk_busy;
|
||||
int32_t pad;
|
||||
u_int64_t dk_xfer;
|
||||
u_int64_t dk_seek;
|
||||
u_int64_t dk_bytes;
|
||||
u_int32_t dk_attachtime_sec;
|
||||
u_int32_t dk_attachtime_usec;
|
||||
u_int32_t dk_timestamp_sec;
|
||||
u_int32_t dk_timestamp_usec;
|
||||
u_int32_t dk_time_sec;
|
||||
u_int32_t dk_time_usec;
|
||||
uint64_t dk_xfer;
|
||||
uint64_t dk_seek;
|
||||
uint64_t dk_bytes;
|
||||
uint32_t dk_attachtime_sec;
|
||||
uint32_t dk_attachtime_usec;
|
||||
uint32_t dk_timestamp_sec;
|
||||
uint32_t dk_timestamp_usec;
|
||||
uint32_t dk_time_sec;
|
||||
uint32_t dk_time_usec;
|
||||
/* New separate read/write stats */
|
||||
u_int64_t dk_rxfer;
|
||||
u_int64_t dk_rbytes;
|
||||
u_int64_t dk_wxfer;
|
||||
u_int64_t dk_wbytes;
|
||||
uint64_t dk_rxfer;
|
||||
uint64_t dk_rbytes;
|
||||
uint64_t dk_wxfer;
|
||||
uint64_t dk_wbytes;
|
||||
};
|
||||
|
||||
struct dkdriver {
|
||||
|
|
@ -303,10 +303,10 @@ struct disk_badsectors {
|
|||
};
|
||||
|
||||
struct disk_badsecinfo {
|
||||
u_int32_t dbsi_bufsize; /* size of region pointed to */
|
||||
u_int32_t dbsi_skip; /* how many to skip past */
|
||||
u_int32_t dbsi_copied; /* how many got copied back */
|
||||
u_int32_t dbsi_left; /* remaining to copy */
|
||||
uint32_t dbsi_bufsize; /* size of region pointed to */
|
||||
uint32_t dbsi_skip; /* how many to skip past */
|
||||
uint32_t dbsi_copied; /* how many got copied back */
|
||||
uint32_t dbsi_left; /* remaining to copy */
|
||||
caddr_t dbsi_buffer; /* region to copy disk_badsectors to */
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: disklabel.h,v 1.95 2005/12/14 22:02:01 reinoud Exp $ */
|
||||
/* $NetBSD: disklabel.h,v 1.96 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1987, 1988, 1993
|
||||
|
|
@ -94,13 +94,13 @@
|
|||
#define MAKEDISKDEV(maj, unit, part) \
|
||||
(makedev((maj), DISKMINOR((unit), (part))))
|
||||
|
||||
#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */
|
||||
#define DISKMAGIC ((uint32_t)0x82564557) /* The disk magic number */
|
||||
|
||||
#ifndef _LOCORE
|
||||
struct disklabel {
|
||||
u_int32_t d_magic; /* the magic number */
|
||||
u_int16_t d_type; /* drive type */
|
||||
u_int16_t d_subtype; /* controller/d_type specific */
|
||||
uint32_t d_magic; /* the magic number */
|
||||
uint16_t d_type; /* drive type */
|
||||
uint16_t d_subtype; /* controller/d_type specific */
|
||||
char d_typename[16]; /* type name, e.g. "eagle" */
|
||||
|
||||
/*
|
||||
|
|
@ -123,12 +123,12 @@ struct disklabel {
|
|||
#define d_boot1 d_un.un_b.un_d_boot1
|
||||
|
||||
/* disk geometry: */
|
||||
u_int32_t d_secsize; /* # of bytes per sector */
|
||||
u_int32_t d_nsectors; /* # of data sectors per track */
|
||||
u_int32_t d_ntracks; /* # of tracks per cylinder */
|
||||
u_int32_t d_ncylinders; /* # of data cylinders per unit */
|
||||
u_int32_t d_secpercyl; /* # of data sectors per cylinder */
|
||||
u_int32_t d_secperunit; /* # of data sectors per unit */
|
||||
uint32_t d_secsize; /* # of bytes per sector */
|
||||
uint32_t d_nsectors; /* # of data sectors per track */
|
||||
uint32_t d_ntracks; /* # of tracks per cylinder */
|
||||
uint32_t d_ncylinders; /* # of data cylinders per unit */
|
||||
uint32_t d_secpercyl; /* # of data sectors per cylinder */
|
||||
uint32_t d_secperunit; /* # of data sectors per unit */
|
||||
|
||||
/*
|
||||
* Spares (bad sector replacements) below are not counted in
|
||||
|
|
@ -136,13 +136,13 @@ struct disklabel {
|
|||
* be physical sectors which occupy space at the end of each
|
||||
* track and/or cylinder.
|
||||
*/
|
||||
u_int16_t d_sparespertrack; /* # of spare sectors per track */
|
||||
u_int16_t d_sparespercyl; /* # of spare sectors per cylinder */
|
||||
uint16_t d_sparespertrack; /* # of spare sectors per track */
|
||||
uint16_t d_sparespercyl; /* # of spare sectors per cylinder */
|
||||
/*
|
||||
* Alternative cylinders include maintenance, replacement,
|
||||
* configuration description areas, etc.
|
||||
*/
|
||||
u_int32_t d_acylinders; /* # of alt. cylinders per unit */
|
||||
uint32_t d_acylinders; /* # of alt. cylinders per unit */
|
||||
|
||||
/* hardware characteristics: */
|
||||
/*
|
||||
|
|
@ -161,39 +161,39 @@ struct disklabel {
|
|||
* is the offset of sector 0 on cylinder N relative to sector 0
|
||||
* on cylinder N-1.
|
||||
*/
|
||||
u_int16_t d_rpm; /* rotational speed */
|
||||
u_int16_t d_interleave; /* hardware sector interleave */
|
||||
u_int16_t d_trackskew; /* sector 0 skew, per track */
|
||||
u_int16_t d_cylskew; /* sector 0 skew, per cylinder */
|
||||
u_int32_t d_headswitch; /* head switch time, usec */
|
||||
u_int32_t d_trkseek; /* track-to-track seek, usec */
|
||||
u_int32_t d_flags; /* generic flags */
|
||||
uint16_t d_rpm; /* rotational speed */
|
||||
uint16_t d_interleave; /* hardware sector interleave */
|
||||
uint16_t d_trackskew; /* sector 0 skew, per track */
|
||||
uint16_t d_cylskew; /* sector 0 skew, per cylinder */
|
||||
uint32_t d_headswitch; /* head switch time, usec */
|
||||
uint32_t d_trkseek; /* track-to-track seek, usec */
|
||||
uint32_t d_flags; /* generic flags */
|
||||
#define NDDATA 5
|
||||
u_int32_t d_drivedata[NDDATA]; /* drive-type specific information */
|
||||
uint32_t d_drivedata[NDDATA]; /* drive-type specific information */
|
||||
#define NSPARE 5
|
||||
u_int32_t d_spare[NSPARE]; /* reserved for future use */
|
||||
u_int32_t d_magic2; /* the magic number (again) */
|
||||
u_int16_t d_checksum; /* xor of data incl. partitions */
|
||||
uint32_t d_spare[NSPARE]; /* reserved for future use */
|
||||
uint32_t d_magic2; /* the magic number (again) */
|
||||
uint16_t d_checksum; /* xor of data incl. partitions */
|
||||
|
||||
/* filesystem and partition information: */
|
||||
u_int16_t d_npartitions; /* number of partitions in following */
|
||||
u_int32_t d_bbsize; /* size of boot area at sn0, bytes */
|
||||
u_int32_t d_sbsize; /* max size of fs superblock, bytes */
|
||||
uint16_t d_npartitions; /* number of partitions in following */
|
||||
uint32_t d_bbsize; /* size of boot area at sn0, bytes */
|
||||
uint32_t d_sbsize; /* max size of fs superblock, bytes */
|
||||
struct partition { /* the partition table */
|
||||
u_int32_t p_size; /* number of sectors in partition */
|
||||
u_int32_t p_offset; /* starting sector */
|
||||
uint32_t p_size; /* number of sectors in partition */
|
||||
uint32_t p_offset; /* starting sector */
|
||||
union {
|
||||
u_int32_t fsize; /* FFS, ADOS:
|
||||
uint32_t fsize; /* FFS, ADOS:
|
||||
filesystem basic fragment size */
|
||||
u_int32_t cdsession; /* ISO9660: session offset */
|
||||
uint32_t cdsession; /* ISO9660: session offset */
|
||||
} __partition_u2;
|
||||
#define p_fsize __partition_u2.fsize
|
||||
#define p_cdsession __partition_u2.cdsession
|
||||
u_int8_t p_fstype; /* filesystem type, see below */
|
||||
u_int8_t p_frag; /* filesystem fragments per block */
|
||||
uint8_t p_fstype; /* filesystem type, see below */
|
||||
uint8_t p_frag; /* filesystem fragments per block */
|
||||
union {
|
||||
u_int16_t cpg; /* UFS: FS cylinders per group */
|
||||
u_int16_t sgs; /* LFS: FS segment shift */
|
||||
uint16_t cpg; /* UFS: FS cylinders per group */
|
||||
uint16_t sgs; /* LFS: FS segment shift */
|
||||
} __partition_u1;
|
||||
#define p_cpg __partition_u1.cpg
|
||||
#define p_sgs __partition_u1.sgs
|
||||
|
|
@ -206,9 +206,9 @@ struct disklabel {
|
|||
* the old DIOC* ioctl calls.
|
||||
*/
|
||||
struct olddisklabel {
|
||||
u_int32_t d_magic;
|
||||
u_int16_t d_type;
|
||||
u_int16_t d_subtype;
|
||||
uint32_t d_magic;
|
||||
uint16_t d_type;
|
||||
uint16_t d_subtype;
|
||||
char d_typename[16];
|
||||
union {
|
||||
char un_d_packname[16];
|
||||
|
|
@ -217,41 +217,41 @@ struct olddisklabel {
|
|||
char *un_d_boot1;
|
||||
} un_b;
|
||||
} d_un;
|
||||
u_int32_t d_secsize;
|
||||
u_int32_t d_nsectors;
|
||||
u_int32_t d_ntracks;
|
||||
u_int32_t d_ncylinders;
|
||||
u_int32_t d_secpercyl;
|
||||
u_int32_t d_secperunit;
|
||||
u_int16_t d_sparespertrack;
|
||||
u_int16_t d_sparespercyl;
|
||||
u_int32_t d_acylinders;
|
||||
u_int16_t d_rpm;
|
||||
u_int16_t d_interleave;
|
||||
u_int16_t d_trackskew;
|
||||
u_int16_t d_cylskew;
|
||||
u_int32_t d_headswitch;
|
||||
u_int32_t d_trkseek;
|
||||
u_int32_t d_flags;
|
||||
u_int32_t d_drivedata[NDDATA];
|
||||
u_int32_t d_spare[NSPARE];
|
||||
u_int32_t d_magic2;
|
||||
u_int16_t d_checksum;
|
||||
u_int16_t d_npartitions;
|
||||
u_int32_t d_bbsize;
|
||||
u_int32_t d_sbsize;
|
||||
uint32_t d_secsize;
|
||||
uint32_t d_nsectors;
|
||||
uint32_t d_ntracks;
|
||||
uint32_t d_ncylinders;
|
||||
uint32_t d_secpercyl;
|
||||
uint32_t d_secperunit;
|
||||
uint16_t d_sparespertrack;
|
||||
uint16_t d_sparespercyl;
|
||||
uint32_t d_acylinders;
|
||||
uint16_t d_rpm;
|
||||
uint16_t d_interleave;
|
||||
uint16_t d_trackskew;
|
||||
uint16_t d_cylskew;
|
||||
uint32_t d_headswitch;
|
||||
uint32_t d_trkseek;
|
||||
uint32_t d_flags;
|
||||
uint32_t d_drivedata[NDDATA];
|
||||
uint32_t d_spare[NSPARE];
|
||||
uint32_t d_magic2;
|
||||
uint16_t d_checksum;
|
||||
uint16_t d_npartitions;
|
||||
uint32_t d_bbsize;
|
||||
uint32_t d_sbsize;
|
||||
struct opartition {
|
||||
u_int32_t p_size;
|
||||
u_int32_t p_offset;
|
||||
uint32_t p_size;
|
||||
uint32_t p_offset;
|
||||
union {
|
||||
u_int32_t fsize;
|
||||
u_int32_t cdsession;
|
||||
uint32_t fsize;
|
||||
uint32_t cdsession;
|
||||
} __partition_u2;
|
||||
u_int8_t p_fstype;
|
||||
u_int8_t p_frag;
|
||||
uint8_t p_fstype;
|
||||
uint8_t p_frag;
|
||||
union {
|
||||
u_int16_t cpg;
|
||||
u_int16_t sgs;
|
||||
uint16_t cpg;
|
||||
uint16_t sgs;
|
||||
} __partition_u1;
|
||||
} d_partitions[OLDMAXPARTITIONS];
|
||||
};
|
||||
|
|
@ -442,7 +442,7 @@ const char *readdisklabel(dev_t, void (*)(struct buf *),
|
|||
int writedisklabel(dev_t, void (*)(struct buf *), struct disklabel *,
|
||||
struct cpu_disklabel *);
|
||||
int bounds_check_with_label(struct disk *, struct buf *, int);
|
||||
int bounds_check_with_mediasize(struct buf *, int, u_int64_t);
|
||||
int bounds_check_with_mediasize(struct buf *, int, uint64_t);
|
||||
#endif
|
||||
#endif /* _LOCORE */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dkbad.h,v 1.14 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: dkbad.h,v 1.15 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986, 1993, 1994
|
||||
|
|
@ -57,11 +57,11 @@
|
|||
|
||||
struct dkbad {
|
||||
int32_t bt_csn; /* cartridge serial number */
|
||||
u_int16_t bt_mbz; /* unused; should be 0 */
|
||||
u_int16_t bt_flag; /* -1 => alignment cartridge */
|
||||
uint16_t bt_mbz; /* unused; should be 0 */
|
||||
uint16_t bt_flag; /* -1 => alignment cartridge */
|
||||
struct bt_bad {
|
||||
u_int16_t bt_cyl; /* cylinder number of bad sector */
|
||||
u_int16_t bt_trksec; /* track and sector number */
|
||||
uint16_t bt_cyl; /* cylinder number of bad sector */
|
||||
uint16_t bt_trksec; /* track and sector number */
|
||||
} bt_bad[NBT_BAD];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dkstat.h,v 1.16 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: dkstat.h,v 1.17 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993
|
||||
|
|
@ -40,10 +40,10 @@
|
|||
#define _SYS_DKSTAT_H_
|
||||
|
||||
#ifdef _KERNEL
|
||||
extern u_int64_t tk_cancc;
|
||||
extern u_int64_t tk_nin;
|
||||
extern u_int64_t tk_nout;
|
||||
extern u_int64_t tk_rawcc;
|
||||
extern uint64_t tk_cancc;
|
||||
extern uint64_t tk_nin;
|
||||
extern uint64_t tk_nout;
|
||||
extern uint64_t tk_rawcc;
|
||||
#endif
|
||||
|
||||
#endif /* _SYS_DKSTAT_H_ */
|
||||
|
|
|
|||
104
sys/sys/dvdio.h
104
sys/sys/dvdio.h
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dvdio.h,v 1.7 2005/12/03 17:10:46 christos Exp $ */
|
||||
/* $NetBSD: dvdio.h,v 1.8 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
#ifndef _SYS_DVDIO_H_
|
||||
#define _SYS_DVDIO_H_
|
||||
|
|
@ -24,59 +24,59 @@
|
|||
#define DVD_STRUCT_MANUFACT 0x04
|
||||
|
||||
struct dvd_layer {
|
||||
u_int8_t book_version : 4;
|
||||
u_int8_t book_type : 4;
|
||||
u_int8_t min_rate : 4;
|
||||
u_int8_t disc_size : 4;
|
||||
u_int8_t layer_type : 4;
|
||||
u_int8_t track_path : 1;
|
||||
u_int8_t nlayers : 2;
|
||||
u_int8_t track_density : 4;
|
||||
u_int8_t linear_density : 4;
|
||||
u_int8_t bca : 1;
|
||||
u_int32_t start_sector;
|
||||
u_int32_t end_sector;
|
||||
u_int32_t end_sector_l0;
|
||||
uint8_t book_version : 4;
|
||||
uint8_t book_type : 4;
|
||||
uint8_t min_rate : 4;
|
||||
uint8_t disc_size : 4;
|
||||
uint8_t layer_type : 4;
|
||||
uint8_t track_path : 1;
|
||||
uint8_t nlayers : 2;
|
||||
uint8_t track_density : 4;
|
||||
uint8_t linear_density : 4;
|
||||
uint8_t bca : 1;
|
||||
uint32_t start_sector;
|
||||
uint32_t end_sector;
|
||||
uint32_t end_sector_l0;
|
||||
};
|
||||
|
||||
struct dvd_physical {
|
||||
u_int8_t type;
|
||||
u_int8_t layer_num;
|
||||
uint8_t type;
|
||||
uint8_t layer_num;
|
||||
struct dvd_layer layer[4];
|
||||
};
|
||||
|
||||
struct dvd_copyright {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
|
||||
u_int8_t layer_num;
|
||||
u_int8_t cpst;
|
||||
u_int8_t rmi;
|
||||
uint8_t layer_num;
|
||||
uint8_t cpst;
|
||||
uint8_t rmi;
|
||||
};
|
||||
|
||||
struct dvd_disckey {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
|
||||
unsigned agid : 2;
|
||||
u_int8_t value[2048];
|
||||
uint8_t value[2048];
|
||||
};
|
||||
|
||||
struct dvd_bca {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
|
||||
int len;
|
||||
u_int8_t value[188];
|
||||
uint8_t value[188];
|
||||
};
|
||||
|
||||
struct dvd_manufact {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
|
||||
u_int8_t layer_num;
|
||||
uint8_t layer_num;
|
||||
int len;
|
||||
u_int8_t value[2048];
|
||||
uint8_t value[2048];
|
||||
};
|
||||
|
||||
typedef union {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
|
||||
struct dvd_physical physical;
|
||||
struct dvd_copyright copyright;
|
||||
|
|
@ -108,30 +108,30 @@ typedef union {
|
|||
#define DVD_HOST_SEND_RPC_STATE 11
|
||||
|
||||
/* State data */
|
||||
typedef u_int8_t dvd_key[5]; /* 40-bit value, MSB is first elem. */
|
||||
typedef u_int8_t dvd_challenge[10]; /* 80-bit value, MSB is first elem. */
|
||||
typedef uint8_t dvd_key[5]; /* 40-bit value, MSB is first elem. */
|
||||
typedef uint8_t dvd_challenge[10]; /* 80-bit value, MSB is first elem. */
|
||||
|
||||
struct dvd_lu_send_agid {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
unsigned agid : 2;
|
||||
};
|
||||
|
||||
struct dvd_host_send_challenge {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
unsigned agid : 2;
|
||||
|
||||
dvd_challenge chal;
|
||||
};
|
||||
|
||||
struct dvd_send_key {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
unsigned agid : 2;
|
||||
|
||||
dvd_key key;
|
||||
};
|
||||
|
||||
struct dvd_lu_send_challenge {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
unsigned agid : 2;
|
||||
|
||||
dvd_challenge chal;
|
||||
|
|
@ -148,7 +148,7 @@ struct dvd_lu_send_challenge {
|
|||
#define DVD_CGMS_RESTRICTED 3
|
||||
|
||||
struct dvd_lu_send_title_key {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
unsigned agid : 2;
|
||||
|
||||
dvd_key title_key;
|
||||
|
|
@ -159,27 +159,27 @@ struct dvd_lu_send_title_key {
|
|||
};
|
||||
|
||||
struct dvd_lu_send_asf {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
unsigned agid : 2;
|
||||
|
||||
unsigned asf : 1;
|
||||
};
|
||||
|
||||
struct dvd_host_send_rpcstate {
|
||||
u_int8_t type;
|
||||
u_int8_t pdrc;
|
||||
uint8_t type;
|
||||
uint8_t pdrc;
|
||||
};
|
||||
|
||||
struct dvd_lu_send_rpcstate {
|
||||
u_int8_t type : 2;
|
||||
u_int8_t vra : 3;
|
||||
u_int8_t ucca : 3;
|
||||
u_int8_t region_mask;
|
||||
u_int8_t rpc_scheme;
|
||||
uint8_t type : 2;
|
||||
uint8_t vra : 3;
|
||||
uint8_t ucca : 3;
|
||||
uint8_t region_mask;
|
||||
uint8_t rpc_scheme;
|
||||
};
|
||||
|
||||
typedef union {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
|
||||
struct dvd_lu_send_agid lsa;
|
||||
struct dvd_host_send_challenge hsc;
|
||||
|
|
@ -193,14 +193,14 @@ typedef union {
|
|||
} dvd_authinfo;
|
||||
|
||||
typedef struct {
|
||||
u_int16_t report_key_length;
|
||||
u_int8_t reserved1[2];
|
||||
u_int8_t ucca : 3;
|
||||
u_int8_t vra : 3;
|
||||
u_int8_t type_code : 2;
|
||||
u_int8_t region_mask;
|
||||
u_int8_t rpc_scheme;
|
||||
u_int8_t reserved2;
|
||||
uint16_t report_key_length;
|
||||
uint8_t reserved1[2];
|
||||
uint8_t ucca : 3;
|
||||
uint8_t vra : 3;
|
||||
uint8_t type_code : 2;
|
||||
uint8_t region_mask;
|
||||
uint8_t rpc_scheme;
|
||||
uint8_t reserved2;
|
||||
} dvd_rpc_state_t;
|
||||
|
||||
#endif /* _SYS_DVDIO_H_ */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: endian.h,v 1.18 2005/12/24 23:44:14 perry Exp $ */
|
||||
/* $NetBSD: endian.h,v 1.19 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1987, 1991, 1993
|
||||
|
|
@ -137,29 +137,29 @@ __END_DECLS
|
|||
#define htobe16(x) (x)
|
||||
#define htobe32(x) (x)
|
||||
#define htobe64(x) (x)
|
||||
#define htole16(x) bswap16((u_int16_t)(x))
|
||||
#define htole32(x) bswap32((u_int32_t)(x))
|
||||
#define htole64(x) bswap64((u_int64_t)(x))
|
||||
#define htole16(x) bswap16((uint16_t)(x))
|
||||
#define htole32(x) bswap32((uint32_t)(x))
|
||||
#define htole64(x) bswap64((uint64_t)(x))
|
||||
|
||||
#define HTOBE16(x) (void) (x)
|
||||
#define HTOBE32(x) (void) (x)
|
||||
#define HTOBE64(x) (void) (x)
|
||||
#define HTOLE16(x) (x) = bswap16((u_int16_t)(x))
|
||||
#define HTOLE32(x) (x) = bswap32((u_int32_t)(x))
|
||||
#define HTOLE64(x) (x) = bswap64((u_int64_t)(x))
|
||||
#define HTOLE16(x) (x) = bswap16((uint16_t)(x))
|
||||
#define HTOLE32(x) (x) = bswap32((uint32_t)(x))
|
||||
#define HTOLE64(x) (x) = bswap64((uint64_t)(x))
|
||||
|
||||
#else /* LITTLE_ENDIAN */
|
||||
|
||||
#define htobe16(x) bswap16((u_int16_t)(x))
|
||||
#define htobe32(x) bswap32((u_int32_t)(x))
|
||||
#define htobe64(x) bswap64((u_int64_t)(x))
|
||||
#define htobe16(x) bswap16((uint16_t)(x))
|
||||
#define htobe32(x) bswap32((uint32_t)(x))
|
||||
#define htobe64(x) bswap64((uint64_t)(x))
|
||||
#define htole16(x) (x)
|
||||
#define htole32(x) (x)
|
||||
#define htole64(x) (x)
|
||||
|
||||
#define HTOBE16(x) (x) = bswap16((u_int16_t)(x))
|
||||
#define HTOBE32(x) (x) = bswap32((u_int32_t)(x))
|
||||
#define HTOBE64(x) (x) = bswap64((u_int64_t)(x))
|
||||
#define HTOBE16(x) (x) = bswap16((uint16_t)(x))
|
||||
#define HTOBE32(x) (x) = bswap32((uint32_t)(x))
|
||||
#define HTOBE64(x) (x) = bswap64((uint64_t)(x))
|
||||
#define HTOLE16(x) (void) (x)
|
||||
#define HTOLE32(x) (void) (x)
|
||||
#define HTOLE64(x) (void) (x)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: envsys.h,v 1.7 2003/02/20 20:57:56 christos Exp $ */
|
||||
/* $NetBSD: envsys.h,v 1.8 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
|
|
@ -61,13 +61,13 @@ typedef struct envsys_range envsys_range_t;
|
|||
struct envsys_tre_data {
|
||||
u_int sensor;
|
||||
union { /* all data is given */
|
||||
u_int32_t data_us; /* in microKelvins, */
|
||||
uint32_t data_us; /* in microKelvins, */
|
||||
int32_t data_s; /* rpms, volts, amps, */
|
||||
} cur, min, max, avg; /* ohms, watts, etc */
|
||||
/* see units below */
|
||||
|
||||
u_int32_t warnflags; /* warning flags */
|
||||
u_int32_t validflags; /* sensor valid flags */
|
||||
uint32_t warnflags; /* warning flags */
|
||||
uint32_t validflags; /* sensor valid flags */
|
||||
u_int units; /* type of sensor */
|
||||
};
|
||||
typedef struct envsys_tre_data envsys_temp_data_t;
|
||||
|
|
@ -123,7 +123,7 @@ struct envsys_basic_info {
|
|||
char desc[33]; /* sensor description */
|
||||
u_int rfact; /* for volts, (int)(factor x 10^4) */
|
||||
u_int rpms; /* for fans, set nominal RPMs */
|
||||
u_int32_t validflags; /* sensor valid flags */
|
||||
uint32_t validflags; /* sensor valid flags */
|
||||
};
|
||||
typedef struct envsys_basic_info envsys_temp_info_t;
|
||||
typedef struct envsys_basic_info envsys_rpm_info_t;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: evcnt.h,v 1.1 2005/12/20 16:28:55 thorpej Exp $ */
|
||||
/* $NetBSD: evcnt.h,v 1.2 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996, 2000 Christopher G. Demetriou
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
*/
|
||||
|
||||
struct evcnt {
|
||||
u_int64_t ev_count; /* how many have occurred */
|
||||
uint64_t ev_count; /* how many have occurred */
|
||||
TAILQ_ENTRY(evcnt) ev_list; /* entry on list of all counters */
|
||||
unsigned char ev_type; /* counter type; see below */
|
||||
unsigned char ev_grouplen; /* 'group' len, excluding NUL */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: exec_aout.h,v 1.37 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: exec_aout.h,v 1.38 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993, 1994 Christopher G. Demetriou
|
||||
|
|
@ -123,18 +123,18 @@ struct exec {
|
|||
*/
|
||||
#define N_GETMAGIC(ex) \
|
||||
((((ex).a_midmag)&0xffff0000) ? \
|
||||
(be32toh((u_int32_t)((ex).a_midmag))&0xffff) : ((ex).a_midmag))
|
||||
(be32toh((uint32_t)((ex).a_midmag))&0xffff) : ((ex).a_midmag))
|
||||
#define N_GETMAGIC2(ex) \
|
||||
((((ex).a_midmag)&0xffff0000) ? \
|
||||
(be32toh((u_int32_t)((ex).a_midmag))&0xffff) : (((ex).a_midmag) | 0x10000))
|
||||
(be32toh((uint32_t)((ex).a_midmag))&0xffff) : (((ex).a_midmag) | 0x10000))
|
||||
#define N_GETMID(ex) \
|
||||
((((ex).a_midmag)&0xffff0000) ? \
|
||||
((be32toh((u_int32_t)((ex).a_midmag))>>16)&0x03ff) : MID_ZERO)
|
||||
((be32toh((uint32_t)((ex).a_midmag))>>16)&0x03ff) : MID_ZERO)
|
||||
#define N_GETFLAG(ex) \
|
||||
((((ex).a_midmag)&0xffff0000) ? \
|
||||
((be32toh((u_int32_t)((ex).a_midmag))>>26)&0x3f) : 0)
|
||||
((be32toh((uint32_t)((ex).a_midmag))>>26)&0x3f) : 0)
|
||||
#define N_SETMAGIC(ex,mag,mid,flag) \
|
||||
((ex).a_midmag = htobe32((u_int32_t) \
|
||||
((ex).a_midmag = htobe32((uint32_t) \
|
||||
((((flag)&0x3f)<<26)|(((mid)&0x03ff)<<16)|(((mag)&0xffff)))))
|
||||
|
||||
#define N_ALIGN(ex,x) \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: exec_macho.h,v 1.18 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: exec_macho.h,v 1.19 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
/*
|
||||
* CPU supported by a given arch, in sys/arch/<arch>/<arch>/macho_machdep.c
|
||||
*/
|
||||
extern u_int32_t exec_macho_supported_cpu[];
|
||||
extern uint32_t exec_macho_supported_cpu[];
|
||||
|
||||
/*
|
||||
* the `fat' binary description
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ipc.h,v 1.28 2005/11/11 17:11:40 christos Exp $ */
|
||||
/* $NetBSD: ipc.h,v 1.29 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1993
|
||||
|
|
@ -107,7 +107,7 @@ struct ipc_perm {
|
|||
#if defined(_NETBSD_SOURCE)
|
||||
/* Warning: 64-bit structure padding is needed here */
|
||||
struct ipc_perm_sysctl {
|
||||
u_int64_t _key;
|
||||
uint64_t _key;
|
||||
uid_t uid;
|
||||
gid_t gid;
|
||||
uid_t cuid;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kcore.h,v 1.1 1996/03/10 21:56:00 leo Exp $ */
|
||||
/* $NetBSD: kcore.h,v 1.2 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Leo Weppelman.
|
||||
|
|
@ -50,15 +50,15 @@ typedef struct {
|
|||
} phys_ram_seg_t;
|
||||
|
||||
typedef struct kcore_hdr {
|
||||
u_int32_t c_midmag; /* Magic, id, flags */
|
||||
u_int16_t c_hdrsize; /* Aligned header size */
|
||||
u_int16_t c_seghdrsize; /* Aligned seg-header size */
|
||||
u_int32_t c_nseg; /* Number of segments */
|
||||
uint32_t c_midmag; /* Magic, id, flags */
|
||||
uint16_t c_hdrsize; /* Aligned header size */
|
||||
uint16_t c_seghdrsize; /* Aligned seg-header size */
|
||||
uint32_t c_nseg; /* Number of segments */
|
||||
} kcore_hdr_t;
|
||||
|
||||
typedef struct kcore_seg {
|
||||
u_int32_t c_midmag; /* Magic, id, flags */
|
||||
u_int32_t c_size; /* Sizeof this segment */
|
||||
uint32_t c_midmag; /* Magic, id, flags */
|
||||
uint32_t c_size; /* Sizeof this segment */
|
||||
} kcore_seg_t;
|
||||
|
||||
#endif /* _SYS_KCORE_H_ */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mbuf.h,v 1.117 2005/12/24 19:01:28 perry Exp $ */
|
||||
/* $NetBSD: mbuf.h,v 1.118 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1999, 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -101,8 +101,8 @@
|
|||
/* Packet tags structure */
|
||||
struct m_tag {
|
||||
SLIST_ENTRY(m_tag) m_tag_link; /* List of packet tags */
|
||||
u_int16_t m_tag_id; /* Tag ID */
|
||||
u_int16_t m_tag_len; /* Length of data */
|
||||
uint16_t m_tag_id; /* Tag ID */
|
||||
uint16_t m_tag_len; /* Length of data */
|
||||
};
|
||||
|
||||
/* mbuf ownership structure */
|
||||
|
|
@ -157,7 +157,7 @@ struct pkthdr {
|
|||
SLIST_HEAD(packet_tags, m_tag) tags; /* list of packet tags */
|
||||
int len; /* total packet length */
|
||||
int csum_flags; /* checksum flags */
|
||||
u_int32_t csum_data; /* checksum data */
|
||||
uint32_t csum_data; /* checksum data */
|
||||
u_int segsz; /* segment size */
|
||||
};
|
||||
|
||||
|
|
@ -901,7 +901,7 @@ struct m_tag *m_tag_next(struct mbuf *, struct m_tag *);
|
|||
#define PACKET_TAG_IPSEC_HISTORY 23 /* IPSEC history */
|
||||
|
||||
#define PACKET_TAG_PF_TRANSLATE_LOCALHOST 24 /* translated to localhost */
|
||||
#define PACKET_TAG_IPSEC_NAT_T_PORTS 25 /* two u_int16_t */
|
||||
#define PACKET_TAG_IPSEC_NAT_T_PORTS 25 /* two uint16_t */
|
||||
|
||||
/*
|
||||
* Return the number of bytes in the mbuf chain, m.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md4.h,v 1.6 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: md4.h,v 1.7 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* This file is derived from the RSA Data Security, Inc. MD4 Message-Digest
|
||||
|
|
@ -39,8 +39,8 @@
|
|||
|
||||
/* MD4 context. */
|
||||
typedef struct MD4Context {
|
||||
u_int32_t state[4]; /* state (ABCD) */
|
||||
u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */
|
||||
uint32_t state[4]; /* state (ABCD) */
|
||||
uint32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */
|
||||
unsigned char buffer[64]; /* input buffer */
|
||||
} MD4_CTX;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md5.h,v 1.8 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: md5.h,v 1.9 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
|
||||
|
|
@ -39,8 +39,8 @@
|
|||
|
||||
/* MD5 context. */
|
||||
typedef struct MD5Context {
|
||||
u_int32_t state[4]; /* state (ABCD) */
|
||||
u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */
|
||||
uint32_t state[4]; /* state (ABCD) */
|
||||
uint32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */
|
||||
unsigned char buffer[64]; /* input buffer */
|
||||
} MD5_CTX;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: midiio.h,v 1.12 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: midiio.h,v 1.13 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -255,7 +255,7 @@ struct synth_info {
|
|||
#define SEQ_PATCHKEY(id) ((id<<8)|0xfd)
|
||||
#endif
|
||||
struct sysex_info {
|
||||
u_int16_t key; /* Use SYSEX_PATCH or MAUI_PATCH here */
|
||||
uint16_t key; /* Use SYSEX_PATCH or MAUI_PATCH here */
|
||||
#define SEQ_SYSEX_PATCH SEQ_PATCHKEY(0x05)
|
||||
#define SEQ_MAUI_PATCH SEQ_PATCHKEY(0x06)
|
||||
int16_t device_no; /* Synthesizer number */
|
||||
|
|
@ -266,7 +266,7 @@ struct sysex_info {
|
|||
|
||||
typedef unsigned char sbi_instr_data[32];
|
||||
struct sbi_instrument {
|
||||
u_int16_t key; /* FM_PATCH or OPL3_PATCH */
|
||||
uint16_t key; /* FM_PATCH or OPL3_PATCH */
|
||||
#define SBI_FM_PATCH SEQ_PATCHKEY(0x01)
|
||||
#define SBI_OPL3_PATCH SEQ_PATCHKEY(0x03)
|
||||
int16_t device;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: msg.h,v 1.17 2005/11/11 17:11:40 christos Exp $ */
|
||||
/* $NetBSD: msg.h,v 1.18 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
|
|
@ -121,9 +121,9 @@ struct msginfo {
|
|||
/* Warning: 64-bit structure padding is needed here */
|
||||
struct msgid_ds_sysctl {
|
||||
struct ipc_perm_sysctl msg_perm;
|
||||
u_int64_t msg_qnum;
|
||||
u_int64_t msg_qbytes;
|
||||
u_int64_t _msg_cbytes;
|
||||
uint64_t msg_qnum;
|
||||
uint64_t msg_qbytes;
|
||||
uint64_t _msg_cbytes;
|
||||
pid_t msg_lspid;
|
||||
pid_t msg_lrpid;
|
||||
time_t msg_stime;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mtio.h,v 1.22 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: mtio.h,v 1.23 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
|
|
@ -142,10 +142,10 @@ struct mtget {
|
|||
* rethink these ioctls to support all the entities they haul into
|
||||
* the picture (64 bit blocks, logical file record numbers, etc..).
|
||||
*/
|
||||
#define MTIOCRDSPOS _IOR('m', 5, u_int32_t) /* get logical blk addr */
|
||||
#define MTIOCRDHPOS _IOR('m', 6, u_int32_t) /* get hardware blk addr */
|
||||
#define MTIOCSLOCATE _IOW('m', 5, u_int32_t) /* seek to logical blk addr */
|
||||
#define MTIOCHLOCATE _IOW('m', 6, u_int32_t) /* seek to hardware blk addr */
|
||||
#define MTIOCRDSPOS _IOR('m', 5, uint32_t) /* get logical blk addr */
|
||||
#define MTIOCRDHPOS _IOR('m', 6, uint32_t) /* get hardware blk addr */
|
||||
#define MTIOCSLOCATE _IOW('m', 5, uint32_t) /* seek to logical blk addr */
|
||||
#define MTIOCHLOCATE _IOW('m', 6, uint32_t) /* seek to hardware blk addr */
|
||||
|
||||
#ifdef _KERNEL
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: radioio.h,v 1.1 2002/01/01 21:51:39 augustss Exp $ */
|
||||
/* $NetBSD: radioio.h,v 1.2 2005/12/26 18:41:36 perry Exp $ */
|
||||
/* $OpenBSD: radioio.h,v 1.2 2001/12/05 10:27:05 mickey Exp $ */
|
||||
/* $RuOBSD: radioio.h,v 1.4 2001/10/18 16:51:36 pva Exp $ */
|
||||
|
||||
|
|
@ -44,8 +44,8 @@ struct radio_info {
|
|||
int stereo;
|
||||
int rfreq; /* reference frequency */
|
||||
int lock; /* locking field strength during an automatic search */
|
||||
u_int32_t freq; /* in kHz */
|
||||
u_int32_t caps; /* card capabilities */
|
||||
uint32_t freq; /* in kHz */
|
||||
uint32_t caps; /* card capabilities */
|
||||
#define RADIO_CAPS_DETECT_STEREO (1<<0)
|
||||
#define RADIO_CAPS_DETECT_SIGNAL (1<<1)
|
||||
#define RADIO_CAPS_SET_MONO (1<<2)
|
||||
|
|
@ -56,7 +56,7 @@ struct radio_info {
|
|||
#define RADIO_CAPS_RESERVED1 (1<<7)
|
||||
#define RADIO_CAPS_RESERVED2 (0xFF<<8)
|
||||
#define RADIO_CARD_TYPE (0xFF<<16)
|
||||
u_int32_t info;
|
||||
uint32_t info;
|
||||
#define RADIO_INFO_STEREO (1<<0)
|
||||
#define RADIO_INFO_SIGNAL (1<<1)
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rnd.h,v 1.18 2005/12/11 12:25:21 christos Exp $ */
|
||||
/* $NetBSD: rnd.h,v 1.19 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997 The NetBSD Foundation, Inc.
|
||||
|
|
@ -78,33 +78,33 @@
|
|||
|
||||
typedef struct
|
||||
{
|
||||
u_int32_t poolsize;
|
||||
u_int32_t threshold;
|
||||
u_int32_t maxentropy;
|
||||
uint32_t poolsize;
|
||||
uint32_t threshold;
|
||||
uint32_t maxentropy;
|
||||
|
||||
u_int32_t added;
|
||||
u_int32_t curentropy;
|
||||
u_int32_t removed;
|
||||
u_int32_t discarded;
|
||||
u_int32_t generated;
|
||||
uint32_t added;
|
||||
uint32_t curentropy;
|
||||
uint32_t removed;
|
||||
uint32_t discarded;
|
||||
uint32_t generated;
|
||||
} rndpoolstat_t;
|
||||
|
||||
|
||||
typedef struct {
|
||||
u_int32_t cursor; /* current add point in the pool */
|
||||
u_int32_t rotate; /* how many bits to rotate by */
|
||||
uint32_t cursor; /* current add point in the pool */
|
||||
uint32_t rotate; /* how many bits to rotate by */
|
||||
rndpoolstat_t stats; /* current statistics */
|
||||
u_int32_t pool[RND_POOLWORDS]; /* random pool data */
|
||||
uint32_t pool[RND_POOLWORDS]; /* random pool data */
|
||||
} rndpool_t;
|
||||
|
||||
typedef struct {
|
||||
char name[16]; /* device name */
|
||||
u_int32_t last_time; /* last time recorded */
|
||||
u_int32_t last_delta; /* last delta value */
|
||||
u_int32_t last_delta2; /* last delta2 value */
|
||||
u_int32_t total; /* entropy from this source */
|
||||
u_int32_t type; /* type */
|
||||
u_int32_t flags; /* flags */
|
||||
uint32_t last_time; /* last time recorded */
|
||||
uint32_t last_delta; /* last delta value */
|
||||
uint32_t last_delta2; /* last delta2 value */
|
||||
uint32_t total; /* entropy from this source */
|
||||
uint32_t type; /* type */
|
||||
uint32_t flags; /* flags */
|
||||
void *state; /* state informaiton */
|
||||
} rndsource_t;
|
||||
|
||||
|
|
@ -145,22 +145,22 @@ struct __rndsource_element {
|
|||
|
||||
void rndpool_init(rndpool_t *);
|
||||
void rndpool_init_global(void);
|
||||
u_int32_t rndpool_get_entropy_count(rndpool_t *);
|
||||
uint32_t rndpool_get_entropy_count(rndpool_t *);
|
||||
void rndpool_get_stats(rndpool_t *, void *, int);
|
||||
void rndpool_increment_entropy_count(rndpool_t *, u_int32_t);
|
||||
u_int32_t *rndpool_get_pool(rndpool_t *);
|
||||
u_int32_t rndpool_get_poolsize(void);
|
||||
void rndpool_add_data(rndpool_t *, void *, u_int32_t, u_int32_t);
|
||||
u_int32_t rndpool_extract_data(rndpool_t *, void *, u_int32_t,
|
||||
u_int32_t);
|
||||
void rndpool_increment_entropy_count(rndpool_t *, uint32_t);
|
||||
uint32_t *rndpool_get_pool(rndpool_t *);
|
||||
uint32_t rndpool_get_poolsize(void);
|
||||
void rndpool_add_data(rndpool_t *, void *, uint32_t, uint32_t);
|
||||
uint32_t rndpool_extract_data(rndpool_t *, void *, uint32_t,
|
||||
uint32_t);
|
||||
|
||||
void rnd_init(void);
|
||||
void rnd_add_uint32(rndsource_element_t *, u_int32_t);
|
||||
void rnd_add_data(rndsource_element_t *, void *, u_int32_t,
|
||||
u_int32_t);
|
||||
u_int32_t rnd_extract_data(void *, u_int32_t, u_int32_t);
|
||||
void rnd_add_uint32(rndsource_element_t *, uint32_t);
|
||||
void rnd_add_data(rndsource_element_t *, void *, uint32_t,
|
||||
uint32_t);
|
||||
uint32_t rnd_extract_data(void *, uint32_t, uint32_t);
|
||||
void rnd_attach_source(rndsource_element_t *, char *,
|
||||
u_int32_t, u_int32_t);
|
||||
uint32_t, uint32_t);
|
||||
void rnd_detach_source(rndsource_element_t *);
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
|
@ -171,8 +171,8 @@ void rnd_detach_source(rndsource_element_t *);
|
|||
* return "count" random entries, starting at "start"
|
||||
*/
|
||||
typedef struct {
|
||||
u_int32_t start;
|
||||
u_int32_t count;
|
||||
uint32_t start;
|
||||
uint32_t count;
|
||||
rndsource_t source[RND_MAXSTATCOUNT];
|
||||
} rndstat_t;
|
||||
|
||||
|
|
@ -191,18 +191,18 @@ typedef struct {
|
|||
*/
|
||||
typedef struct {
|
||||
char name[16]; /* the name we are adjusting */
|
||||
u_int32_t type; /* the type of device we want */
|
||||
u_int32_t flags; /* flags to set or clear */
|
||||
u_int32_t mask; /* mask for the flags we are setting */
|
||||
uint32_t type; /* the type of device we want */
|
||||
uint32_t flags; /* flags to set or clear */
|
||||
uint32_t mask; /* mask for the flags we are setting */
|
||||
} rndctl_t;
|
||||
|
||||
typedef struct {
|
||||
u_int32_t len;
|
||||
u_int32_t entropy;
|
||||
uint32_t len;
|
||||
uint32_t entropy;
|
||||
u_char data[RND_POOLWORDS * 4];
|
||||
} rnddata_t;
|
||||
|
||||
#define RNDGETENTCNT _IOR('R', 101, u_int32_t) /* get entropy count */
|
||||
#define RNDGETENTCNT _IOR('R', 101, uint32_t) /* get entropy count */
|
||||
#define RNDGETSRCNUM _IOWR('R', 102, rndstat_t) /* get rnd source info */
|
||||
#define RNDGETSRCNAME _IOWR('R', 103, rndstat_name_t) /* get src by name */
|
||||
#define RNDCTL _IOW('R', 104, rndctl_t) /* set/clear source flags */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sched.h,v 1.25 2005/12/24 19:01:28 perry Exp $ */
|
||||
/* $NetBSD: sched.h,v 1.26 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -141,7 +141,7 @@ struct schedstate_percpu {
|
|||
struct timeval spc_runtime; /* time curproc started running */
|
||||
volatile int spc_flags; /* flags; see below */
|
||||
u_int spc_schedticks; /* ticks for schedclock() */
|
||||
u_int64_t spc_cp_time[CPUSTATES]; /* CPU state statistics */
|
||||
uint64_t spc_cp_time[CPUSTATES]; /* CPU state statistics */
|
||||
u_char spc_curpriority; /* usrpri of curproc */
|
||||
int spc_rrticks; /* ticks until roundrobin() */
|
||||
int spc_pscnt; /* prof/stat counter */
|
||||
|
|
@ -184,7 +184,7 @@ extern int rrticks; /* ticks per roundrobin() */
|
|||
* in kern/kern_synch.c.
|
||||
*/
|
||||
extern struct prochd sched_qs[];
|
||||
extern volatile u_int32_t sched_whichqs;
|
||||
extern volatile uint32_t sched_whichqs;
|
||||
|
||||
struct proc;
|
||||
struct cpu_info;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sha1.h,v 1.12 2005/12/11 12:25:21 christos Exp $ */
|
||||
/* $NetBSD: sha1.h,v 1.13 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* SHA-1 in C
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
#define SHA1_DIGEST_STRING_LENGTH 41
|
||||
|
||||
typedef struct {
|
||||
u_int32_t state[5];
|
||||
u_int32_t count[2];
|
||||
uint32_t state[5];
|
||||
uint32_t count[2];
|
||||
u_char buffer[64];
|
||||
} SHA1_CTX;
|
||||
|
||||
__BEGIN_DECLS
|
||||
void SHA1Transform(u_int32_t[5], const u_char[64]);
|
||||
void SHA1Transform(uint32_t[5], const u_char[64]);
|
||||
void SHA1Init(SHA1_CTX *);
|
||||
void SHA1Update(SHA1_CTX *, const u_char *, u_int);
|
||||
void SHA1Final(u_char[SHA1_DIGEST_LENGTH], SHA1_CTX *);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: shm.h,v 1.39 2005/11/10 18:35:15 christos Exp $ */
|
||||
/* $NetBSD: shm.h,v 1.40 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
|
|
@ -152,13 +152,13 @@ struct shminfo {
|
|||
/* Warning: 64-bit structure padding is needed here */
|
||||
struct shmid_ds_sysctl {
|
||||
struct ipc_perm_sysctl shm_perm;
|
||||
u_int64_t shm_segsz;
|
||||
uint64_t shm_segsz;
|
||||
pid_t shm_lpid;
|
||||
pid_t shm_cpid;
|
||||
time_t shm_atime;
|
||||
time_t shm_dtime;
|
||||
time_t shm_ctime;
|
||||
u_int32_t shm_nattch;
|
||||
uint32_t shm_nattch;
|
||||
};
|
||||
struct shm_sysctl_info {
|
||||
struct shminfo shminfo;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: stat.h,v 1.52 2005/12/11 12:25:21 christos Exp $ */
|
||||
/* $NetBSD: stat.h,v 1.53 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986, 1989, 1993
|
||||
|
|
@ -90,9 +90,9 @@ struct stat {
|
|||
off_t st_size; /* file size, in bytes */
|
||||
blkcnt_t st_blocks; /* blocks allocated for file */
|
||||
blksize_t st_blksize; /* optimal blocksize for I/O */
|
||||
u_int32_t st_flags; /* user defined flags for file */
|
||||
u_int32_t st_gen; /* file generation number */
|
||||
u_int32_t st_spare[2];
|
||||
uint32_t st_flags; /* user defined flags for file */
|
||||
uint32_t st_gen; /* file generation number */
|
||||
uint32_t st_spare[2];
|
||||
};
|
||||
|
||||
#undef __STATPAD
|
||||
|
|
|
|||
156
sys/sys/sysctl.h
156
sys/sys/sysctl.h
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sysctl.h,v 1.143 2005/12/24 19:01:28 perry Exp $ */
|
||||
/* $NetBSD: sysctl.h,v 1.144 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
|
|
@ -415,7 +415,7 @@ struct kinfo_proc {
|
|||
* Convert pointer to 64 bit unsigned integer for struct
|
||||
* kinfo_proc2, etc.
|
||||
*/
|
||||
#define PTRTOUINT64(p) ((u_int64_t)(uintptr_t)(p))
|
||||
#define PTRTOUINT64(p) ((uint64_t)(uintptr_t)(p))
|
||||
#define UINT64TOPTR(u) ((void *)(uintptr_t)(u))
|
||||
|
||||
/*
|
||||
|
|
@ -429,27 +429,27 @@ struct kinfo_proc {
|
|||
#define KI_WMESGLEN 8
|
||||
#define KI_MAXLOGNAME 24 /* extra for 8 byte alignment */
|
||||
|
||||
#define KI_NOCPU (~(u_int64_t)0)
|
||||
#define KI_NOCPU (~(uint64_t)0)
|
||||
|
||||
typedef struct {
|
||||
u_int32_t __bits[4];
|
||||
uint32_t __bits[4];
|
||||
} ki_sigset_t;
|
||||
|
||||
struct kinfo_proc2 {
|
||||
u_int64_t p_forw; /* PTR: linked run/sleep queue. */
|
||||
u_int64_t p_back;
|
||||
u_int64_t p_paddr; /* PTR: address of proc */
|
||||
uint64_t p_forw; /* PTR: linked run/sleep queue. */
|
||||
uint64_t p_back;
|
||||
uint64_t p_paddr; /* PTR: address of proc */
|
||||
|
||||
u_int64_t p_addr; /* PTR: Kernel virtual addr of u-area */
|
||||
u_int64_t p_fd; /* PTR: Ptr to open files structure. */
|
||||
u_int64_t p_cwdi; /* PTR: cdir/rdir/cmask info */
|
||||
u_int64_t p_stats; /* PTR: Accounting/statistics */
|
||||
u_int64_t p_limit; /* PTR: Process limits. */
|
||||
u_int64_t p_vmspace; /* PTR: Address space. */
|
||||
u_int64_t p_sigacts; /* PTR: Signal actions, state */
|
||||
u_int64_t p_sess; /* PTR: session pointer */
|
||||
u_int64_t p_tsess; /* PTR: tty session pointer */
|
||||
u_int64_t p_ru; /* PTR: Exit information. XXX */
|
||||
uint64_t p_addr; /* PTR: Kernel virtual addr of u-area */
|
||||
uint64_t p_fd; /* PTR: Ptr to open files structure. */
|
||||
uint64_t p_cwdi; /* PTR: cdir/rdir/cmask info */
|
||||
uint64_t p_stats; /* PTR: Accounting/statistics */
|
||||
uint64_t p_limit; /* PTR: Process limits. */
|
||||
uint64_t p_vmspace; /* PTR: Address space. */
|
||||
uint64_t p_sigacts; /* PTR: Signal actions, state */
|
||||
uint64_t p_sess; /* PTR: session pointer */
|
||||
uint64_t p_tsess; /* PTR: tty session pointer */
|
||||
uint64_t p_ru; /* PTR: Exit information. XXX */
|
||||
|
||||
int32_t p_eflag; /* LONG: extra kinfo_proc2 flags */
|
||||
int32_t p_exitsig; /* INT: signal to sent to parent on exit */
|
||||
|
|
@ -462,31 +462,31 @@ struct kinfo_proc2 {
|
|||
/* XXX: <sys/proc.h> hijacks p_pgid */
|
||||
int32_t p_tpgid; /* PID_T: tty process group id */
|
||||
|
||||
u_int32_t p_uid; /* UID_T: effective user id */
|
||||
u_int32_t p_ruid; /* UID_T: real user id */
|
||||
u_int32_t p_gid; /* GID_T: effective group id */
|
||||
u_int32_t p_rgid; /* GID_T: real group id */
|
||||
uint32_t p_uid; /* UID_T: effective user id */
|
||||
uint32_t p_ruid; /* UID_T: real user id */
|
||||
uint32_t p_gid; /* GID_T: effective group id */
|
||||
uint32_t p_rgid; /* GID_T: real group id */
|
||||
|
||||
u_int32_t p_groups[KI_NGROUPS]; /* GID_T: groups */
|
||||
uint32_t p_groups[KI_NGROUPS]; /* GID_T: groups */
|
||||
int16_t p_ngroups; /* SHORT: number of groups */
|
||||
|
||||
int16_t p_jobc; /* SHORT: job control counter */
|
||||
u_int32_t p_tdev; /* DEV_T: controlling tty dev */
|
||||
uint32_t p_tdev; /* DEV_T: controlling tty dev */
|
||||
|
||||
u_int32_t p_estcpu; /* U_INT: Time averaged value of p_cpticks. */
|
||||
u_int32_t p_rtime_sec; /* STRUCT TIMEVAL: Real time. */
|
||||
u_int32_t p_rtime_usec; /* STRUCT TIMEVAL: Real time. */
|
||||
uint32_t p_estcpu; /* U_INT: Time averaged value of p_cpticks. */
|
||||
uint32_t p_rtime_sec; /* STRUCT TIMEVAL: Real time. */
|
||||
uint32_t p_rtime_usec; /* STRUCT TIMEVAL: Real time. */
|
||||
int32_t p_cpticks; /* INT: Ticks of CPU time. */
|
||||
u_int32_t p_pctcpu; /* FIXPT_T: %cpu for this process during p_swtime */
|
||||
u_int32_t p_swtime; /* U_INT: Time swapped in or out. */
|
||||
u_int32_t p_slptime; /* U_INT: Time since last blocked. */
|
||||
uint32_t p_pctcpu; /* FIXPT_T: %cpu for this process during p_swtime */
|
||||
uint32_t p_swtime; /* U_INT: Time swapped in or out. */
|
||||
uint32_t p_slptime; /* U_INT: Time since last blocked. */
|
||||
int32_t p_schedflags; /* INT: PSCHED_* flags */
|
||||
|
||||
u_int64_t p_uticks; /* U_QUAD_T: Statclock hits in user mode. */
|
||||
u_int64_t p_sticks; /* U_QUAD_T: Statclock hits in system mode. */
|
||||
u_int64_t p_iticks; /* U_QUAD_T: Statclock hits processing intr. */
|
||||
uint64_t p_uticks; /* U_QUAD_T: Statclock hits in user mode. */
|
||||
uint64_t p_sticks; /* U_QUAD_T: Statclock hits in system mode. */
|
||||
uint64_t p_iticks; /* U_QUAD_T: Statclock hits processing intr. */
|
||||
|
||||
u_int64_t p_tracep; /* PTR: Trace to vnode or file */
|
||||
uint64_t p_tracep; /* PTR: Trace to vnode or file */
|
||||
int32_t p_traceflag; /* INT: Kernel trace points. */
|
||||
|
||||
int32_t p_holdcnt; /* INT: If non-zero, don't swap. */
|
||||
|
|
@ -497,17 +497,17 @@ struct kinfo_proc2 {
|
|||
ki_sigset_t p_sigcatch; /* SIGSET_T: Signals being caught by user. */
|
||||
|
||||
int8_t p_stat; /* CHAR: S* process status (from LWP). */
|
||||
u_int8_t p_priority; /* U_CHAR: Process priority. */
|
||||
u_int8_t p_usrpri; /* U_CHAR: User-priority based on p_cpu and p_nice. */
|
||||
u_int8_t p_nice; /* U_CHAR: Process "nice" value. */
|
||||
uint8_t p_priority; /* U_CHAR: Process priority. */
|
||||
uint8_t p_usrpri; /* U_CHAR: User-priority based on p_cpu and p_nice. */
|
||||
uint8_t p_nice; /* U_CHAR: Process "nice" value. */
|
||||
|
||||
u_int16_t p_xstat; /* U_SHORT: Exit status for wait; also stop signal. */
|
||||
u_int16_t p_acflag; /* U_SHORT: Accounting flags. */
|
||||
uint16_t p_xstat; /* U_SHORT: Exit status for wait; also stop signal. */
|
||||
uint16_t p_acflag; /* U_SHORT: Accounting flags. */
|
||||
|
||||
char p_comm[KI_MAXCOMLEN];
|
||||
|
||||
char p_wmesg[KI_WMESGLEN]; /* wchan message */
|
||||
u_int64_t p_wchan; /* PTR: sleep address. */
|
||||
uint64_t p_wchan; /* PTR: sleep address. */
|
||||
|
||||
char p_login[KI_MAXLOGNAME]; /* setlogin() name */
|
||||
|
||||
|
|
@ -518,62 +518,62 @@ struct kinfo_proc2 {
|
|||
|
||||
int64_t p_uvalid; /* CHAR: following p_u* members from struct user are valid */
|
||||
/* XXX 64 bits for alignment */
|
||||
u_int32_t p_ustart_sec; /* STRUCT TIMEVAL: starting time. */
|
||||
u_int32_t p_ustart_usec; /* STRUCT TIMEVAL: starting time. */
|
||||
uint32_t p_ustart_sec; /* STRUCT TIMEVAL: starting time. */
|
||||
uint32_t p_ustart_usec; /* STRUCT TIMEVAL: starting time. */
|
||||
|
||||
u_int32_t p_uutime_sec; /* STRUCT TIMEVAL: user time. */
|
||||
u_int32_t p_uutime_usec; /* STRUCT TIMEVAL: user time. */
|
||||
u_int32_t p_ustime_sec; /* STRUCT TIMEVAL: system time. */
|
||||
u_int32_t p_ustime_usec; /* STRUCT TIMEVAL: system time. */
|
||||
uint32_t p_uutime_sec; /* STRUCT TIMEVAL: user time. */
|
||||
uint32_t p_uutime_usec; /* STRUCT TIMEVAL: user time. */
|
||||
uint32_t p_ustime_sec; /* STRUCT TIMEVAL: system time. */
|
||||
uint32_t p_ustime_usec; /* STRUCT TIMEVAL: system time. */
|
||||
|
||||
u_int64_t p_uru_maxrss; /* LONG: max resident set size. */
|
||||
u_int64_t p_uru_ixrss; /* LONG: integral shared memory size. */
|
||||
u_int64_t p_uru_idrss; /* LONG: integral unshared data ". */
|
||||
u_int64_t p_uru_isrss; /* LONG: integral unshared stack ". */
|
||||
u_int64_t p_uru_minflt; /* LONG: page reclaims. */
|
||||
u_int64_t p_uru_majflt; /* LONG: page faults. */
|
||||
u_int64_t p_uru_nswap; /* LONG: swaps. */
|
||||
u_int64_t p_uru_inblock; /* LONG: block input operations. */
|
||||
u_int64_t p_uru_oublock; /* LONG: block output operations. */
|
||||
u_int64_t p_uru_msgsnd; /* LONG: messages sent. */
|
||||
u_int64_t p_uru_msgrcv; /* LONG: messages received. */
|
||||
u_int64_t p_uru_nsignals; /* LONG: signals received. */
|
||||
u_int64_t p_uru_nvcsw; /* LONG: voluntary context switches. */
|
||||
u_int64_t p_uru_nivcsw; /* LONG: involuntary ". */
|
||||
uint64_t p_uru_maxrss; /* LONG: max resident set size. */
|
||||
uint64_t p_uru_ixrss; /* LONG: integral shared memory size. */
|
||||
uint64_t p_uru_idrss; /* LONG: integral unshared data ". */
|
||||
uint64_t p_uru_isrss; /* LONG: integral unshared stack ". */
|
||||
uint64_t p_uru_minflt; /* LONG: page reclaims. */
|
||||
uint64_t p_uru_majflt; /* LONG: page faults. */
|
||||
uint64_t p_uru_nswap; /* LONG: swaps. */
|
||||
uint64_t p_uru_inblock; /* LONG: block input operations. */
|
||||
uint64_t p_uru_oublock; /* LONG: block output operations. */
|
||||
uint64_t p_uru_msgsnd; /* LONG: messages sent. */
|
||||
uint64_t p_uru_msgrcv; /* LONG: messages received. */
|
||||
uint64_t p_uru_nsignals; /* LONG: signals received. */
|
||||
uint64_t p_uru_nvcsw; /* LONG: voluntary context switches. */
|
||||
uint64_t p_uru_nivcsw; /* LONG: involuntary ". */
|
||||
|
||||
u_int32_t p_uctime_sec; /* STRUCT TIMEVAL: child u+s time. */
|
||||
u_int32_t p_uctime_usec; /* STRUCT TIMEVAL: child u+s time. */
|
||||
u_int64_t p_cpuid; /* LONG: CPU id */
|
||||
u_int64_t p_realflag; /* INT: P_* flags (not including LWPs). */
|
||||
u_int64_t p_nlwps; /* LONG: Number of LWPs */
|
||||
u_int64_t p_nrlwps; /* LONG: Number of running LWPs */
|
||||
u_int64_t p_realstat; /* LONG: non-LWP process status */
|
||||
u_int32_t p_svuid; /* UID_T: saved user id */
|
||||
u_int32_t p_svgid; /* GID_T: saved group id */
|
||||
uint32_t p_uctime_sec; /* STRUCT TIMEVAL: child u+s time. */
|
||||
uint32_t p_uctime_usec; /* STRUCT TIMEVAL: child u+s time. */
|
||||
uint64_t p_cpuid; /* LONG: CPU id */
|
||||
uint64_t p_realflag; /* INT: P_* flags (not including LWPs). */
|
||||
uint64_t p_nlwps; /* LONG: Number of LWPs */
|
||||
uint64_t p_nrlwps; /* LONG: Number of running LWPs */
|
||||
uint64_t p_realstat; /* LONG: non-LWP process status */
|
||||
uint32_t p_svuid; /* UID_T: saved user id */
|
||||
uint32_t p_svgid; /* GID_T: saved group id */
|
||||
};
|
||||
|
||||
/*
|
||||
* KERN_LWP structure. See notes on KERN_PROC2 about adding elements.
|
||||
*/
|
||||
struct kinfo_lwp {
|
||||
u_int64_t l_forw; /* PTR: linked run/sleep queue. */
|
||||
u_int64_t l_back;
|
||||
u_int64_t l_laddr; /* PTR: Address of LWP */
|
||||
u_int64_t l_addr; /* PTR: Kernel virtual addr of u-area */
|
||||
uint64_t l_forw; /* PTR: linked run/sleep queue. */
|
||||
uint64_t l_back;
|
||||
uint64_t l_laddr; /* PTR: Address of LWP */
|
||||
uint64_t l_addr; /* PTR: Kernel virtual addr of u-area */
|
||||
int32_t l_lid; /* LWPID_T: LWP identifier */
|
||||
int32_t l_flag; /* INT: L_* flags. */
|
||||
u_int32_t l_swtime; /* U_INT: Time swapped in or out. */
|
||||
u_int32_t l_slptime; /* U_INT: Time since last blocked. */
|
||||
uint32_t l_swtime; /* U_INT: Time swapped in or out. */
|
||||
uint32_t l_slptime; /* U_INT: Time since last blocked. */
|
||||
int32_t l_schedflags; /* INT: PSCHED_* flags */
|
||||
int32_t l_holdcnt; /* INT: If non-zero, don't swap. */
|
||||
u_int8_t l_priority; /* U_CHAR: Process priority. */
|
||||
u_int8_t l_usrpri; /* U_CHAR: User-priority based on l_cpu and p_nice. */
|
||||
uint8_t l_priority; /* U_CHAR: Process priority. */
|
||||
uint8_t l_usrpri; /* U_CHAR: User-priority based on l_cpu and p_nice. */
|
||||
int8_t l_stat; /* CHAR: S* process status. */
|
||||
int8_t l_pad1; /* fill out to 4-byte boundary */
|
||||
int32_t l_pad2; /* .. and then to an 8-byte boundary */
|
||||
char l_wmesg[KI_WMESGLEN]; /* wchan message */
|
||||
u_int64_t l_wchan; /* PTR: sleep address. */
|
||||
u_int64_t l_cpuid; /* LONG: CPU id */
|
||||
uint64_t l_wchan; /* PTR: sleep address. */
|
||||
uint64_t l_cpuid; /* LONG: CPU id */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: systm.h,v 1.182 2005/12/11 12:25:21 christos Exp $ */
|
||||
/* $NetBSD: systm.h,v 1.183 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1988, 1991, 1993
|
||||
|
|
@ -208,7 +208,7 @@ int snprintf(char *, size_t, const char *, ...)
|
|||
void vprintf(const char *, _BSD_VA_LIST_);
|
||||
int vsprintf(char *, const char *, _BSD_VA_LIST_);
|
||||
int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_);
|
||||
int humanize_number(char *, size_t, u_int64_t, const char *, int);
|
||||
int humanize_number(char *, size_t, uint64_t, const char *, int);
|
||||
|
||||
void twiddle(void);
|
||||
#endif /* _KERNEL */
|
||||
|
|
@ -222,7 +222,7 @@ void ttyprintf(struct tty *, const char *, ...)
|
|||
|
||||
char *bitmask_snprintf(u_quad_t, const char *, char *, size_t);
|
||||
|
||||
int format_bytes(char *, size_t, u_int64_t);
|
||||
int format_bytes(char *, size_t, uint64_t);
|
||||
|
||||
void tablefull(const char *, const char *);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: systrace.h,v 1.17 2005/12/03 17:10:46 christos Exp $ */
|
||||
/* $NetBSD: systrace.h,v 1.18 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
|
||||
|
|
@ -86,7 +86,7 @@ struct str_msg_child {
|
|||
struct str_message {
|
||||
int32_t msg_type;
|
||||
pid_t msg_pid;
|
||||
u_int16_t msg_seqnr; /* answer has to match seqnr */
|
||||
uint16_t msg_seqnr; /* answer has to match seqnr */
|
||||
int16_t msg_policy;
|
||||
union {
|
||||
struct str_msg_emul msg_emul;
|
||||
|
|
@ -108,7 +108,7 @@ struct str_msgcontainer {
|
|||
|
||||
struct systrace_answer {
|
||||
pid_t stra_pid;
|
||||
u_int16_t stra_seqnr;
|
||||
uint16_t stra_seqnr;
|
||||
int16_t reserved;
|
||||
uid_t stra_seteuid; /* elevated privileges for system call */
|
||||
gid_t stra_setegid;
|
||||
|
|
@ -159,7 +159,7 @@ struct systrace_policy {
|
|||
|
||||
struct systrace_replace {
|
||||
pid_t strr_pid;
|
||||
u_int16_t strr_seqnr;
|
||||
uint16_t strr_seqnr;
|
||||
int16_t reserved;
|
||||
int32_t strr_nrepl;
|
||||
caddr_t strr_base; /* Base memory */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: tape.h,v 1.2 2005/12/11 12:25:21 christos Exp $ */
|
||||
/* $NetBSD: tape.h,v 1.3 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2005 The NetBSD Foundation, Inc.
|
||||
|
|
@ -41,18 +41,18 @@ struct tape_sysctl {
|
|||
char name[TAPENAMELEN];
|
||||
int32_t busy;
|
||||
int32_t pad;
|
||||
u_int64_t xfer;
|
||||
u_int64_t bytes;
|
||||
u_int32_t attachtime_sec;
|
||||
u_int32_t attachtime_usec;
|
||||
u_int32_t timestamp_sec;
|
||||
u_int32_t timestamp_usec;
|
||||
u_int32_t time_sec;
|
||||
u_int32_t time_usec;
|
||||
u_int64_t rxfer;
|
||||
u_int64_t rbytes;
|
||||
u_int64_t wxfer;
|
||||
u_int64_t wbytes;
|
||||
uint64_t xfer;
|
||||
uint64_t bytes;
|
||||
uint32_t attachtime_sec;
|
||||
uint32_t attachtime_usec;
|
||||
uint32_t timestamp_sec;
|
||||
uint32_t timestamp_usec;
|
||||
uint32_t time_sec;
|
||||
uint32_t time_usec;
|
||||
uint64_t rxfer;
|
||||
uint64_t rbytes;
|
||||
uint64_t wxfer;
|
||||
uint64_t wbytes;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -63,10 +63,10 @@ struct tape_sysctl {
|
|||
struct tape {
|
||||
char *name; /* name of drive */
|
||||
int busy; /* drive is busy */
|
||||
u_int64_t rxfer; /* total number of read transfers */
|
||||
u_int64_t wxfer; /* total number of write transfers */
|
||||
u_int64_t rbytes; /* total bytes read */
|
||||
u_int64_t wbytes; /* total bytes written */
|
||||
uint64_t rxfer; /* total number of read transfers */
|
||||
uint64_t wxfer; /* total number of write transfers */
|
||||
uint64_t rbytes; /* total bytes read */
|
||||
uint64_t wbytes; /* total bytes written */
|
||||
struct timeval attachtime; /* time tape was attached */
|
||||
struct timeval timestamp; /* timestamp of last unbusy */
|
||||
struct timeval time; /* total time spent busy */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: timepps.h,v 1.12 2005/12/24 19:01:28 perry Exp $ */
|
||||
/* $NetBSD: timepps.h,v 1.13 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 Jonathan Stone
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
* PPSAPI type definitions
|
||||
*/
|
||||
typedef int32_t pps_handle_t; /* represents a PPS source */
|
||||
typedef u_int32_t pps_seq_t; /* sequence number, at least 32 bits */
|
||||
typedef uint32_t pps_seq_t; /* sequence number, at least 32 bits */
|
||||
|
||||
typedef union pps_timeu {
|
||||
struct timespec tspec;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ucred.h,v 1.25 2005/12/24 23:41:34 perry Exp $ */
|
||||
/* $NetBSD: ucred.h,v 1.26 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
|
|
@ -51,11 +51,11 @@ struct uucred {
|
|||
|
||||
struct ucred {
|
||||
struct simplelock cr_lock; /* mutex for ref count */
|
||||
u_int32_t cr_ref; /* reference count */
|
||||
uint32_t cr_ref; /* reference count */
|
||||
#define cr_startcopy cr_uid /* for dup & copy */
|
||||
uid_t cr_uid; /* effective user id */
|
||||
gid_t cr_gid; /* effective group id */
|
||||
u_int32_t cr_ngroups; /* number of groups */
|
||||
uint32_t cr_ngroups; /* number of groups */
|
||||
gid_t cr_groups[NGROUPS]; /* groups */
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: un.h,v 1.37 2005/12/11 12:25:21 christos Exp $ */
|
||||
/* $NetBSD: un.h,v 1.38 2005/12/26 18:41:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
|
|
@ -46,7 +46,7 @@ typedef __sa_family_t sa_family_t;
|
|||
* Definitions for UNIX IPC domain.
|
||||
*/
|
||||
struct sockaddr_un {
|
||||
u_int8_t sun_len; /* total sockaddr length */
|
||||
uint8_t sun_len; /* total sockaddr length */
|
||||
sa_family_t sun_family; /* AF_LOCAL */
|
||||
char sun_path[104]; /* path name (gag) */
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue