* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*
* $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.14.2.5 2003/08/24 03:26:37 ken Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_all.h,v 1.4 2006/01/22 14:03:51 swildner Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_all.h,v 1.5 2006/05/21 03:43:38 dillon Exp $
*/
/*
#ifndef _SCSI_SCSI_ALL_H
#define _SCSI_SCSI_ALL_H 1
+#ifndef _SYS_CDEFS_H_
#include <sys/cdefs.h>
+#endif
+#if !defined(_KERNEL) && !defined(_STDIO_H_)
+#include <stdio.h> /* FILE for userland protos */
+#endif
#ifdef _KERNEL
#include "opt_scsi.h"
scsi_sense_action scsi_error_action(int asc, int ascq,
struct scsi_inquiry_data *inq_data);
#ifdef _KERNEL
+
void scsi_sense_print(struct ccb_scsiio *csio);
int scsi_interpret_sense(union ccb *ccb,
u_int32_t sense_flags,
u_int32_t *timeout,
scsi_sense_action error_action);
#else
+
char * scsi_sense_string(struct cam_device *device,
struct ccb_scsiio *csio,
char *str, int str_len);
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* $FreeBSD: src/sys/i386/include/pmap.h,v 1.65.2.3 2001/10/03 07:15:37 peter Exp $
- * $DragonFly: src/sys/cpu/i386/include/pmap.h,v 1.9 2006/05/20 02:42:06 dillon Exp $
+ * $DragonFly: src/sys/cpu/i386/include/pmap.h,v 1.10 2006/05/21 03:43:44 dillon Exp $
*/
#ifndef _MACHINE_PMAP_H_
vm_offset_t pv_va; /* virtual address for mapping */
TAILQ_ENTRY(pv_entry) pv_list;
TAILQ_ENTRY(pv_entry) pv_plist;
- vm_page_t pv_ptem; /* VM page for pte */
+ struct vm_page *pv_ptem; /* VM page for pte */
} *pv_entry_t;
#ifdef _KERNEL
void *pmap_mapdev (vm_paddr_t, vm_size_t);
void pmap_unmapdev (vm_offset_t, vm_size_t);
unsigned *pmap_pte (pmap_t, vm_offset_t) __pure2;
-vm_page_t pmap_use_pt (pmap_t, vm_offset_t);
+struct vm_page *pmap_use_pt (pmap_t, vm_offset_t);
#ifdef SMP
void pmap_set_opt (void);
#endif
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
* $FreeBSD: src/sys/i386/include/profile.h,v 1.20 1999/12/29 04:33:05 peter Exp $
- * $DragonFly: src/sys/cpu/i386/include/profile.h,v 1.7 2006/05/20 02:42:06 dillon Exp $
+ * $DragonFly: src/sys/cpu/i386/include/profile.h,v 1.8 2006/05/21 03:43:44 dillon Exp $
*/
#ifndef _MACHINE_PROFILE_H_
#define _MACHINE_PROFILE_H_
+#ifndef _SYS_CDEFS_H_
+#include <sys/cdefs.h>
+#endif
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
#else /* !_KERNEL */
-#include <sys/cdefs.h>
-
__BEGIN_DECLS
#ifdef __GNUC__
void mcount (void) __asm(".mcount");
#endif
-static void _mcount (uintfptr_t frompc, uintfptr_t selfpc);
+/*static void _mcount (uintfptr_t frompc, uintfptr_t selfpc);*/
__END_DECLS
#endif /* _KERNEL */
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/i386/include/_stdint.h,v 1.1 2002/07/29 17:41:07 mike Exp $
- * $DragonFly: src/sys/cpu/i386/include/stdint.h,v 1.4 2006/01/02 06:02:01 y0netan1 Exp $
+ * $DragonFly: src/sys/cpu/i386/include/stdint.h,v 1.5 2006/05/21 03:43:44 dillon Exp $
*/
#ifndef _MACHINE_STDINT_H_
typedef unsigned short __uint16_t;
typedef int __int32_t;
typedef unsigned int __uint32_t;
+typedef int __boolean_t;
/*
* This mess is to override compiler options that might restrict long long
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/i386/include/nexusvar.h,v 1.1 2000/09/28 00:37:31 peter Exp $
- * $DragonFly: src/sys/i386/include/Attic/nexusvar.h,v 1.2 2006/05/20 02:42:06 dillon Exp $
+ * $DragonFly: src/sys/i386/include/Attic/nexusvar.h,v 1.3 2006/05/21 03:43:44 dillon Exp $
*/
#ifndef _MACHINE_NEXUSVAR_H_
#define _MACHINE_NEXUSVAR_H_
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
BUS_WRITE_IVAR(device_get_parent(dev), dev, NEXUS_IVAR_ ## B, v); \
}
+#ifdef _KERNEL
NEXUS_ACCESSOR(pcibus, PCIBUS, u_int32_t)
+#endif
#undef NEXUS_ACCESSOR
-#endif /* !_MACHINE_NEXUSVAR_H_ */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* !_MACHINE_NEXUSVAR_H_ */
-/* $FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $ */
-/* $DragonFly: src/sys/i386/include/Attic/physio_proc.h,v 1.12 2005/08/07 15:43:02 joerg Exp $ */
-/* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */
-/* $NetBSD$ */
-
/*
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $
+ * $DragonFly: src/sys/i386/include/Attic/physio_proc.h,v 1.13 2006/05/21 03:43:44 dillon Exp $
+ * $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $
+ * $NetBSD$
*/
+
#ifndef _MACHINE_PHYSIO_PROC_H_
#define _MACHINE_PHYSIO_PROC_H_
+#ifndef _KERNEL
+
+#error "This file should not be included by userland programs."
+
+#else
+
+#ifndef _SYS_BUF_H_
#include <sys/buf.h>
+#endif
+#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
+#endif
+#ifndef _SYS_THREAD2_H_
#include <sys/thread2.h>
+#endif
struct physio_proc { };
{
return;
}
-#endif /* _MACHINE_PHYSIO_PROC_H_ */
+
+#endif /* _KERNEL */
+#endif /* _MACHINE_PHYSIO_PROC_H_ */
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* $FreeBSD: src/sys/i386/include/pmap.h,v 1.65.2.3 2001/10/03 07:15:37 peter Exp $
- * $DragonFly: src/sys/i386/include/Attic/pmap.h,v 1.9 2006/05/20 02:42:06 dillon Exp $
+ * $DragonFly: src/sys/i386/include/Attic/pmap.h,v 1.10 2006/05/21 03:43:44 dillon Exp $
*/
#ifndef _MACHINE_PMAP_H_
vm_offset_t pv_va; /* virtual address for mapping */
TAILQ_ENTRY(pv_entry) pv_list;
TAILQ_ENTRY(pv_entry) pv_plist;
- vm_page_t pv_ptem; /* VM page for pte */
+ struct vm_page *pv_ptem; /* VM page for pte */
} *pv_entry_t;
#ifdef _KERNEL
void *pmap_mapdev (vm_paddr_t, vm_size_t);
void pmap_unmapdev (vm_offset_t, vm_size_t);
unsigned *pmap_pte (pmap_t, vm_offset_t) __pure2;
-vm_page_t pmap_use_pt (pmap_t, vm_offset_t);
+struct vm_page *pmap_use_pt (pmap_t, vm_offset_t);
#ifdef SMP
void pmap_set_opt (void);
#endif
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
* $FreeBSD: src/sys/i386/include/profile.h,v 1.20 1999/12/29 04:33:05 peter Exp $
- * $DragonFly: src/sys/i386/include/Attic/profile.h,v 1.7 2006/05/20 02:42:06 dillon Exp $
+ * $DragonFly: src/sys/i386/include/Attic/profile.h,v 1.8 2006/05/21 03:43:44 dillon Exp $
*/
#ifndef _MACHINE_PROFILE_H_
#define _MACHINE_PROFILE_H_
+#ifndef _SYS_CDEFS_H_
+#include <sys/cdefs.h>
+#endif
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
#else /* !_KERNEL */
-#include <sys/cdefs.h>
-
__BEGIN_DECLS
#ifdef __GNUC__
void mcount (void) __asm(".mcount");
#endif
-static void _mcount (uintfptr_t frompc, uintfptr_t selfpc);
+/*static void _mcount (uintfptr_t frompc, uintfptr_t selfpc);*/
__END_DECLS
#endif /* _KERNEL */
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/i386/include/_stdint.h,v 1.1 2002/07/29 17:41:07 mike Exp $
- * $DragonFly: src/sys/i386/include/Attic/stdint.h,v 1.4 2006/01/02 06:02:01 y0netan1 Exp $
+ * $DragonFly: src/sys/i386/include/Attic/stdint.h,v 1.5 2006/05/21 03:43:44 dillon Exp $
*/
#ifndef _MACHINE_STDINT_H_
typedef unsigned short __uint16_t;
typedef int __int32_t;
typedef unsigned int __uint32_t;
+typedef int __boolean_t;
/*
* This mess is to override compiler options that might restrict long long
/* $KAME: altq_var.h,v 1.17 2004/04/20 05:09:08 kjc Exp $ */
-/* $DragonFly: src/sys/net/altq/altq_var.h,v 1.1 2005/02/11 22:25:57 joerg Exp $ */
+/* $DragonFly: src/sys/net/altq/altq_var.h,v 1.2 2006/05/21 03:43:46 dillon Exp $ */
/*
* Copyright (C) 1998-2003
#ifdef _KERNEL
+#ifndef _SYS_PARAM_H_
#include <sys/param.h>
+#endif
+#ifndef _SYS_KERNEL_H_
#include <sys/kernel.h>
+#endif
+#ifndef _SYS_MALLOC_H_
#include <sys/malloc.h>
+#endif
+#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
+#endif
MALLOC_DECLARE(M_ALTQ);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/netinet/ip_dummynet.h,v 1.10.2.9 2003/05/13 09:31:06 maxim Exp $
- * $DragonFly: src/sys/net/dummynet/ip_dummynet.h,v 1.3 2004/09/15 20:30:09 joerg Exp $
+ * $DragonFly: src/sys/net/dummynet/ip_dummynet.h,v 1.4 2006/05/21 03:43:46 dillon Exp $
*/
#ifndef _IP_DUMMYNET_H
struct dn_heap_entry *p ; /* really an array of "size" entries */
} ;
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
/*
* struct dn_pkt identifies a packet in the dummynet queue, but
* is also used to tag packets passed back to the various destinations
int flags ; /* flags, for ip_output (IPv6 ?) */
};
+#endif
+
/*
* Overall structure of dummynet (with WF2Q+):
*
* @(#)if_arp.h 8.1 (Berkeley) 6/10/93
* $FreeBSD: src/sys/net/if_arp.h,v 1.14.2.3 2002/02/20 23:34:09 fjoe Exp $
- * $DragonFly: src/sys/net/if_arp.h,v 1.6 2006/05/20 02:42:08 dillon Exp $
+ * $DragonFly: src/sys/net/if_arp.h,v 1.7 2006/05/21 03:43:45 dillon Exp $
*/
#ifndef _NET_IF_ARP_H_
#ifndef _NET_IF_H_
#include <net/if.h>
#endif
+#ifndef _NET_IF_VAR_H_
+#include <net/if_var.h>
+#endif
/*
* Address Resolution Protocol.
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $DragonFly: src/sys/net/ifq_var.h,v 1.7 2006/05/20 02:42:08 dillon Exp $
+ * $DragonFly: src/sys/net/ifq_var.h,v 1.8 2006/05/21 03:43:45 dillon Exp $
*/
/*
* NOTE ON MPSAFE access. Routines which manipulate the packet queue must
#ifndef _NET_IFQ_VAR_H_
#define _NET_IFQ_VAR_H_
-#if defined(_KERNEL) && !defined(_SYS_SYSTM_H_)
+#ifndef _KERNEL
+
+#error "This file should not be included by userland programs."
+
+#else
+
+#ifndef _SYS_SYSTM_H_
#include <sys/systm.h>
#endif
#ifndef _SYS_THREAD2_H_
void ifq_set_classic(struct ifaltq *);
-#endif
+#endif /* _KERNEL */
+#endif /* _NET_IFQ_VAR_H_ */
*
* @(#)netisr.h 8.1 (Berkeley) 6/10/93
* $FreeBSD: src/sys/net/netisr.h,v 1.21.2.5 2002/02/09 23:02:39 luigi Exp $
- * $DragonFly: src/sys/net/netisr.h,v 1.22 2006/01/31 19:05:35 dillon Exp $
+ * $DragonFly: src/sys/net/netisr.h,v 1.23 2006/05/21 03:43:45 dillon Exp $
*/
#ifndef _NET_NETISR_H_
#define _NET_NETISR_H_
-#include <sys/msgport.h>
-
/*
* The networking code runs off software interrupts.
*
#define NETISR_MAX 32
-TAILQ_HEAD(notifymsglist, netmsg_so_notify);
-
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+#ifndef _SYS_TYPES_H_
+#include <sys/types.h>
+#endif
+#ifndef _SYS_QUEUE_H_
+#include <sys/queue.h>
+#endif
+#ifndef _SYS_PROTOSW_H_
#include <sys/protosw.h>
+#endif
+#ifndef _SYS_MSGPORT_H_
+#include <sys/msgport.h>
+#endif
+
+TAILQ_HEAD(notifymsglist, netmsg_so_notify);
struct netmsg;
typedef int (*netisr_fn_t)(struct netmsg *);
-typedef boolean_t (*msg_predicate_fn_t)(struct netmsg *);
+typedef __boolean_t (*msg_predicate_fn_t)(struct netmsg *);
/*
* Base class. All net messages must start with the same fields.
#define NM_REVENT 0x1 /* event on receive buffer */
#define NM_SEVENT 0x2 /* event on send buffer */
+#endif
+
+#ifdef _KERNEL
+
/*
* for dispatching pr_ functions,
* until they can be converted to message-passing
int netmsg_so_notify(lwkt_msg_t);
int netmsg_so_notify_abort(lwkt_msg_t);
+#endif
+
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
typedef lwkt_port_t (*lwkt_portfn_t)(struct mbuf **);
struct netisr {
struct netmsg ni_netmsg; /* for sched_netisr() (no-data) */
};
+#endif
+
+#ifdef _KERNEL
+
extern lwkt_port netisr_afree_rport;
lwkt_port_t cpu0_portfn(struct mbuf **mptr);
void netmsg_service_sync(void);
void schednetisr(int);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _NET_NETISR_H_ */
*
* @(#)radix.h 8.2 (Berkeley) 10/31/94
* $FreeBSD: src/sys/net/radix.h,v 1.16.2.1 2000/05/03 19:17:11 wollman Exp $
- * $DragonFly: src/sys/net/radix.h,v 1.10 2006/05/20 02:42:08 dillon Exp $
+ * $DragonFly: src/sys/net/radix.h,v 1.11 2006/05/21 03:43:45 dillon Exp $
*/
#ifndef _NET_RADIX_H_
};
#ifndef _KERNEL
-#include <stdbool.h>
-#define boolean_t bool
#define R_Malloc(p, t, n) (p = (t) malloc((n)))
#define Free(p) free(p);
#else
void rn_init (void);
int rn_inithead (void **, int);
-boolean_t rn_refines (char *, char *);
-struct radix_node *rn_addmask (char *, boolean_t, int),
+__boolean_t rn_refines (char *, char *);
+struct radix_node *rn_addmask (char *, __boolean_t, int),
*rn_addroute (char *, char *, struct radix_node_head *,
struct radix_node [2]),
*rn_delete (char *, char *, struct radix_node_head *),
*
* @(#)route.h 8.4 (Berkeley) 1/9/95
* $FreeBSD: src/sys/net/route.h,v 1.36.2.5 2002/02/01 11:48:01 ru Exp $
- * $DragonFly: src/sys/net/route.h,v 1.19 2006/05/20 02:42:08 dillon Exp $
+ * $DragonFly: src/sys/net/route.h,v 1.20 2006/05/21 03:43:45 dillon Exp $
*/
#ifndef _NET_ROUTE_H_
void rtalloc_ign (struct route *, u_long);
struct rtentry *
- _rtlookup (struct sockaddr *, boolean_t, u_long);
+ _rtlookup (struct sockaddr *, __boolean_t, u_long);
#define RTL_REPORTMSG TRUE
#define RTL_DONTREPORT FALSE
* Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
* - Initial distribution.
* $FreeBSD: src/sys/net/slcompress.h,v 1.14.2.1 2000/05/05 13:37:06 jlemon Exp $
- * $DragonFly: src/sys/net/slcompress.h,v 1.4 2006/05/20 02:42:08 dillon Exp $
+ * $DragonFly: src/sys/net/slcompress.h,v 1.5 2006/05/21 03:43:45 dillon Exp $
*/
#ifndef _NET_SLCOMPRESS_H_
/* flag values */
#define SLF_TOSS 1 /* tossing rcvd frames because of input err */
+struct mbuf;
+
void sl_compress_init (struct slcompress *, int);
u_int sl_compress_tcp (struct mbuf *,
struct ip *, struct slcompress *, int);
* Author: Julian Elischer <julian@freebsd.org>
*
* $FreeBSD: src/sys/netgraph/netgraph.h,v 1.6.2.7 2002/04/14 23:31:08 julian Exp $
- * $DragonFly: src/sys/netgraph/netgraph.h,v 1.3 2006/05/20 02:42:11 dillon Exp $
+ * $DragonFly: src/sys/netgraph/netgraph.h,v 1.4 2006/05/21 03:43:47 dillon Exp $
* $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $
*/
#endif
#ifndef _KERNEL
+
#error "This file should not be included in user level programs"
-#endif
+
+#else
#define NG_ABI_VERSION NG_VERSION
void ng_unref(node_p node);
int ng_wait_node(node_p node, char *msg);
-#endif /* _NETGRAPH_NETGRAPH_H_ */
+#endif /* _KERNEL */
+#endif /* _NETGRAPH_NETGRAPH_H_ */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/i386/include/nexusvar.h,v 1.1 2000/09/28 00:37:31 peter Exp $
- * $DragonFly: src/sys/platform/pc32/include/nexusvar.h,v 1.2 2006/05/20 02:42:06 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/include/nexusvar.h,v 1.3 2006/05/21 03:43:44 dillon Exp $
*/
#ifndef _MACHINE_NEXUSVAR_H_
#define _MACHINE_NEXUSVAR_H_
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
BUS_WRITE_IVAR(device_get_parent(dev), dev, NEXUS_IVAR_ ## B, v); \
}
+#ifdef _KERNEL
NEXUS_ACCESSOR(pcibus, PCIBUS, u_int32_t)
+#endif
#undef NEXUS_ACCESSOR
-#endif /* !_MACHINE_NEXUSVAR_H_ */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* !_MACHINE_NEXUSVAR_H_ */
-/* $FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $ */
-/* $DragonFly: src/sys/platform/pc32/include/Attic/physio_proc.h,v 1.12 2005/08/07 15:43:02 joerg Exp $ */
-/* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */
-/* $NetBSD$ */
-
/*
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $
+ * $DragonFly: src/sys/platform/pc32/include/Attic/physio_proc.h,v 1.13 2006/05/21 03:43:44 dillon Exp $
+ * $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $
+ * $NetBSD$
*/
+
#ifndef _MACHINE_PHYSIO_PROC_H_
#define _MACHINE_PHYSIO_PROC_H_
+#ifndef _KERNEL
+
+#error "This file should not be included by userland programs."
+
+#else
+
+#ifndef _SYS_BUF_H_
#include <sys/buf.h>
+#endif
+#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
+#endif
+#ifndef _SYS_THREAD2_H_
#include <sys/thread2.h>
+#endif
struct physio_proc { };
{
return;
}
-#endif /* _MACHINE_PHYSIO_PROC_H_ */
+
+#endif /* _KERNEL */
+#endif /* _MACHINE_PHYSIO_PROC_H_ */
*
* @(#)buf.h 8.9 (Berkeley) 3/30/95
* $FreeBSD: src/sys/sys/buf.h,v 1.88.2.10 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/sys/buf.h,v 1.35 2006/05/04 18:32:23 dillon Exp $
+ * $DragonFly: src/sys/sys/buf.h,v 1.36 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_BUF_H_
#define _SYS_BUF_H_
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
#endif
void reassignbuf (struct buf *);
struct buf *trypbuf (int *);
-#endif /* _KERNEL */
-
-#endif /* !_SYS_BUF_H_ */
+#endif /* _KERNEL */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* !_SYS_BUF_H_ */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/sys/bus_private.h,v 1.11.2.2 2000/08/03 00:25:22 peter Exp $
- * $DragonFly: src/sys/sys/bus_private.h,v 1.7 2004/12/30 07:01:52 cpressey Exp $
+ * $DragonFly: src/sys/sys/bus_private.h,v 1.8 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_BUS_PRIVATE_H_
#define _SYS_BUS_PRIVATE_H_
#if !defined(_KERNEL) && !defined(_KERNEL_STRUCTURES)
+
#error "This file should not be included by userland programs."
-#endif
+#else
+
+#ifndef _SYS_BUS_H_
#include <sys/bus.h>
+#endif
/*
* Used to attach drivers to devclasses.
const char* name; /* unique name (for registration) */
};
-#endif /* !_SYS_BUS_PRIVATE_H_ */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* !_SYS_BUS_PRIVATE_H_ */
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libcam/camlib.h,v 1.2 1999/08/28 00:04:06 peter Exp $
- * $DragonFly: src/sys/sys/camlib.h,v 1.2 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/camlib.h,v 1.3 2006/05/21 03:43:47 dillon Exp $
*/
/*
* Buffer encoding/decoding routines taken from the original FreeBSD SCSI
#ifndef _SYS_CAMLIB_H_
#define _SYS_CAMLIB_H_
+#ifndef _SYS_CDEFS_H_
#include <sys/cdefs.h>
+#endif
+#ifndef _SYS_PARAM_H_
#include <sys/param.h>
-
+#endif
+#ifndef _BUS_CAM_CAM_H_
#include <bus/cam/cam.h>
+#endif
+#ifndef _BUS_CAM_CAM_CCB_H_
#include <bus/cam/cam_ccb.h>
+#endif
#define CAM_ERRBUF_SIZE 2048 /* sizeof the CAM libarary error string */
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $DragonFly: src/sys/sys/ckpt.h,v 1.7 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/ckpt.h,v 1.8 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_CKPT_H_
#define _SYS_CKPT_H_
+#if !defined(_KERNEL) && !defined(_KERNEL_STRUCTURES)
+
+#error "This file should not be included by userland programs."
+
+#else
+
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
#define TRACE_EXIT
#define TRACE_ERR
#define PRINTF(args)
-#endif
-#endif
+#endif /* DEBUG */
+#endif /* _KERNEL */
-#endif
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* _SYS_CKPT_H_ */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/sys/eventhandler.h,v 1.5 2000/01/16 06:11:33 bde Exp $
- * $DragonFly: src/sys/sys/eventhandler.h,v 1.6 2004/12/30 07:01:52 cpressey Exp $
+ * $DragonFly: src/sys/sys/eventhandler.h,v 1.7 2006/05/21 03:43:47 dillon Exp $
*/
#include <sys/queue.h>
#define SYS_EVENTHANDLER_H
#if !defined(_KERNEL) && !defined(_KERNEL_STRUCTURES)
+
#error "This file should not be included by userland programs."
-#endif
+
+#else
struct eventhandler_entry
{
EVENTHANDLER_DECLARE(shutdown_post_sync, shutdown_fn); /* after fs sync */
EVENTHANDLER_DECLARE(shutdown_final, shutdown_fn);
-#endif /* SYS_EVENTHANDLER_H */
+#endif /* _KERNEL */
+#endif /* SYS_EVENTHANDLER_H */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/sys/eventvar.h,v 1.1.2.2 2000/07/18 21:49:12 jlemon Exp $
- * $DragonFly: src/sys/sys/eventvar.h,v 1.4 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/eventvar.h,v 1.5 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_EVENTVAR_H_
#define _SYS_EVENTVAR_H_
+#if !defined(_KERNEL) && !defined(_KERNEL_STRUCTURES)
+
+#error "This file should not be included by userland programs."
+
+#else
+
#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
#endif
#include <sys/select.h>
#endif
-#if !defined(_KERNEL) && !defined(_KERNEL_STRUCTURES)
-#error "This file should not be included by userland programs."
-#endif
#define KQ_NEVENTS 8 /* minimize copy{in,out} calls */
#define KQEXTENT 256 /* linear growth by this amount */
struct kevent kq_kev[KQ_NEVENTS];
};
-#endif /* !_SYS_EVENTVAR_H_ */
+#endif /* _KERNEL */
+#endif /* !_SYS_EVENTVAR_H_ */
*
* @(#)gmon.h 8.2 (Berkeley) 1/4/94
* $FreeBSD: src/sys/sys/gmon.h,v 1.15 1999/08/28 00:51:45 peter Exp $
- * $DragonFly: src/sys/sys/gmon.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/gmon.h,v 1.3 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_GMON_H_
#define _SYS_GMON_H_
+#ifndef _MACHINE_PROFILE_H_
#include <machine/profile.h>
+#endif
/*
* Structure prepended to gmon.out profiling data file.
*
* @(#)kernel.h 8.3 (Berkeley) 1/21/94
* $FreeBSD: src/sys/sys/kernel.h,v 1.63.2.9 2002/07/02 23:00:30 archie Exp $
- * $DragonFly: src/sys/sys/kernel.h,v 1.20 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/kernel.h,v 1.21 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_KERNEL_H_
#define _SYS_KERNEL_H_
+#ifndef _KERNEL
+#error "This file should not be included by userland programs."
+#else
+
#ifndef _SYS_PARAM_H_
#include <sys/param.h>
#endif
#ifdef _KERNEL
-/* for intrhook below */
+#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
+#endif
/* Global variables for the kernel. */
*/
extern void tunable_int_init(void *);
+
struct tunable_int {
const char *path;
int *var;
/*
* Compatibility. To be deprecated after LKM is removed.
*/
+#ifndef _SYS_MODULE_H_
#include <sys/module.h>
+#endif
+
#define PSEUDO_SET(sym, name) \
static int name ## _modevent(module_t mod, int type, void *data) \
{ \
extern struct linker_set execsw_set;
-
-
-
struct intr_config_hook {
TAILQ_ENTRY(intr_config_hook) ich_links;
void (*ich_func) (void *);
int config_intrhook_establish (struct intr_config_hook *);
void config_intrhook_disestablish (struct intr_config_hook *);
+#endif /* _KERNEL */
#endif /* !_SYS_KERNEL_H_*/
*
* @(#)ktrace.h 8.1 (Berkeley) 6/2/93
* $FreeBSD: src/sys/sys/ktrace.h,v 1.19.2.3 2001/01/06 09:58:23 alfred Exp $
- * $DragonFly: src/sys/sys/ktrace.h,v 1.7 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/ktrace.h,v 1.8 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_KTRACE_H_
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
+#ifndef _SYS_TIME_H_
+#include <sys/time.h>
+#endif
#ifndef _SYS_UIO_H_
#include <sys/uio.h>
#endif
*
* @(#)libkern.h 8.1 (Berkeley) 6/10/93
* $FreeBSD: src/sys/sys/libkern.h,v 1.20.2.2 2001/09/30 21:12:54 luigi Exp $
- * $DragonFly: src/sys/sys/libkern.h,v 1.7 2004/05/05 00:17:45 hsu Exp $
+ * $DragonFly: src/sys/sys/libkern.h,v 1.8 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_LIBKERN_H_
#define _SYS_LIBKERN_H_
+#if !defined(_KERNEL)
+#error "This file should not be included by userland programs."
+#else
+
+#ifndef _SYS_CDEFS_H_
#include <sys/cdefs.h>
+#endif
+#ifndef _SYS_TYPES_H_
#include <sys/types.h>
-#ifdef _KERNEL
+#endif
+#ifndef _SYS_SYSTM_H_
#include <sys/systm.h>
#endif
#define FNM_IGNORECASE FNM_CASEFOLD
#define FNM_FILE_NAME FNM_PATHNAME
-#endif /* !_SYS_LIBKERN_H_ */
+#endif /* _KERNEL */
+#endif /* !_SYS_LIBKERN_H_ */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/sys/linker.h,v 1.17.2.1 2002/03/11 01:13:53 dd Exp $
- * $DragonFly: src/sys/sys/linker.h,v 1.8 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/linker.h,v 1.9 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_LINKER_H_
#define _SYS_LINKER_H_
-#ifdef _KERNEL
-
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
#ifndef _SYS_PARAM_H_
#include <sys/param.h>
#endif
+
+#ifdef _KERNEL
+
#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
#endif
u_long symvalue;
size_t symsize;
};
+
#define KLDSYM_LOOKUP 1
#ifndef _KERNEL
+#ifndef _SYS_CDEFS_H_
#include <sys/cdefs.h>
+#endif
__BEGIN_DECLS
int kldload(const char *);
*
* @(#)malloc.h 8.5 (Berkeley) 5/3/95
* $FreeBSD: src/sys/sys/malloc.h,v 1.48.2.2 2002/03/16 02:19:16 archie Exp $
- * $DragonFly: src/sys/sys/malloc.h,v 1.21 2005/03/28 18:49:25 joerg Exp $
+ * $DragonFly: src/sys/sys/malloc.h,v 1.22 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_MALLOC_H_
#define _SYS_MALLOC_H_
+#ifndef _SYS_TYPES_H_
+#include <sys/types.h>
+#endif
+#ifndef _MACHINE_TYPES_H_
+#include <machine/types.h> /* vm_paddr_t and __* types */
+#endif
+
#ifndef _MACHINE_PARAM_H_
#include <machine/param.h> /* for SMP_MAXCPU */
#endif
#include <machine/vmparam.h> /* for VM_MIN_KERNEL_ADDRESS */
#endif
-#define splmem splhigh
-
-#ifndef _MACHINE_TYPES_H_
-#include <machine/types.h> /* vm_paddr_t */
-#endif
-
#endif /* _KERNEL */
/*
*
* @(#)mbuf.h 8.5 (Berkeley) 2/19/95
* $FreeBSD: src/sys/sys/mbuf.h,v 1.44.2.17 2003/04/15 06:15:02 silby Exp $
- * $DragonFly: src/sys/sys/mbuf.h,v 1.34 2006/05/20 06:32:41 dillon Exp $
+ * $DragonFly: src/sys/sys/mbuf.h,v 1.35 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_MBUF_H_
#define _SYS_MBUF_H_
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
{
return m_tag_locate(m, MTAG_ABI_COMPAT, type, start);
}
-#endif /* _KERNEL */
-#endif /* !_SYS_MBUF_H_ */
+#endif /* _KERNEL */
+
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* !_SYS_MBUF_H_ */
*
* @(#)mman.h 8.2 (Berkeley) 1/9/95
* $FreeBSD: src/sys/sys/mman.h,v 1.29.2.1 2001/08/25 07:25:43 dillon Exp $
- * $DragonFly: src/sys/sys/mman.h,v 1.3 2003/08/20 07:31:21 rob Exp $
+ * $DragonFly: src/sys/sys/mman.h,v 1.4 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_MMAN_H_
#define _SYS_MMAN_H_
+#ifndef _SYS__POSIX_H_
#include <sys/_posix.h>
+#endif
/*
* Inheritance for minherit()
#ifndef _KERNEL
+#ifndef _SYS_TYPES_H_
+#include <sys/types.h>
+#endif
+#ifndef _SYS_CDEFS_H_
#include <sys/cdefs.h>
+#endif
__BEGIN_DECLS
#ifdef _P1003_1B_VISIBLE
*
* @(#)mount.h 8.21 (Berkeley) 5/20/95
* $FreeBSD: src/sys/sys/mount.h,v 1.89.2.7 2003/04/04 20:35:57 tegge Exp $
- * $DragonFly: src/sys/sys/mount.h,v 1.25 2006/05/07 00:24:58 dillon Exp $
+ * $DragonFly: src/sys/sys/mount.h,v 1.26 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_MOUNT_H_
#endif /* !_POSIX_C_SOURCE */
#endif /* !_KERNEL */
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
-#ifdef _KERNEL
+#endif
+#ifndef _SYS_LOCK_H_
#include <sys/lock.h>
#endif
+#endif
struct thread;
struct journal;
* Copyright (c) 1998 David Greenman. All rights reserved.
* src/sys/sys/sfbuf.h,v 1.4 2004/04/01 17:58:06 dillon
*
- * $DragonFly: src/sys/sys/msfbuf.h,v 1.11 2005/03/05 05:04:32 dillon Exp $
+ * $DragonFly: src/sys/sys/msfbuf.h,v 1.12 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_MSFBUF_H_
#define _SYS_MSFBUF_H_
#if !defined(_KERNEL) && !defined(_KERNEL_STRUCTURES)
+
#error "This file should not be included by userland programs."
-#endif
+
+#else
#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
void msf_buf_free(struct msf_buf *);
void msf_buf_ref(struct msf_buf *);
-#endif /* _KERNEL */
-
-#endif
+#endif /* _KERNEL */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* _SYS_MSFBUF_H_ */
*
* Implements Inlines for LWKT messages and ports.
*
- * $DragonFly: src/sys/sys/msgport2.h,v 1.10 2004/06/04 20:35:39 dillon Exp $
+ * $DragonFly: src/sys/sys/msgport2.h,v 1.11 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_MSGPORT2_H_
#define _SYS_MSGPORT2_H_
+#ifndef _KERNEL
+
+#error "This file should not be included by userland programs."
+
+#else
+
#ifndef _SYS_THREAD2_H_
#include <sys/thread2.h>
#endif
return(msg->ms_flags & MSGF_DONE);
}
-#endif
-
+#endif /* _KERNEL */
+#endif /* _SYS_MSGPORT2_H_ */
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $DragonFly: src/sys/sys/objcache.h,v 1.4 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/objcache.h,v 1.5 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _OBJCACHE_H_
#define _OBJCACHE_H_
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
#endif /* !_KERNEL */
-#endif
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* _SYS_OBJCACHE_H_ */
* are met.
*
* $FreeBSD: src/sys/sys/pipe.h,v 1.16 1999/12/29 04:24:45 peter Exp $
- * $DragonFly: src/sys/sys/pipe.h,v 1.8 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/pipe.h,v 1.9 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_PIPE_H_
#define _SYS_PIPE_H_
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
int pipe_busy; /* busy flag, mostly to handle rundown sanely */
};
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
#endif /* !_SYS_PIPE_H_ */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/sys/power.h,v 1.3.6.1 2003/08/18 20:22:23 jhb Exp $
- * $DragonFly: src/sys/sys/power.h,v 1.2 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/power.h,v 1.3 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_POWER_H_
#define _SYS_POWER_H_
+#ifndef _KERNEL
+
+#error "This file should not be included by userland programs."
+
+#else
+
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
typedef void (*power_profile_change_hook)(void *, int);
EVENTHANDLER_DECLARE(power_profile_change, power_profile_change_hook);
+#endif /* _KERNEL */
#endif /* !_SYS_POWER_H_ */
*
* @(#)proc.h 8.15 (Berkeley) 5/19/95
* $FreeBSD: src/sys/sys/proc.h,v 1.99.2.9 2003/06/06 20:21:32 tegge Exp $
- * $DragonFly: src/sys/sys/proc.h,v 1.74 2006/05/17 20:20:55 dillon Exp $
+ * $DragonFly: src/sys/sys/proc.h,v 1.75 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_PROC_H_
#define _SYS_PROC_H_
#if !defined(_KERNEL) && !defined(_KERNEL_STRUCTURES)
+
#error "Userland must include sys/user.h instead of sys/proc.h"
-#endif
+
+#else
#include <sys/callout.h> /* For struct callout_handle. */
#include <sys/filedesc.h>
#endif /* _KERNEL */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
#endif /* !_SYS_PROC_H_ */
*
* @(#)protosw.h 8.1 (Berkeley) 6/2/93
* $FreeBSD: src/sys/sys/protosw.h,v 1.28.2.2 2001/07/03 11:02:01 ume Exp $
- * $DragonFly: src/sys/sys/protosw.h,v 1.16 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/protosw.h,v 1.17 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_PROTOSW_H_
pid_t p_pid;
};
-/*#ifdef _KERNEL*/
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
/*
* Protocol switch table.
*
/* flush any excess space possible */
const struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */
};
-/*#endif*/
+
+#endif
#define PR_SLOWHZ 2 /* 2 slow timeouts per second */
#define PR_FASTHZ 5 /* 5 fast timeouts per second */
};
#endif
-#ifdef _KERNEL /* users shouldn't see this decl */
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
struct ifnet;
struct stat;
struct lwkt_port *cpu0_soport(struct socket *, struct sockaddr *, int);
struct lwkt_port *sync_soport(struct socket *, struct sockaddr *, int);
-#endif /* _KERNEL */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
/*
* The arguments to the ctlinput routine are
};
#endif
+/*
+ * Kernel prototypes
+ */
#ifdef _KERNEL
+
void pfctlinput (int, struct sockaddr *);
void pfctlinput2 (int, struct sockaddr *, void *);
struct protosw *pffindproto (int family, int protocol, int type);
struct protosw *pffindtype (int family, int type);
+
#endif /* _KERNEL */
#endif /* _SYS_PROTOSW_H_ */
*
* @(#)select.h 8.2 (Berkeley) 1/4/94
* $FreeBSD: src/sys/sys/select.h,v 1.6.2.1 2000/05/05 03:50:02 jlemon Exp $
- * $DragonFly: src/sys/sys/select.h,v 1.5 2004/04/10 00:48:06 hsu Exp $
+ * $DragonFly: src/sys/sys/select.h,v 1.6 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_SELECT_H_
#define _SYS_SELECT_H_
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
+#ifndef _SYS_EVENT_H_
#include <sys/event.h> /* for struct klist */
+#endif
+#ifndef _SYS_NETISR_H_
#include <net/netisr.h> /* for struct notifymsglist */
+#endif
/*
* Used to maintain information about processes that wish to be
void selwakeup (struct selinfo *);
#endif
-#endif /* !_SYS_SELECT_H_ */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* !_SYS_SELECT_H_ */
*
* @(#)socket.h 8.4 (Berkeley) 2/21/94
* $FreeBSD: src/sys/sys/socket.h,v 1.39.2.7 2001/07/03 11:02:01 ume Exp $
- * $DragonFly: src/sys/sys/socket.h,v 1.11 2005/07/15 17:54:48 eirikn Exp $
+ * $DragonFly: src/sys/sys/socket.h,v 1.12 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_SOCKET_H_
#define _SYS_SOCKET_H_
+#ifndef _SYS_TYPES_H_
+#include <sys/types.h>
+#endif
#ifndef _MACHINE_STDINT_H_
#include <machine/stdint.h>
#endif
#define SOCK_MAXADDRLEN 255 /* longest possible addresses */
#ifdef _KERNEL
+
+#ifndef _SYS_LIBKERN_H_
#include <sys/libkern.h> /* for bcmp() */
+#endif
static __inline boolean_t
sa_equal(const struct sockaddr *a1, const struct sockaddr *a2)
#ifndef _KERNEL
+#ifndef _SYS_CDEFS_H_
#include <sys/cdefs.h>
+#endif
__BEGIN_DECLS
int accept (int, struct sockaddr *, socklen_t *);
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $DragonFly: src/sys/sys/socketops.h,v 1.7 2006/05/06 02:43:13 dillon Exp $
+ * $DragonFly: src/sys/sys/socketops.h,v 1.8 2006/05/21 03:43:47 dillon Exp $
*/
/*
#define _SOCKETOPS_H_
#ifndef _KERNEL
+
#error "This file should not be included by userland programs."
-#endif
+#else
+
+#ifndef _SYS_PROTOSW_H_
#include <sys/protosw.h>
+#endif
+#ifndef _SYS_SOCKET_H_
#include <sys/socket.h>
+#endif
+#ifndef _SYS_SOCKETVAR_H_
#include <sys/socketvar.h>
+#endif
/*
* sosend() and soreceive() can block and also calls other pru_usrreq functions.
int so_pru_sopoll (struct socket *so, int events, struct ucred *cred);
int so_pr_ctloutput(struct socket *so, struct sockopt *sopt);
-#endif
+#endif /* _KERNEL */
+#endif /* _SYS_SOCKETOPS_H_ */
*
* @(#)socketvar.h 8.3 (Berkeley) 2/19/95
* $FreeBSD: src/sys/sys/socketvar.h,v 1.46.2.10 2003/08/24 08:24:39 hsu Exp $
- * $DragonFly: src/sys/sys/socketvar.h,v 1.23 2006/05/20 17:41:42 dillon Exp $
+ * $DragonFly: src/sys/sys/socketvar.h,v 1.24 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_SOCKETVAR_H_
#define _SYS_SOCKETVAR_H_
+#ifndef _SYS_TYPES_H_
+#include <sys/types.h>
+#endif
+#ifndef _SYS_QUEUE_H_
#include <sys/queue.h> /* for TAILQ macros */
+#endif
+#ifndef _SYS_SELECT_H_
#include <sys/select.h> /* for struct selinfo */
+#endif
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
/*
* Kernel structure per socket.
* Contains send and receive buffer queues,
} *so_accf;
};
+#endif
+
/*
* Socket state bits.
*/
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $DragonFly: src/sys/sys/spinlock2.h,v 1.7 2006/05/19 18:26:29 dillon Exp $
+ * $DragonFly: src/sys/sys/spinlock2.h,v 1.8 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_SPINLOCK2_H_
#define _SYS_SPINLOCK2_H_
+#ifndef _KERNEL
+
+#error "This file should not be included by userland programs."
+
+#else
+
+#ifndef _SYS_THREAD2_H_
#include <sys/thread2.h>
+#endif
+#ifndef _MACHINE_ATOMIC_H_
#include <machine/atomic.h>
+#endif
+#ifndef _MACHINE_CPUFUNC_H_
#include <machine/cpufunc.h>
+#endif
#ifdef SMP
crit_exit_id("spin");
}
-#endif
+#endif /* _KERNEL */
+#endif /* _SYS_SPINLOCK2_H_ */
/*
* SYS/SYSMSG.H
*
- * $DragonFly: src/sys/sys/sysmsg.h,v 1.8 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/sysmsg.h,v 1.9 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_SYSMSG_H_
#define _SYS_SYSMSG_H_
-#ifdef _KERNEL
-
#ifndef _SYS_MSGPORT_H_
#include <sys/msgport.h>
#endif
+
+#ifdef _KERNEL
+
#ifndef _SYS_CALLOUT_H_
#include <sys/callout.h> /* for struct callout */
#endif
*
* @(#)systm.h 8.7 (Berkeley) 3/29/95
* $FreeBSD: src/sys/sys/systm.h,v 1.111.2.18 2002/12/17 18:04:02 sam Exp $
- * $DragonFly: src/sys/sys/systm.h,v 1.36 2006/04/14 01:00:16 dillon Exp $
+ * $DragonFly: src/sys/sys/systm.h,v 1.37 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_SYSTM_H_
#ifndef _KERNEL
#error "This file should not be included by userland programs."
-#endif
+#else
#ifndef _MACHINE_TYPES_H_
#include <machine/types.h>
int uminor(udev_t dev);
int umajor(udev_t dev);
udev_t makeudev(int x, int y);
+
+#endif /* _KERNEL */
#endif /* !_SYS_SYSTM_H_ */
* on a different cpu will not be immediately scheduled by a yield() on
* this cpu.
*
- * $DragonFly: src/sys/sys/thread2.h,v 1.26 2006/05/18 16:25:20 dillon Exp $
+ * $DragonFly: src/sys/sys/thread2.h,v 1.27 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_THREAD2_H_
#define _SYS_THREAD2_H_
+#ifndef _KERNEL
+
+#error "This file should not be included by userland programs."
+
+#else
+
/*
* Userland will have its own globaldata which it includes prior to this.
*/
-#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+#ifndef _SYS_SYSTM_H_
+#include <sys/systm.h>
+#endif
#ifndef _SYS_GLOBALDATA_H_
#include <sys/globaldata.h>
#endif
#ifndef _MACHINE_CPUFUNC_H_
#include <machine/cpufunc.h>
#endif
-#endif
/*
* Critical section debugging
*/
#ifdef DEBUG_CRIT_SECTIONS
-#include <sys/systm.h>
-
static __inline void
_debug_crit_enter(thread_t td, const char *id)
{
return(lwkt_send_ipiq3_bycpu(dcpu, (ipifunc3_t)func, arg1, arg2));
}
-#endif
-
-#endif
+#endif /* SMP */
+#endif /* _KERNEL */
+#endif /* _SYS_THREAD2_H_ */
*
* @(#)tty.h 8.6 (Berkeley) 1/21/94
* $FreeBSD: src/sys/sys/tty.h,v 1.53.2.1 2001/02/26 04:23:21 jlemon Exp $
- * $DragonFly: src/sys/sys/tty.h,v 1.7 2004/10/12 19:20:48 dillon Exp $
+ * $DragonFly: src/sys/sys/tty.h,v 1.8 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_TTY_H_
#define _SYS_TTY_H_
+#ifndef _SYS_TERMIOS_H_
#include <sys/termios.h>
+#endif
+#ifndef _SYS_SELECT_H_
#include <sys/select.h> /* For struct selinfo. */
-#include <sys/queue.h>
+#endif
/*
* Clists are character lists, which is a variable length linked list
char *c_cl; /* Pointer to the last cblock. */
};
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
+#ifndef _SYS_QUEUE_H_
+#include <sys/queue.h>
+#endif
+
/*
* Per-tty structure.
*
#define t_ospeed t_termios.c_ospeed
#define t_time t_termios.c_time
+#endif
+
/*
* User data unfortunately has to be copied through buffers on the way to
* and from clists. The buffers are on the stack so their sizes must be
#define TSA_PTS_READ(tp) ((void *)&(tp)->t_canq)
#ifdef _KERNEL
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_TTYS);
+
+#ifndef _SYS_MALLOC_H_
+#include <sys/malloc.h>
#endif
+
+MALLOC_DECLARE(M_TTYS);
+
extern struct tty *constty; /* Temporary virtual console. */
int b_to_q (char *cp, int cc, struct clist *q);
*
* @(#)types.h 8.6 (Berkeley) 2/19/95
* $FreeBSD: src/sys/sys/types.h,v 1.40.2.2 2001/04/21 14:53:06 ume Exp $
- * $DragonFly: src/sys/sys/types.h,v 1.12 2006/04/03 02:02:30 dillon Exp $
+ * $DragonFly: src/sys/sys/types.h,v 1.13 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_TYPES_H_
#define _SYS_TYPES_H_
+#ifndef _SYS_CDEFS_H_
#include <sys/cdefs.h>
+#endif
+#ifndef _STDINT_H_
#include <stdint.h>
+#endif
+#ifndef _MACHINE_STDARG_H_
#include <machine/stdarg.h>
+#endif
+#ifndef _MACHINE_ENDIANT_H_
#include <machine/endian.h>
+#endif
#ifndef _MACHINE_TYPES_H_
#include <machine/types.h>
#endif
typedef __int32_t swblk_t; /* swap offset */
typedef __uint32_t uid_t; /* user id */
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
+#ifndef __BOOLEAN_T_DEFINED__
+#define __BOOLEAN_T_DEFINED__
typedef int boolean_t;
+#endif
+
typedef u_int64_t uoff_t;
-typedef struct vm_page *vm_page_t;
+
+#endif
+
+/*
+ * XXX dev_t has different meanings for userland vs kernel compiles. What
+ * do we do for _KERNEL_STRUCTURES ? For the moment stick with the userland
+ * meaning as being the more compatible solution.
+ */
+#ifdef _KERNEL
struct specinfo;
*
* @(#)uio.h 8.5 (Berkeley) 2/22/94
* $FreeBSD: src/sys/sys/uio.h,v 1.11.2.1 2001/09/28 16:58:35 dillon Exp $
- * $DragonFly: src/sys/sys/uio.h,v 1.12 2006/05/20 02:42:13 dillon Exp $
+ * $DragonFly: src/sys/sys/uio.h,v 1.13 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_UIO_H_
#if defined(_KERNEL)
struct vm_object;
+struct vm_page;
void uio_yield (void);
int uiomove (caddr_t, int, struct uio *);
*
* @(#)vnode.h 8.7 (Berkeley) 2/4/94
* $FreeBSD: src/sys/sys/vnode.h,v 1.111.2.19 2002/12/29 18:19:53 dillon Exp $
- * $DragonFly: src/sys/sys/vnode.h,v 1.55 2006/05/18 16:25:20 dillon Exp $
+ * $DragonFly: src/sys/sys/vnode.h,v 1.56 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef _SYS_VNODE_H_
#define _SYS_VNODE_H_
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
+#ifndef _SYS_QUEUE_H_
#include <sys/queue.h>
+#endif
+#ifndef _SYS_LOCK_H_
#include <sys/lock.h>
+#endif
+#ifndef _SYS_SELECT_H_
#include <sys/select.h>
+#endif
+#ifndef _SYS_BIOTRACK_H_
#include <sys/biotrack.h>
+#endif
+#ifndef _SYS_UIO_H_
#include <sys/uio.h>
+#endif
+#ifndef _SYS_ACL_H_
#include <sys/acl.h>
+#endif
+#ifndef _SYS_NAMECACHE_H_
#include <sys/namecache.h>
-#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+#endif
+#ifndef _SYS_THREAD_H_
#include <sys/thread.h>
#endif
+#ifndef _SYS_VFSOPS_H_
#include <sys/vfsops.h>
+#endif
+#ifndef _SYS_VFSCACHE_H_
#include <sys/vfscache.h>
+#endif
+#ifndef _SYS_TREE_H_
#include <sys/tree.h>
-
+#endif
+#ifndef _MACHINE_LOCK_H_
#include <machine/lock.h>
+#endif
/*
* The vnode is the focus of all file activity in UNIX. There is a
extern struct vop_ops *spec_vnode_vops;
extern struct vop_ops *dead_vnode_vops;
-#endif /* _KERNEL */
+#endif /* _KERNEL */
-#endif /* !_SYS_VNODE_H_ */
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+#endif /* !_SYS_VNODE_H_ */
* rights to redistribute these changes.
*
* $FreeBSD: src/sys/vm/pmap.h,v 1.33.2.4 2002/03/06 22:44:24 silby Exp $
- * $DragonFly: src/sys/vm/pmap.h,v 1.17 2006/05/20 02:42:15 dillon Exp $
+ * $DragonFly: src/sys/vm/pmap.h,v 1.18 2006/05/21 03:43:47 dillon Exp $
*/
/*
struct proc;
struct thread;
+struct vm_page;
void pmap_change_wiring (pmap_t, vm_offset_t, boolean_t);
-void pmap_clear_modify (vm_page_t m);
-void pmap_clear_reference (vm_page_t m);
+void pmap_clear_modify (struct vm_page *m);
+void pmap_clear_reference (struct vm_page *m);
void pmap_collect (void);
void pmap_copy (pmap_t, pmap_t, vm_offset_t, vm_size_t,
- vm_offset_t);
+ vm_offset_t);
void pmap_copy_page (vm_paddr_t, vm_paddr_t);
void pmap_copy_page_frag (vm_paddr_t, vm_paddr_t, size_t bytes);
void pmap_destroy (pmap_t);
-void pmap_enter (pmap_t, vm_offset_t, vm_page_t, vm_prot_t,
- boolean_t);
+void pmap_enter (pmap_t, vm_offset_t, struct vm_page *,
+ vm_prot_t, boolean_t);
vm_paddr_t pmap_extract (pmap_t pmap, vm_offset_t va);
-vm_page_t pmap_extract_vmpage (pmap_t pmap, vm_offset_t va, int prot);
+struct vm_page *pmap_extract_vmpage (pmap_t pmap, vm_offset_t va, int prot);
void pmap_growkernel (vm_offset_t);
void pmap_init (void);
-boolean_t pmap_is_modified (vm_page_t m);
-boolean_t pmap_ts_referenced (vm_page_t m);
+boolean_t pmap_is_modified (struct vm_page *m);
+boolean_t pmap_ts_referenced (struct vm_page *m);
vm_offset_t pmap_map (vm_offset_t, vm_paddr_t, vm_paddr_t, int);
void pmap_object_init_pt (pmap_t pmap, vm_offset_t addr,
vm_prot_t prot, vm_object_t object, vm_pindex_t pindex,
vm_offset_t size, int pagelimit);
-boolean_t pmap_page_exists_quick (pmap_t pmap, vm_page_t m);
-void pmap_page_protect (vm_page_t m, vm_prot_t prot);
+boolean_t pmap_page_exists_quick (pmap_t pmap, struct vm_page *m);
+void pmap_page_protect (struct vm_page *m, vm_prot_t prot);
vm_paddr_t pmap_phys_address (int);
void pmap_pinit (pmap_t);
void pmap_pinit0 (pmap_t);
void pmap_pinit2 (pmap_t);
-void pmap_protect (pmap_t, vm_offset_t, vm_offset_t,
- vm_prot_t);
-void pmap_qenter (vm_offset_t, vm_page_t *, int);
-void pmap_qenter2 (vm_offset_t, vm_page_t *, int, cpumask_t *);
+void pmap_protect (pmap_t, vm_offset_t, vm_offset_t, vm_prot_t);
+void pmap_qenter (vm_offset_t, struct vm_page **, int);
+void pmap_qenter2 (vm_offset_t, struct vm_page **, int,
+ cpumask_t *);
void pmap_qremove (vm_offset_t, int);
void pmap_kenter (vm_offset_t, vm_paddr_t);
void pmap_kenter_quick (vm_offset_t, vm_paddr_t);
*
* from: @(#)swap_pager.h 7.1 (Berkeley) 12/5/90
* $FreeBSD: src/sys/vm/swap_pager.h,v 1.28.2.1 2000/10/13 07:13:23 dillon Exp $
- * $DragonFly: src/sys/vm/swap_pager.h,v 1.4 2006/05/20 02:42:15 dillon Exp $
+ * $DragonFly: src/sys/vm/swap_pager.h,v 1.5 2006/05/21 03:43:47 dillon Exp $
*/
/*
extern int swap_pager_full;
extern struct blist *swapblist;
-void swap_pager_putpages (vm_object_t, vm_page_t *, int, boolean_t, int *);
+void swap_pager_putpages (vm_object_t, struct vm_page **, int, boolean_t, int *);
boolean_t swap_pager_haspage (vm_object_t object, vm_pindex_t pindex, int *before, int *after);
int swap_pager_swp_alloc (vm_object_t, int);
* newswap functions
*/
-void swap_pager_page_removed (vm_page_t, vm_object_t);
+void swap_pager_page_removed (struct vm_page *, vm_object_t);
/* choose underlying swap device and queue up I/O */
struct buf;
* rights to redistribute these changes.
*
* $FreeBSD: src/sys/vm/vm.h,v 1.16.2.1 2002/12/28 19:49:41 dillon Exp $
- * $DragonFly: src/sys/vm/vm.h,v 1.5 2006/05/20 02:42:15 dillon Exp $
+ * $DragonFly: src/sys/vm/vm.h,v 1.6 2006/05/21 03:43:47 dillon Exp $
*/
#ifndef VM_VM_H_
struct vm_object_lock;
typedef struct vm_object_lock *vm_object_lock_t;
-#ifndef _KERNEL
-
/*
- * This is defined in <sys/types.h> for the kernel so that vnode_if.h
- * doesn't have to include <vm/vm.h>.
+ * This is also defined in vm/vm_page.h.
*/
+#ifndef __VM_PAGE_T_DEFINED__
+#define __VM_PAGE_T_DEFINED__
struct vm_page;
typedef struct vm_page *vm_page_t;
#endif
* rights to redistribute these changes.
*
* $FreeBSD: src/sys/vm/vm_page.h,v 1.75.2.8 2002/03/06 01:07:09 dillon Exp $
- * $DragonFly: src/sys/vm/vm_page.h,v 1.23 2006/05/20 02:42:15 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_page.h,v 1.24 2006/05/21 03:43:47 dillon Exp $
*/
/*
#ifndef _SYS_TYPES_H_
#include <sys/types.h>
#endif
-#if defined(_KERNEL) && !defined(_SYS_SYSTM_H_)
-#include <sys/systm.h>
-#endif
#ifndef _MACHINE_PMAP_H_
#include <machine/pmap.h>
#endif
#ifdef _KERNEL
+#ifndef _SYS_SYSTM_H_
+#include <sys/systm.h>
+#endif
#ifndef _SYS_THREAD2_H_
#include <sys/thread2.h>
#endif
TAILQ_HEAD(pglist, vm_page);
struct msf_buf;
+struct vm_object;
+
struct vm_page {
TAILQ_ENTRY(vm_page) pageq; /* vm_page_queues[] list (P) */
struct vm_page *hnext; /* hash table link (O,P) */
TAILQ_ENTRY(vm_page) listq; /* pages in same object (O) */
- vm_object_t object; /* which object am I in (O,P)*/
+ struct vm_object *object; /* which object am I in (O,P)*/
vm_pindex_t pindex; /* offset into object (O,P) */
vm_paddr_t phys_addr; /* physical address of page */
struct md_page md; /* machine dependant stuff */
struct msf_buf *msf_hint; /* first page of an msfbuf map */
};
+#ifndef __VM_PAGE_T_DEFINED__
+#define __VM_PAGE_T_DEFINED__
+typedef struct vm_page *vm_page_t;
+#endif
+
/*
* note: currently use SWAPBLK_NONE as an absolute value rather then
* a flag bit.
*/
extern int vm_page_zero_count;
-extern vm_page_t vm_page_array; /* First resident page in table */
+extern struct vm_page *vm_page_array; /* First resident page in table */
extern int vm_page_array_size; /* number of vm_page_t's */
extern long first_page; /* first physical page number */
void vm_page_unhold(vm_page_t mem);
void vm_page_activate (vm_page_t);
-vm_page_t vm_page_alloc (vm_object_t, vm_pindex_t, int);
-vm_page_t vm_page_grab (vm_object_t, vm_pindex_t, int);
+vm_page_t vm_page_alloc (struct vm_object *, vm_pindex_t, int);
+vm_page_t vm_page_grab (struct vm_object *, vm_pindex_t, int);
void vm_page_cache (vm_page_t);
int vm_page_try_to_cache (vm_page_t);
int vm_page_try_to_free (vm_page_t);
void vm_page_dontneed (vm_page_t);
void vm_page_deactivate (vm_page_t);
-void vm_page_insert (vm_page_t, vm_object_t, vm_pindex_t);
-vm_page_t vm_page_lookup (vm_object_t, vm_pindex_t);
+void vm_page_insert (vm_page_t, struct vm_object *, vm_pindex_t);
+vm_page_t vm_page_lookup (struct vm_object *, vm_pindex_t);
void vm_page_remove (vm_page_t);
-void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t);
+void vm_page_rename (vm_page_t, struct vm_object *, vm_pindex_t);
vm_offset_t vm_page_startup (vm_offset_t);
vm_page_t vm_add_new_page (vm_paddr_t pa);
void vm_page_unmanage (vm_page_t);
*
* @(#)atalk.c 1.1 (Whistle) 6/6/96
* $FreeBSD: src/usr.bin/netstat/atalk.c,v 1.13.2.2 2001/09/17 14:53:17 ru Exp $
- * $DragonFly: src/usr.bin/netstat/atalk.c,v 1.2 2003/06/17 04:29:30 dillon Exp $
+ * $DragonFly: src/usr.bin/netstat/atalk.c,v 1.3 2006/05/21 03:43:47 dillon Exp $
*/
+#define _KERNEL_STRUCTURES
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
* SUCH DAMAGE.
*
* $FreeBSD: src/usr.bin/netstat/inet6.c,v 1.3.2.11 2001/09/17 14:53:17 ru Exp $
- * $DragonFly: src/usr.bin/netstat/inet6.c,v 1.6 2005/08/04 17:31:23 drhodus Exp $
+ * $DragonFly: src/usr.bin/netstat/inet6.c,v 1.7 2006/05/21 03:43:47 dillon Exp $
*
* @(#)inet6.c 8.4 (Berkeley) 4/20/94
*/
#ifdef INET6
+#define _KERNEL_STRUCTURES
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
*
* @(#)ns.c 8.1 (Berkeley) 6/6/93
* $FreeBSD: src/usr.bin/netstat/ipx.c,v 1.13.2.1 2001/08/10 09:07:09 ru Exp $
- * $DragonFly: src/usr.bin/netstat/ipx.c,v 1.3 2005/08/04 17:31:23 drhodus Exp $
+ * $DragonFly: src/usr.bin/netstat/ipx.c,v 1.4 2006/05/21 03:43:47 dillon Exp $
*/
+#define _KERNEL_STRUCTURES
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
*
* @(#)mbuf.c 8.1 (Berkeley) 6/6/93
* $FreeBSD: src/usr.bin/netstat/mbuf.c,v 1.17.2.3 2001/08/10 09:07:09 ru Exp $
- * $DragonFly: src/usr.bin/netstat/mbuf.c,v 1.5 2005/08/04 17:31:23 drhodus Exp $
+ * $DragonFly: src/usr.bin/netstat/mbuf.c,v 1.6 2006/05/21 03:43:47 dillon Exp $
*/
+#define _KERNEL_STRUCTURES
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
* OF SUCH DAMAGE.
*
* $FreeBSD: src/usr.bin/netstat/netgraph.c,v 1.3.2.2 2001/08/10 09:07:09 ru Exp $
- * $DragonFly: src/usr.bin/netstat/netgraph.c,v 1.3 2003/08/08 04:18:43 dillon Exp $
+ * $DragonFly: src/usr.bin/netstat/netgraph.c,v 1.4 2006/05/21 03:43:47 dillon Exp $
*
* $Id: atalk.c,v 1.11 1998/07/06 21:01:22 bde Exp $
*/
+#define _KERNEL_STRUCTURES
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
*
* @(#)mbufs.c 8.1 (Berkeley) 6/6/93
* $FreeBSD: src/usr.bin/systat/mbufs.c,v 1.10.2.1 2000/08/26 09:36:55 ps Exp $
- * $DragonFly: src/usr.bin/systat/mbufs.c,v 1.5 2005/03/12 10:38:42 y0netan1 Exp $
+ * $DragonFly: src/usr.bin/systat/mbufs.c,v 1.6 2006/05/21 03:43:47 dillon Exp $
*/
+#define _KERNEL_STRUCTURES
#include <sys/param.h>
#include <sys/types.h>
#include <sys/mbuf.h>
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
* $FreeBSD: src/usr.sbin/sicontrol/sicontrol.c,v 1.12.2.1 2000/12/11 01:03:39 obrien Exp $
- * $DragonFly: src/usr.sbin/sicontrol/sicontrol.c,v 1.3 2003/08/08 04:18:48 dillon Exp $
+ * $DragonFly: src/usr.sbin/sicontrol/sicontrol.c,v 1.4 2006/05/21 03:43:48 dillon Exp $
*/
+#define _KERNEL_STRUCTURES
#include <ctype.h>
#include <err.h>
#include <fcntl.h>