diff options
43 files changed, 223 insertions, 142 deletions
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index 2528d73..cf912f1 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: md_var.h,v 1.3 1995/05/30 08:00:43 rgrimes Exp $ + * $Id: md_var.h,v 1.4 1995/09/03 05:43:25 julian Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -61,8 +61,8 @@ void doreti_popl_es __P((void)) __asm(__STRING(doreti_popl_es)); void doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault)); int fill_regs __P((struct proc *p, struct reg *regs)); int mvesp __P((void)); -void setconf __P((void)); void userconfig __P((void)); void vm_bounce_init __P((void)); +int vm_page_zero_idle __P((void)); #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h index 7d79d89..93cecf3 100644 --- a/sys/dev/eisa/eisaconf.h +++ b/sys/dev/eisa/eisaconf.h @@ -18,7 +18,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: eisaconf.h,v 1.4 1995/11/06 05:21:01 gibbs Exp $ + * $Id: eisaconf.h,v 1.5 1995/11/20 12:41:13 phk Exp $ */ #ifndef _I386_EISA_EISACONF_H_ @@ -72,6 +72,7 @@ struct eisa_device { struct kern_devconf* kdc; }; +void eisa_configure __P((void)); struct eisa_device *eisa_match_dev __P((struct eisa_device *, char * (*)(eisa_id_t))); void eisa_reg_start __P((struct eisa_device *)); diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 207a743..c405771 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcivar.h,v 1.5 1995/03/25 21:10:38 bde Exp $ +** $Id: pcivar.h,v 1.6 1995/05/30 08:13:12 rgrimes Exp $ ** ** Declarations for pci device drivers. ** @@ -238,17 +238,20 @@ int pci_map_port (pcici_t tag, u_long entry, u_short * pa); **----------------------------------------------------------------- */ +typedef int pci_inthand_t(void *arg); + struct pci_int_desc { struct pci_int_desc * pcid_next; pcici_t pcid_tag; - int (*pcid_handler)(); + pci_inthand_t *pcid_handler; void* pcid_argument; unsigned * pcid_maskptr; unsigned pcid_tally; unsigned pcid_mask; }; -int pci_map_int (pcici_t tag, int (*func)(), void* arg, unsigned * maskptr); +int pci_map_int (pcici_t tag, pci_inthand_t *func, void *arg, + unsigned *maskptr); int pci_unmap_int (pcici_t tag); diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index fa9e2c0..6841623 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.2 (Berkeley) 1/23/94 - * $Id: iso.h,v 1.7 1995/10/31 12:13:49 phk Exp $ + * $Id: iso.h,v 1.8 1995/11/09 08:13:35 bde Exp $ */ #define ISODCL(from, to) (to - from + 1) @@ -212,7 +212,7 @@ struct iso_mnt { #define iso_lblktodaddr(imp, lbn) btodb(iso_lblktosize(imp, lbn)) #define iso_dblkinc(imp, lbn) ((lbn) + iso_lblktodaddr(imp, 1)) #define iso_dblkno(imp, loc) iso_lblktodaddr(imp, iso_lblkno(imp, loc)) -int cd9660_init __P(()); +int cd9660_init __P((void)); struct iso_node; int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp)); @@ -225,6 +225,15 @@ int cd9660_mountroot __P((void)); extern vop_t **cd9660_vnodeop_p; +static int isonum_711 __P((unsigned char *p)); +static int isonum_712 __P((char *p)); +static int isonum_721 __P((unsigned char *p)); +static int isonum_722 __P((unsigned char *p)); +static int isonum_723 __P((unsigned char *p)); +static int isonum_731 __P((unsigned char *p)); +static int isonum_732 __P((unsigned char *p)); +static int isonum_733 __P((unsigned char *p)); + static inline int isonum_711(p) unsigned char *p; diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h index 5556626..a94b425 100644 --- a/sys/fs/fifofs/fifo.h +++ b/sys/fs/fifofs/fifo.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo.h 8.2 (Berkeley) 2/2/94 - * $Id: fifo.h,v 1.5 1995/03/16 18:13:13 bde Exp $ + * $Id: fifo.h,v 1.6 1995/11/09 08:15:25 bde Exp $ */ extern vop_t **fifo_vnodeop_p; @@ -39,9 +39,8 @@ extern vop_t **fifo_vnodeop_p; /* * Prototypes for fifo operations on vnodes. */ -int fifo_badop(), - fifo_ebadf(); - +int fifo_badop __P((void)); +int fifo_ebadf __P((void)); int fifo_printinfo __P((struct vnode *)); int fifo_lookup __P((struct vop_lookup_args *)); #define fifo_create ((int (*) __P((struct vop_create_args *)))fifo_badop) diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h index 7d79d89..93cecf3 100644 --- a/sys/i386/eisa/eisaconf.h +++ b/sys/i386/eisa/eisaconf.h @@ -18,7 +18,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: eisaconf.h,v 1.4 1995/11/06 05:21:01 gibbs Exp $ + * $Id: eisaconf.h,v 1.5 1995/11/20 12:41:13 phk Exp $ */ #ifndef _I386_EISA_EISACONF_H_ @@ -72,6 +72,7 @@ struct eisa_device { struct kern_devconf* kdc; }; +void eisa_configure __P((void)); struct eisa_device *eisa_match_dev __P((struct eisa_device *, char * (*)(eisa_id_t))); void eisa_reg_start __P((struct eisa_device *)); diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h index 868455b..7db76dc 100644 --- a/sys/i386/include/apm_bios.h +++ b/sys/i386/include/apm_bios.h @@ -12,7 +12,7 @@ * * Aug, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_bios.h,v 1.4 1995/02/17 02:22:45 phk Exp $ + * $Id: apm_bios.h,v 1.5 1995/05/30 08:00:23 rgrimes Exp $ */ #ifndef _MACHINE_APM_BIOS_H_ @@ -123,7 +123,7 @@ /* C definitions */ struct apmhook { struct apmhook *ah_next; - int (*ah_fun)(); + int (*ah_fun) __P((void *ah_arg)); void *ah_arg; const char *ah_name; int ah_order; diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index 2528d73..cf912f1 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: md_var.h,v 1.3 1995/05/30 08:00:43 rgrimes Exp $ + * $Id: md_var.h,v 1.4 1995/09/03 05:43:25 julian Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -61,8 +61,8 @@ void doreti_popl_es __P((void)) __asm(__STRING(doreti_popl_es)); void doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault)); int fill_regs __P((struct proc *p, struct reg *regs)); int mvesp __P((void)); -void setconf __P((void)); void userconfig __P((void)); void vm_bounce_init __P((void)); +int vm_page_zero_idle __P((void)); #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/i386/isa/atapi.h b/sys/i386/isa/atapi.h index f22a5a2..875a5c9 100644 --- a/sys/i386/isa/atapi.h +++ b/sys/i386/isa/atapi.h @@ -198,6 +198,9 @@ struct atapidrv { /* delayed attach info */ struct kern_devconf *parent; /* the devconf info pattern */ }; +struct wcd; +typedef void atapi_callback_t(struct wcd *, struct buf *, int, struct atapires); + struct atapicmd { /* ATAPI command block */ struct atapicmd *next; /* next command in queue */ int busy; /* busy flag */ @@ -205,7 +208,7 @@ struct atapicmd { /* ATAPI command block */ int unit; /* drive unit number */ int count; /* byte count, >0 - read, <0 - write */ char *addr; /* data to transfer */ - void (*callback) (); /* call when done */ + atapi_callback_t *callback; /* call when done */ void *cbarg1; /* callback arg 1 */ void *cbarg2; /* callback arg 1 */ struct atapires result; /* resulting error code */ @@ -260,7 +263,7 @@ void atapi_request_callback (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, - char *addr, int count, void (*done)(), void *x, void *y); + char *addr, int count, atapi_callback_t *done, void *x, void *y); struct atapires atapi_request_immediate (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, diff --git a/sys/i386/isa/pcvt/pcvt_kbd.h b/sys/i386/isa/pcvt/pcvt_kbd.h index 000a709..0deebf4 100644 --- a/sys/i386/isa/pcvt/pcvt_kbd.h +++ b/sys/i386/isa/pcvt/pcvt_kbd.h @@ -64,7 +64,7 @@ typedef struct union what { u_char *string; /* ptr to string, null terminated */ - void (*func)(); /* ptr to function */ + void (*func)(void); /* ptr to function */ } what; } entry; diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h index fa9e2c0..6841623 100644 --- a/sys/isofs/cd9660/iso.h +++ b/sys/isofs/cd9660/iso.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.2 (Berkeley) 1/23/94 - * $Id: iso.h,v 1.7 1995/10/31 12:13:49 phk Exp $ + * $Id: iso.h,v 1.8 1995/11/09 08:13:35 bde Exp $ */ #define ISODCL(from, to) (to - from + 1) @@ -212,7 +212,7 @@ struct iso_mnt { #define iso_lblktodaddr(imp, lbn) btodb(iso_lblktosize(imp, lbn)) #define iso_dblkinc(imp, lbn) ((lbn) + iso_lblktodaddr(imp, 1)) #define iso_dblkno(imp, loc) iso_lblktodaddr(imp, iso_lblkno(imp, loc)) -int cd9660_init __P(()); +int cd9660_init __P((void)); struct iso_node; int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp)); @@ -225,6 +225,15 @@ int cd9660_mountroot __P((void)); extern vop_t **cd9660_vnodeop_p; +static int isonum_711 __P((unsigned char *p)); +static int isonum_712 __P((char *p)); +static int isonum_721 __P((unsigned char *p)); +static int isonum_722 __P((unsigned char *p)); +static int isonum_723 __P((unsigned char *p)); +static int isonum_731 __P((unsigned char *p)); +static int isonum_732 __P((unsigned char *p)); +static int isonum_733 __P((unsigned char *p)); + static inline int isonum_711(p) unsigned char *p; diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h index 5556626..a94b425 100644 --- a/sys/miscfs/fifofs/fifo.h +++ b/sys/miscfs/fifofs/fifo.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo.h 8.2 (Berkeley) 2/2/94 - * $Id: fifo.h,v 1.5 1995/03/16 18:13:13 bde Exp $ + * $Id: fifo.h,v 1.6 1995/11/09 08:15:25 bde Exp $ */ extern vop_t **fifo_vnodeop_p; @@ -39,9 +39,8 @@ extern vop_t **fifo_vnodeop_p; /* * Prototypes for fifo operations on vnodes. */ -int fifo_badop(), - fifo_ebadf(); - +int fifo_badop __P((void)); +int fifo_ebadf __P((void)); int fifo_printinfo __P((struct vnode *)); int fifo_lookup __P((struct vop_lookup_args *)); #define fifo_create ((int (*) __P((struct vop_create_args *)))fifo_badop) diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h index 01a799b..c10bf89 100644 --- a/sys/miscfs/specfs/specdev.h +++ b/sys/miscfs/specfs/specdev.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)specdev.h 8.2 (Berkeley) 2/2/94 - * $Id: specdev.h,v 1.4 1995/10/23 02:22:51 dyson Exp $ + * $Id: specdev.h,v 1.5 1995/11/09 08:16:12 bde Exp $ */ /* @@ -81,9 +81,8 @@ struct flock; struct buf; struct uio; -int spec_badop(), - spec_ebadf(); - +int spec_badop __P((void)); +int spec_ebadf __P((void)); int spec_lookup __P((struct vop_lookup_args *)); #define spec_create ((int (*) __P((struct vop_create_args *)))spec_badop) #define spec_mknod ((int (*) __P((struct vop_mknod_args *)))spec_badop) diff --git a/sys/netccitt/pk.h b/sys/netccitt/pk.h index 50b9b09..799f4ff 100644 --- a/sys/netccitt/pk.h +++ b/sys/netccitt/pk.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)pk.h 8.1 (Berkeley) 6/10/93 - * $Id: pk.h,v 1.3 1994/08/21 05:44:09 paul Exp $ + * $Id: pk.h,v 1.4 1995/05/30 08:08:57 rgrimes Exp $ */ #ifndef _NETCCITT_PK_H_ @@ -146,7 +146,7 @@ struct data_packet { #define SET_LCN(xp, lcn) ((xp -> logical_channel_number = lcn), \ (X25SBITS(xp -> bits, lc_group_number, lcn > 255 ? lcn >> 8 : 0))) -struct mbuf *pk_template (); +struct mbuf *pk_template __P((int lcn, int type)); /* Define X.25 packet level states. */ diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h index ea0907d..86b8d36 100644 --- a/sys/netccitt/pk_var.h +++ b/sys/netccitt/pk_var.h @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_var.h 8.1 (Berkeley) 6/10/93 - * $Id: pk_var.h,v 1.5 1995/05/30 08:09:11 rgrimes Exp $ + * $Id: pk_var.h,v 1.6 1995/07/29 11:41:27 bde Exp $ */ #ifndef _NETCCITT_PK_VAR_H_ @@ -56,9 +56,11 @@ struct pklcd { struct pklcd_q *q_forw; /* debugging chain */ struct pklcd_q *q_back; /* debugging chain */ } lcd_q; - int (*lcd_upper)(); /* switch to socket vs datagram vs ...*/ + int (*lcd_upper) __P((struct pklcd *lcp, struct mbuf *m)); + /* switch to socket vs datagram vs ...*/ caddr_t lcd_upnext; /* reference for lcd_upper() */ - int (*lcd_send)(); /* if X.25 front end, direct connect */ + int (*lcd_send) __P((struct pklcd *lcp)); + /* if X.25 front end, direct connect */ caddr_t lcd_downnext; /* reference for lcd_send() */ short lcd_lcn; /* Logical channel number */ short lcd_state; /* Logical Channel state */ @@ -98,6 +100,8 @@ struct pklcd { struct sockbuf lcd_sb; /* alternate for datagram service */ }; +struct dll_ctlinfo; + /* * Per network information, allocated dynamically * when a new network is configured. @@ -110,8 +114,10 @@ struct pkcb { } pk_q; short pk_state; /* packet level status */ short pk_maxlcn; /* local copy of xc_maxlcn */ - int (*pk_lloutput) (); /* link level output procedure */ - caddr_t (*pk_llctlinput) (); /* link level ctloutput procedure */ + int (*pk_lloutput) __P((caddr_t, struct mbuf *, struct rtentry *)); + /* link level output procedure */ + caddr_t (*pk_llctlinput) __P((int, int, struct dll_ctlinfo *)); + /* link level ctloutput procedure */ caddr_t pk_llnext; /* handle for next level down */ struct x25config *pk_xcp; /* network specific configuration */ struct x25_ifaddr *pk_ia; /* backpointer to ifaddr */ @@ -143,7 +149,8 @@ struct x25_ifaddr { struct x25config ia_xc; /* network specific configuration */ struct pkcb *ia_pkcb; #define ia_maxlcn ia_xc.xc_maxlcn - int (*ia_start) (); /* connect, confirm method */ + int (*ia_start) __P((struct pklcd *lcp)); + /* connect, confirm method */ struct sockaddr_x25 ia_dstaddr; /* reserve space for route dst */ }; @@ -229,7 +236,7 @@ struct mbuf_cache { extern struct pkcb_q pkcb_q; extern struct pklcd *pk_listenhead; void ccittintr __P((void)); -struct pklcd *pk_attach(); +struct pklcd *pk_attach __P((struct socket *so)); extern char *pk_name[], *pk_state[]; extern int pk_t20, pk_t21, pk_t22, pk_t23; diff --git a/sys/netiso/iso.h b/sys/netiso/iso.h index 1ac1f13..f746964 100644 --- a/sys/netiso/iso.h +++ b/sys/netiso/iso.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.1 (Berkeley) 6/10/93 - * $Id: iso.h,v 1.3 1994/08/21 06:14:19 paul Exp $ + * $Id: iso.h,v 1.4 1995/05/30 08:10:49 rgrimes Exp $ */ #ifndef _NETISO_ISO_H_ @@ -63,7 +63,7 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/iso.h,v 1.3 1994/08/21 06:14:19 paul Exp $ */ +/* $Header: /home/ncvs/src/sys/netiso/iso.h,v 1.4 1995/05/30 08:10:49 rgrimes Exp $ */ /* $Source: /home/ncvs/src/sys/netiso/iso.h,v $ */ /* @@ -170,10 +170,11 @@ struct sockaddr_iso { #ifdef KERNEL -extern int iso_netmatch(); -extern int iso_hash(); -extern int iso_addrmatch(); -extern struct iso_ifaddr *iso_iaonnetof(); +struct afhash; + +int iso_netmatch __P((struct sockaddr_iso *sisoa, struct sockaddr_iso *sisob)); +int iso_hash __P((struct sockaddr_iso *siso, struct afhash *hp)); +int iso_addrmatch __P((struct sockaddr_iso *sisoa, struct sockaddr_iso *sisob)); extern struct domain isodomain; extern struct protosw isosw[]; diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h index b874995..537cb90 100644 --- a/sys/netiso/iso_var.h +++ b/sys/netiso/iso_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_var.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_var.h,v 1.4 1995/03/16 18:15:21 bde Exp $ + * $Id: iso_var.h,v 1.5 1995/05/30 08:11:01 rgrimes Exp $ */ #ifndef _NETISO_ISO_VAR_H_ @@ -63,7 +63,7 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.4 1995/03/16 18:15:21 bde Exp $ +/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.5 1995/05/30 08:11:01 rgrimes Exp $ * $Source: /home/ncvs/src/sys/netiso/iso_var.h,v $ */ @@ -136,7 +136,8 @@ struct snpa_hdr { }; #ifdef KERNEL struct iso_ifaddr *iso_ifaddr; /* linked list of iso address ifaces */ -struct iso_ifaddr *iso_localifa(); /* linked list of iso address ifaces */ +struct iso_ifaddr *iso_localifa __P((struct sockaddr_iso *siso)); + /* linked list of iso address ifaces */ void clnlintr __P((void)); struct ifqueue clnlintrq; /* clnl packet input queue */ #endif /* KERNEL */ diff --git a/sys/netns/ns.h b/sys/netns/ns.h index c737600..87e849d 100644 --- a/sys/netns/ns.h +++ b/sys/netns/ns.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns.h 8.1 (Berkeley) 6/10/93 - * $Id: ns.h,v 1.4 1995/07/29 11:41:49 bde Exp $ + * $Id: ns.h,v 1.5 1995/10/26 20:31:44 julian Exp $ */ #ifndef _NETNS_NS_H_ @@ -142,7 +142,8 @@ extern union ns_host ns_zerohost; extern union ns_host ns_broadhost; extern union ns_net ns_zeronet; extern union ns_net ns_broadnet; -u_short ns_cksum(); + +u_short ns_cksum __P((struct mbuf *m, int len)); #else #include <sys/cdefs.h> diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h index b6d99e8..428edd6 100644 --- a/sys/netns/ns_if.h +++ b/sys/netns/ns_if.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_if.h 8.1 (Berkeley) 6/10/93 - * $Id: ns_if.h,v 1.4 1995/03/16 18:15:27 bde Exp $ + * $Id: ns_if.h,v 1.5 1995/07/29 11:41:52 bde Exp $ */ #ifndef _NETNS_NS_IF_H_ @@ -80,10 +80,12 @@ struct nsip_req { #endif #ifdef KERNEL +int idpip_input __P((struct mbuf *m, struct ifnet *ifp)); extern struct ns_ifaddr *ns_ifaddr; -struct ns_ifaddr *ns_iaonnetof(); +struct ns_ifaddr *ns_iaonnetof __P((struct ns_addr *dst)); void nsintr __P((void)); extern struct ifqueue nsintrq; /* XNS input packet queue */ +int nsip_ctlinput __P((int cmd, struct sockaddr *sa)); #endif #endif diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index 41963db..3e31610 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nfs.h,v 1.12 1995/10/29 15:32:43 phk Exp $ + * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $ */ #ifndef _NFS_NFS_H_ @@ -487,6 +487,7 @@ int nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int)); int nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *)); int nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *)); int nfs_sndlock __P((int *,struct nfsreq *)); +void nfs_sndunlock __P((int *flagp)); int nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *)); int nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int)); int nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *)); @@ -511,6 +512,7 @@ void nfsm_adj __P((struct mbuf *,int,int)); int nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *)); void nfsrv_initcache __P((void)); int nfs_rcvlock __P((struct nfsreq *)); +void nfs_rcvunlock __P((int *flagp)); int nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T)); int nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int)); int nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *)); @@ -523,6 +525,7 @@ u_long nfs_hash __P((nfsfh_t *,int)); int nfssvc_iod __P((struct proc *)); int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *)); int nfssvc_addsock __P((struct file *,struct mbuf *)); +void nfsrv_slpderef __P((struct nfssvc_sock *slp)); int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **)); int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **)); void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *)); diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h index 6ac33f7..5bfcab0 100644 --- a/sys/nfs/nfsmount.h +++ b/sys/nfs/nfsmount.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsmount.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsmount.h,v 1.4 1994/10/17 17:47:43 phk Exp $ + * $Id: nfsmount.h,v 1.5 1995/06/27 11:06:56 dfr Exp $ */ #ifndef _NFS_NFSMOUNT_H_ @@ -136,6 +136,6 @@ int nfs_fhtovp __P(( int nfs_vptofh __P(( struct vnode *vp, struct fid *fhp)); -int nfs_init __P(()); +int nfs_init __P((void)); #endif diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h index 3861ac6..58fdc4c 100644 --- a/sys/nfs/nqnfs.h +++ b/sys/nfs/nqnfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nqnfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nqnfs.h,v 1.7 1995/06/27 11:07:01 dfr Exp $ + * $Id: nqnfs.h,v 1.8 1995/07/29 11:42:23 bde Exp $ */ #ifndef _NFS_NQNFS_H_ @@ -205,6 +205,11 @@ int nqsrv_getlease __P((struct vnode *,u_long *,int,struct nfssvc_sock *,struct int nqnfs_getlease __P((struct vnode *,int,struct ucred *,struct proc *)); int nqnfs_callback __P((struct nfsmount *,struct mbuf *,struct mbuf *,caddr_t)); int nqnfs_clientd __P((struct nfsmount *,struct ucred *,struct nfsd_cargs *,int,caddr_t,struct proc *)); +struct nfsnode; +void nqnfs_clientlease __P((struct nfsmount *, struct nfsnode *, int, int, time_t, u_quad_t)); +void nqnfs_serverd __P((void)); +int nqnfsrv_getlease __P((struct nfsrv_descript *, struct nfssvc_sock *, struct proc *, struct mbuf **)); +int nqnfsrv_vacated __P((struct nfsrv_descript *, struct nfssvc_sock *, struct proc *, struct mbuf **)); #endif #endif diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h index 41963db..3e31610 100644 --- a/sys/nfsclient/nfs.h +++ b/sys/nfsclient/nfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nfs.h,v 1.12 1995/10/29 15:32:43 phk Exp $ + * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $ */ #ifndef _NFS_NFS_H_ @@ -487,6 +487,7 @@ int nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int)); int nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *)); int nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *)); int nfs_sndlock __P((int *,struct nfsreq *)); +void nfs_sndunlock __P((int *flagp)); int nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *)); int nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int)); int nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *)); @@ -511,6 +512,7 @@ void nfsm_adj __P((struct mbuf *,int,int)); int nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *)); void nfsrv_initcache __P((void)); int nfs_rcvlock __P((struct nfsreq *)); +void nfs_rcvunlock __P((int *flagp)); int nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T)); int nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int)); int nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *)); @@ -523,6 +525,7 @@ u_long nfs_hash __P((nfsfh_t *,int)); int nfssvc_iod __P((struct proc *)); int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *)); int nfssvc_addsock __P((struct file *,struct mbuf *)); +void nfsrv_slpderef __P((struct nfssvc_sock *slp)); int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **)); int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **)); void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *)); diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h index 41963db..3e31610 100644 --- a/sys/nfsclient/nfsargs.h +++ b/sys/nfsclient/nfsargs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nfs.h,v 1.12 1995/10/29 15:32:43 phk Exp $ + * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $ */ #ifndef _NFS_NFS_H_ @@ -487,6 +487,7 @@ int nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int)); int nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *)); int nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *)); int nfs_sndlock __P((int *,struct nfsreq *)); +void nfs_sndunlock __P((int *flagp)); int nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *)); int nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int)); int nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *)); @@ -511,6 +512,7 @@ void nfsm_adj __P((struct mbuf *,int,int)); int nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *)); void nfsrv_initcache __P((void)); int nfs_rcvlock __P((struct nfsreq *)); +void nfs_rcvunlock __P((int *flagp)); int nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T)); int nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int)); int nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *)); @@ -523,6 +525,7 @@ u_long nfs_hash __P((nfsfh_t *,int)); int nfssvc_iod __P((struct proc *)); int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *)); int nfssvc_addsock __P((struct file *,struct mbuf *)); +void nfsrv_slpderef __P((struct nfssvc_sock *slp)); int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **)); int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **)); void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *)); diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h index 6ac33f7..5bfcab0 100644 --- a/sys/nfsclient/nfsmount.h +++ b/sys/nfsclient/nfsmount.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsmount.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsmount.h,v 1.4 1994/10/17 17:47:43 phk Exp $ + * $Id: nfsmount.h,v 1.5 1995/06/27 11:06:56 dfr Exp $ */ #ifndef _NFS_NFSMOUNT_H_ @@ -136,6 +136,6 @@ int nfs_fhtovp __P(( int nfs_vptofh __P(( struct vnode *vp, struct fid *fhp)); -int nfs_init __P(()); +int nfs_init __P((void)); #endif diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h index 41963db..3e31610 100644 --- a/sys/nfsclient/nfsstats.h +++ b/sys/nfsclient/nfsstats.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nfs.h,v 1.12 1995/10/29 15:32:43 phk Exp $ + * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $ */ #ifndef _NFS_NFS_H_ @@ -487,6 +487,7 @@ int nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int)); int nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *)); int nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *)); int nfs_sndlock __P((int *,struct nfsreq *)); +void nfs_sndunlock __P((int *flagp)); int nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *)); int nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int)); int nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *)); @@ -511,6 +512,7 @@ void nfsm_adj __P((struct mbuf *,int,int)); int nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *)); void nfsrv_initcache __P((void)); int nfs_rcvlock __P((struct nfsreq *)); +void nfs_rcvunlock __P((int *flagp)); int nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T)); int nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int)); int nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *)); @@ -523,6 +525,7 @@ u_long nfs_hash __P((nfsfh_t *,int)); int nfssvc_iod __P((struct proc *)); int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *)); int nfssvc_addsock __P((struct file *,struct mbuf *)); +void nfsrv_slpderef __P((struct nfssvc_sock *slp)); int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **)); int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **)); void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *)); diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h index 41963db..3e31610 100644 --- a/sys/nfsserver/nfs.h +++ b/sys/nfsserver/nfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nfs.h,v 1.12 1995/10/29 15:32:43 phk Exp $ + * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $ */ #ifndef _NFS_NFS_H_ @@ -487,6 +487,7 @@ int nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int)); int nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *)); int nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *)); int nfs_sndlock __P((int *,struct nfsreq *)); +void nfs_sndunlock __P((int *flagp)); int nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *)); int nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int)); int nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *)); @@ -511,6 +512,7 @@ void nfsm_adj __P((struct mbuf *,int,int)); int nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *)); void nfsrv_initcache __P((void)); int nfs_rcvlock __P((struct nfsreq *)); +void nfs_rcvunlock __P((int *flagp)); int nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T)); int nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int)); int nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *)); @@ -523,6 +525,7 @@ u_long nfs_hash __P((nfsfh_t *,int)); int nfssvc_iod __P((struct proc *)); int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *)); int nfssvc_addsock __P((struct file *,struct mbuf *)); +void nfsrv_slpderef __P((struct nfssvc_sock *slp)); int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **)); int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **)); void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *)); diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h index 41963db..3e31610 100644 --- a/sys/nfsserver/nfsrvstats.h +++ b/sys/nfsserver/nfsrvstats.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nfs.h,v 1.12 1995/10/29 15:32:43 phk Exp $ + * $Id: nfs.h,v 1.13 1995/10/31 21:17:59 joerg Exp $ */ #ifndef _NFS_NFS_H_ @@ -487,6 +487,7 @@ int nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int)); int nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *)); int nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *)); int nfs_sndlock __P((int *,struct nfsreq *)); +void nfs_sndunlock __P((int *flagp)); int nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *)); int nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int)); int nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *)); @@ -511,6 +512,7 @@ void nfsm_adj __P((struct mbuf *,int,int)); int nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *)); void nfsrv_initcache __P((void)); int nfs_rcvlock __P((struct nfsreq *)); +void nfs_rcvunlock __P((int *flagp)); int nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T)); int nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int)); int nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *)); @@ -523,6 +525,7 @@ u_long nfs_hash __P((nfsfh_t *,int)); int nfssvc_iod __P((struct proc *)); int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct proc *)); int nfssvc_addsock __P((struct file *,struct mbuf *)); +void nfsrv_slpderef __P((struct nfssvc_sock *slp)); int nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **)); int nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **)); void nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *)); diff --git a/sys/pc98/pc98/atapi.h b/sys/pc98/pc98/atapi.h index f22a5a2..875a5c9 100644 --- a/sys/pc98/pc98/atapi.h +++ b/sys/pc98/pc98/atapi.h @@ -198,6 +198,9 @@ struct atapidrv { /* delayed attach info */ struct kern_devconf *parent; /* the devconf info pattern */ }; +struct wcd; +typedef void atapi_callback_t(struct wcd *, struct buf *, int, struct atapires); + struct atapicmd { /* ATAPI command block */ struct atapicmd *next; /* next command in queue */ int busy; /* busy flag */ @@ -205,7 +208,7 @@ struct atapicmd { /* ATAPI command block */ int unit; /* drive unit number */ int count; /* byte count, >0 - read, <0 - write */ char *addr; /* data to transfer */ - void (*callback) (); /* call when done */ + atapi_callback_t *callback; /* call when done */ void *cbarg1; /* callback arg 1 */ void *cbarg2; /* callback arg 1 */ struct atapires result; /* resulting error code */ @@ -260,7 +263,7 @@ void atapi_request_callback (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, - char *addr, int count, void (*done)(), void *x, void *y); + char *addr, int count, atapi_callback_t *done, void *x, void *y); struct atapires atapi_request_immediate (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h index 51c7cb9..a6d7618 100644 --- a/sys/pccard/slot.h +++ b/sys/pccard/slot.h @@ -36,14 +36,22 @@ /* * Controller data - Specific to each slot controller. */ +struct slot; struct slot_ctrl { - int (*mapmem)(); /* Map memory */ - int (*mapio)(); /* Map io */ - void (*reset)(); /* init */ - void (*disable)(); /* Disable slot */ - int (*power)(); /* Set power values */ - int (*ioctl)(); /* ioctl to lower level */ - void (*mapirq)(); /* Map interrupt number */ + int (*mapmem) __P((struct slot *, int)); + /* Map memory */ + int (*mapio) __P((struct slot *, int)); + /* Map io */ + void (*reset) __P((void *)); + /* init */ + void (*disable) __P((struct slot *)); + /* Disable slot */ + int (*power) __P((struct slot *)); + /* Set power values */ + int (*ioctl) __P((struct slot *, int, caddr_t)); + /* ioctl to lower level */ + void (*mapirq) __P((struct slot *, int)); + /* Map interrupt number */ int extra; /* Controller specific size */ int maxmem; /* Number of allowed memory windows */ int maxio; /* Number of allowed I/O windows */ @@ -124,5 +132,3 @@ enum card_event { card_removed, card_inserted }; struct slot *pccard_alloc_slot(struct slot_ctrl *); void pccard_event(struct slot *, enum card_event); void pccard_remove_controller(struct slot_ctrl *); -int pccard_alloc_intr(); -void pccard_add_driver(struct pccard_drv *); diff --git a/sys/pci/pcibus.h b/sys/pci/pcibus.h index 842d97c..690ccbd 100644 --- a/sys/pci/pcibus.h +++ b/sys/pci/pcibus.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.h,v 1.1 1995/02/01 22:56:47 se Exp $ +** $Id: pcibus.h,v 1.2 1995/03/21 23:01:03 se Exp $ ** ** Declarations for pci bus driver. ** @@ -80,8 +80,9 @@ struct pcibus { u_long (*pb_read ) (pcici_t tag, u_long reg); void (*pb_write ) (pcici_t tag, u_long reg, u_long data); unsigned pb_maxirq; - int (*pb_iattach) (int irq, void(*func)(), int arg, unsigned*maskp); - int (*pb_idetach) (int irq, void(*func)()); + int (*pb_iattach) (int irq, inthand2_t *func, int arg, + unsigned *maskptr); + int (*pb_idetach) (int irq, inthand2_t *func); int (*pb_imaskinc)(int irq, unsigned *maskptr); int (*pb_imaskexc)(int irq, unsigned *maskptr); }; diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h index 207a743..c405771 100644 --- a/sys/pci/pcivar.h +++ b/sys/pci/pcivar.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcivar.h,v 1.5 1995/03/25 21:10:38 bde Exp $ +** $Id: pcivar.h,v 1.6 1995/05/30 08:13:12 rgrimes Exp $ ** ** Declarations for pci device drivers. ** @@ -238,17 +238,20 @@ int pci_map_port (pcici_t tag, u_long entry, u_short * pa); **----------------------------------------------------------------- */ +typedef int pci_inthand_t(void *arg); + struct pci_int_desc { struct pci_int_desc * pcid_next; pcici_t pcid_tag; - int (*pcid_handler)(); + pci_inthand_t *pcid_handler; void* pcid_argument; unsigned * pcid_maskptr; unsigned pcid_tally; unsigned pcid_mask; }; -int pci_map_int (pcici_t tag, int (*func)(), void* arg, unsigned * maskptr); +int pci_map_int (pcici_t tag, pci_inthand_t *func, void *arg, + unsigned *maskptr); int pci_unmap_int (pcici_t tag); diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index a88c80b..c0c09f4 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsiconf.h,v 1.29 1995/10/21 23:13:07 phk Exp $ + * $Id: scsiconf.h,v 1.30 1995/11/20 12:42:31 phk Exp $ */ #ifndef SCSI_SCSICONF_H #define SCSI_SCSICONF_H 1 @@ -60,6 +60,8 @@ typedef unsigned char u_int8; * scsi system to find the associated other parts. */ +struct buf; +struct scsi_xfer; /* * These entrypoints are called by the high-end drivers to get services from @@ -68,11 +70,11 @@ typedef unsigned char u_int8; */ struct scsi_adapter { -/* 04*/ int32 (*scsi_cmd)(); -/* 08*/ void (*scsi_minphys)(); -/* 12*/ int32 (*open_target_lu)(); -/* 16*/ int32 (*close_target_lu)(); -/* 20*/ u_int32 (*adapter_info)(); /* see definitions below */ +/* 04*/ int32 (*scsi_cmd) __P((struct scsi_xfer *xs)); +/* 08*/ void (*scsi_minphys) __P((struct buf *bp)); +/* 12*/ int32 (*open_target_lu) __P((void)); +/* 16*/ int32 (*close_target_lu) __P((void)); +/* 20*/ u_int32 (*adapter_info) __P((int unit)); /* see definitions below */ /* 24*/ char *name; /* name of scsi bus controller */ /* 32*/ u_long spare[2]; }; @@ -104,10 +106,8 @@ struct scsi_adapter */ struct scsi_data; struct scsi_link; /* scsi_link refers to scsi_device and vice-versa */ -struct scsi_xfer; struct proc; -struct buf; /* * These entry points are called by the low-end drivers to get services from @@ -120,13 +120,18 @@ struct buf; * instance down in the adapter drivers is removed. */ +/* + * XXX <devconf.h> already includes too much; avoid including <conf.h>. + */ +typedef int yet_another_d_open_t __P((dev_t, int, int, struct proc *)); + struct scsi_device { /* 4*/ errval (*err_handler)(struct scsi_xfer *xs); /* return -1 to say * err processing complete */ /* 8*/ void (*start)(u_int32 unit, u_int32 flags); -/* 12*/ int32 (*async)(); -/* 16*/ int32 (*done)(); /* returns -1 to say done processing complete */ +/* 12*/ int32 (*async) __P((void)); +/* 16*/ int32 (*done) __P((struct scsi_xfer *xs)); /* returns -1 to say done processing complete */ /* 20*/ char *name; /* name of device type */ /* 24*/ u_int32 flags; /* device type dependent flags */ /* 32*/ int32 spare[2]; @@ -134,7 +139,7 @@ struct scsi_device /* 36*/ int32 link_flags; /* Flags OR'd into sc_link at attach time */ /* 40*/ errval (*attach)(struct scsi_link *sc_link); /* 44*/ char *desc; /* Description of device */ -/* 48*/ int (*open)(dev_t dev, int flags, int fmt, struct proc *p); +/* 48*/ yet_another_d_open_t *open; /* 52*/ int sizeof_scsi_data; /* 56*/ int type; /* Type of device this supports */ /* 60*/ int (*getunit)(dev_t dev); @@ -168,6 +173,8 @@ struct scsi_device /* SCSI_DEVICE_ENTRIES: A macro to generate all the entry points from the * name. + * XXX as usual, the extern prototypes belong in a header so that they are + * visible to callers. */ #define SCSI_DEVICE_ENTRIES(NAME) \ static errval NAME##attach(struct scsi_link *sc_link); \ @@ -424,7 +431,7 @@ errval scsi_change_def( struct scsi_link *sc_link, u_int32 flags); errval scsi_inquire( struct scsi_link *sc_link, struct scsi_inquiry_data *inqbuf, u_int32 flags); errval scsi_prevent( struct scsi_link *sc_link, u_int32 type,u_int32 flags); -struct scsibus_data *scsi_alloc_bus (); +struct scsibus_data *scsi_alloc_bus __P((void)); errval scsi_probe_bus __P((int, int, int)); errval scsi_probe_busses __P(( int, int, int)); errval scsi_start_unit( struct scsi_link *sc_link, u_int32 flags); @@ -474,6 +481,8 @@ extern struct kern_devconf kdc_scbus0; /* XXX should go away */ void scsi_configure_start __P((void)); void scsi_configure_finish __P((void)); +void ukinit __P((void)); + #endif /* KERNEL */ #define SCSI_EXTERNALLEN (sizeof(struct scsi_link)) diff --git a/sys/sys/device.h b/sys/sys/device.h index 188564e..3caaf19 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -40,7 +40,7 @@ * SUCH DAMAGE. * * @(#)device.h 8.2 (Berkeley) 2/17/94 - * $Id: device.h,v 1.2 1994/08/02 07:52:45 davidg Exp $ + * $Id: device.h,v 1.3 1995/07/29 11:42:44 bde Exp $ */ #ifndef _SYS_DEVICE_H_ @@ -86,7 +86,8 @@ struct cfdata { int *cf_loc; /* locators (machine dependent) */ int cf_flags; /* flags from config */ short *cf_parents; /* potential parents */ - void (**cf_ivstubs)(); /* config-generated vectors, if any */ + void (**cf_ivstubs) __P((void)); + /* config-generated vectors, if any */ }; #define FSTATE_NOTFOUND 0 /* has not been found */ #define FSTATE_FOUND 1 /* has been found */ diff --git a/sys/sys/domain.h b/sys/sys/domain.h index 323f1e7..5fd686c 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)domain.h 8.1 (Berkeley) 6/2/93 - * $Id: domain.h,v 1.5 1995/05/15 22:55:18 davidg Exp $ + * $Id: domain.h,v 1.6 1995/08/16 16:14:02 bde Exp $ */ #ifndef _SYS_DOMAIN_H_ @@ -53,7 +53,7 @@ struct domain { __P((void)); int (*dom_externalize) /* externalize access rights */ __P((struct mbuf *)); - int (*dom_dispose) /* dispose of internalized rights */ + void (*dom_dispose) /* dispose of internalized rights */ __P((struct mbuf *)); struct protosw *dom_protosw, *dom_protoswNPROTOSW; struct domain *dom_next; diff --git a/sys/sys/lkm.h b/sys/sys/lkm.h index fb4f57d..6bc2543 100644 --- a/sys/sys/lkm.h +++ b/sys/sys/lkm.h @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lkm.h,v 1.8 1995/11/13 07:18:12 bde Exp $ + * $Id: lkm.h,v 1.9 1995/11/14 07:35:57 bde Exp $ */ #ifndef _SYS_LKM_H_ @@ -198,7 +198,8 @@ struct lkm_table { int depcnt; /* dependency count (INIT) */ int id; /* identifier (INIT) */ - int (*entry)(); /* entry function */ + int (*entry) __P((struct lkm_table *, int, int)); + /* entry function */ union lkm_generic private; /* module private data */ }; diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index b1d98e8..ffa53be 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.3 (Berkeley) 1/21/94 - * $Id: mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp $ + * $Id: mbuf.h,v 1.10 1995/07/29 11:42:46 bde Exp $ */ #ifndef _SYS_MBUF_H_ @@ -387,7 +387,7 @@ void m_adj __P((struct mbuf *,int)); struct mbuf *m_pullup __P((struct mbuf *, int)); struct mbuf *m_split __P((struct mbuf *,int,int)); struct mbuf *m_devget __P((char *, int, int, struct ifnet *, - void (*copy)(struct mbuf *, caddr_t, u_int))); + void (*copy)(char *, caddr_t, u_int))); #ifdef MBTYPES int mbtypes[] = { /* XXX */ diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index 73658f9..547321f 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -31,12 +31,17 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $Id: protosw.h,v 1.6 1995/02/07 02:01:57 wollman Exp $ + * $Id: protosw.h,v 1.7 1995/11/20 12:27:00 phk Exp $ */ #ifndef _SYS_PROTOSW_H_ #define _SYS_PROTOSW_H_ +struct mbuf; +struct sockaddr; +struct socket; +struct sockproto; + /* * Protocol switch table. * @@ -64,39 +69,28 @@ struct protosw { struct domain *pr_domain; /* domain protocol a member of */ short pr_protocol; /* protocol number */ short pr_flags; /* see below */ - /* protocol-protocol hooks */ - - /* input to protocol (from below) */ - void (*pr_input)(); - - /* output to protocol (from above) */ - int (*pr_output)(); - - /* control input (from below) */ - void (*pr_ctlinput)(); - - /* control output (from above) */ - int (*pr_ctloutput)(); - + void (*pr_input) __P((struct mbuf *, int len)); + /* input to protocol (from below) */ + int (*pr_output) __P((struct mbuf *m, struct socket *so)); + /* output to protocol (from above) */ + void (*pr_ctlinput)__P((int, struct sockaddr *, caddr_t)); + /* control input (from below) */ + int (*pr_ctloutput)__P((int, struct socket *, int, int, + struct mbuf **)); + /* control output (from above) */ /* user-protocol hook */ - - /* user request: see list below */ - int (*pr_usrreq)(); - + int (*pr_usrreq) __P((struct socket *, int, struct mbuf *, + struct mbuf *, struct mbuf *)); + /* user request: see list below */ /* utility hooks */ - - /* initialization hook */ - void (*pr_init)(void); - - /* fast timeout (200ms) */ - void (*pr_fasttimo)(void); - - /* slow timeout (500ms) */ - void (*pr_slowtimo)(void); - - /* flush any excess space possible */ - void (*pr_drain)(void); + void (*pr_init) __P((void)); /* initialization hook */ + void (*pr_fasttimo) __P((void)); + /* fast timeout (200ms) */ + void (*pr_slowtimo) __P((void)); + /* slow timeout (500ms) */ + void (*pr_drain) __P((void)); + /* flush any excess space possible */ }; #define PR_SLOWHZ 2 /* 2 slow timeouts per second */ @@ -236,8 +230,8 @@ char *prcorequests[] = { #endif #ifdef KERNEL -struct protosw *pffindproto(int family, int protocol, int type); -struct protosw *pffindtype(int family, int type); +struct protosw *pffindproto __P((int family, int protocol, int type)); +struct protosw *pffindtype __P((int family, int type)); #endif #endif diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 9ac9dfa..56ccddd 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.1 (Berkeley) 6/2/93 - * $Id: socketvar.h,v 1.5 1994/10/02 17:24:57 phk Exp $ + * $Id: socketvar.h,v 1.6 1995/05/30 08:14:33 rgrimes Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -227,6 +227,7 @@ int sbappendaddr __P((struct sockbuf *, struct sockaddr *, struct mbuf *, struct void sbdroprecord __P((struct sockbuf *)); void sbcompress __P((struct sockbuf *, struct mbuf *, struct mbuf *)); void sbflush __P((struct sockbuf *)); +void sbinsertoob __P((struct sockbuf *, struct mbuf *)); int sbreserve __P((struct sockbuf *,u_long)); int soreserve __P((struct socket *,u_long,u_long)); int sb_lock __P((struct sockbuf *)); diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index e87f329..7c44d5b 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -30,13 +30,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sysent.h,v 1.4 1995/03/16 18:16:29 bde Exp $ + * $Id: sysent.h,v 1.5 1995/09/19 13:31:04 bde Exp $ */ #ifndef _SYS_SYSENT_H_ #define _SYS_SYSENT_H_ 1 -typedef int sy_call_t __P((/* struct proc *, bogusly_various *, int * */)); +typedef int sy_call_t __P((struct proc *, void *, int *)); struct sysent { /* system call table */ int sy_narg; /* number of arguments */ diff --git a/sys/sys/un.h b/sys/sys/un.h index b85714b..6e63fe0 100644 --- a/sys/sys/un.h +++ b/sys/sys/un.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)un.h 8.1 (Berkeley) 6/2/93 - * $Id: un.h,v 1.5 1994/10/02 17:25:03 phk Exp $ + * $Id: un.h,v 1.6 1995/05/30 08:14:48 rgrimes Exp $ */ #ifndef _SYS_UN_H_ @@ -51,18 +51,22 @@ struct sockaddr_un { }; #ifdef KERNEL +int uipc_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *, + struct mbuf *)); int unp_connect2 __P((struct socket*,struct socket*)); void unp_detach __P((struct unpcb *)); void unp_disconnect __P((struct unpcb *)); void unp_shutdown __P((struct unpcb *)); void unp_drop __P((struct unpcb *, int)); void unp_gc __P((void)); +void unp_dispose __P((struct mbuf *)); void unp_scan __P((struct mbuf *, void (*)(struct file *))); void unp_mark __P((struct file *)); void unp_discard __P((struct file *)); int unp_attach __P((struct socket *)); int unp_bind __P((struct unpcb *,struct mbuf *, struct proc *)); int unp_connect __P((struct socket *,struct mbuf *, struct proc *)); +int unp_externalize __P((struct mbuf *)); int unp_internalize __P((struct mbuf *, struct proc *)); #else /* KERNEL */ /* actual length of an initialized sockaddr_un */ diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index 33ffa73..94263d9 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_extern.h 8.3 (Berkeley) 4/16/94 - * $Id: ufs_extern.h,v 1.7 1995/03/28 07:58:17 bde Exp $ + * $Id: ufs_extern.h,v 1.8 1995/09/04 01:13:42 dyson Exp $ */ #ifndef _UFS_UFS_EXTERN_H_ @@ -59,7 +59,6 @@ int ufs_advlock __P((struct vop_advlock_args *)); int ufs_bmap __P((struct vop_bmap_args *)); int ufs_bmaparray __P((struct vnode *, daddr_t, daddr_t *, struct indir *, int *, int *, int *)); - int ufs_check_export __P((struct mount *, struct ufid *, struct mbuf *, struct vnode **, int *exflagsp, struct ucred **)); int ufs_checkpath __P((struct inode *, struct inode *, struct ucred *)); @@ -109,8 +108,7 @@ int ufs_start __P((struct mount *, int, struct proc *)); int ufs_strategy __P((struct vop_strategy_args *)); int ufs_symlink __P((struct vop_symlink_args *)); int ufs_unlock __P((struct vop_unlock_args *)); -int ufs_vinit __P((struct mount *, - int (**)(), int (**)(), struct vnode **)); +int ufs_vinit __P((struct mount *, vop_t **, vop_t **, struct vnode **)); int ufsspec_close __P((struct vop_close_args *)); int ufsspec_read __P((struct vop_read_args *)); int ufsspec_write __P((struct vop_write_args *)); diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h index 3210cc0..f17720b 100644 --- a/sys/vm/vm_pageout.h +++ b/sys/vm/vm_pageout.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pageout.h,v 1.15 1995/11/05 20:46:03 dyson Exp $ + * $Id: vm_pageout.h,v 1.16 1995/11/20 12:19:22 phk Exp $ */ #ifndef _VM_VM_PAGEOUT_H_ @@ -91,6 +91,7 @@ extern int vm_pageout_pages_needed; * Signal pageout-daemon and wait for it. */ +static void pagedaemon_wakeup __P((void)); static inline void pagedaemon_wakeup() { @@ -102,6 +103,7 @@ pagedaemon_wakeup() #define VM_WAIT vm_wait() +static void vm_wait __P((void)); static inline void vm_wait() { |