diff options
35 files changed, 330 insertions, 237 deletions
diff --git a/sys/altq/altq_var.h b/sys/altq/altq_var.h index a10764dde84..b6685a21d32 100644 --- a/sys/altq/altq_var.h +++ b/sys/altq/altq_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_var.h,v 1.3 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: altq_var.h,v 1.4 2002/03/15 01:20:03 millert Exp $ */ /* $KAME: altq_var.h,v 1.8 2001/02/09 09:44:41 kjc Exp $ */ /* @@ -211,7 +211,7 @@ struct callout { /* dummy callout structure */ struct callout { void *c_arg; /* function argument */ - void (*c_func)(void *);/* functiuon to call */ + void (*c_func)(void *); /* function to call */ }; #define CALLOUT_INIT(c) do { bzero((c), sizeof(*(c))); } while (0) #define CALLOUT_RESET(c,t,f,a) do { (c)->c_arg = (a); \ diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c index b458a76d0ac..bfba120fca3 100644 --- a/sys/arch/alpha/tc/scc.c +++ b/sys/arch/alpha/tc/scc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scc.c,v 1.13 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: scc.c,v 1.14 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: scc.c,v 1.28 1996/12/05 01:39:43 cgd Exp $ */ /* @@ -115,8 +115,8 @@ #define SCCLINE(dev) (minor(dev) & 0x1) /* QVSS-compatible in-kernel X input event parser, pointer tracker */ -void (*sccDivertXInput)(int cc); /* X windows keyboard input routine */ -void (*sccMouseEvent)(int); /* X windows mouse motion event routine */ +void (*sccDivertXInput)(int cc); /* X windows keyboard input routine */ +void (*sccMouseEvent)(int); /* X windows mouse motion event routine */ void (*sccMouseButtons)(int); /* X windows mouse buttons event routine */ #ifdef DEBUG int debugChar; diff --git a/sys/arch/alpha/tc/tcdsvar.h b/sys/arch/alpha/tc/tcdsvar.h index d9de6cf829c..5c73d575a94 100644 --- a/sys/arch/alpha/tc/tcdsvar.h +++ b/sys/arch/alpha/tc/tcdsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcdsvar.h,v 1.7 2002/03/14 03:15:51 millert Exp $ */ +/* $OpenBSD: tcdsvar.h,v 1.8 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: tcdsvar.h,v 1.5 1996/11/13 21:13:38 cgd Exp $ */ /* @@ -35,7 +35,7 @@ struct tcds_slotconfig { int sc_slot; struct tcds_softc *sc_tcds; /* to frob TCDS regs */ struct esp_softc *sc_esp; /* to frob child's regs */ - int (*sc_intrhand)(void *); /* intr. handler */ + int (*sc_intrhand)(void *); /* intr. handler */ void *sc_intrarg; /* intr. handler arg. */ /* diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c index 6a49c7fbae6..d12e5dc52c0 100644 --- a/sys/arch/amiga/amiga/swapgeneric.c +++ b/sys/arch/amiga/amiga/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.14 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.15 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.27 1997/01/26 22:58:32 rat Exp $ */ /* @@ -110,7 +110,7 @@ struct genericconf genericconf[] = { { 0 }, }; -struct genericconf * getgenconf(char *); +struct genericconf *getgenconf(char *); struct genericconf * getgenconf(bp) diff --git a/sys/arch/amiga/dev/sfasvar.h b/sys/arch/amiga/dev/sfasvar.h index dff16f4596d..9905bd76ac9 100644 --- a/sys/arch/amiga/dev/sfasvar.h +++ b/sys/arch/amiga/dev/sfasvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sfasvar.h,v 1.4 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: sfasvar.h,v 1.5 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: sfasvar.h,v 1.4 1996/04/21 21:12:33 veego Exp $ */ /* @@ -204,12 +204,12 @@ struct sfas_softc { /* Generic DMA functions */ int (*sc_setup_dma)(struct sfas_softc *sc, - vm_offset_t ptr, int len, int mode); + vm_offset_t ptr, int len, int mode); int (*sc_build_dma_chain)(struct sfas_softc *sc, - struct sfas_dma_chain *chain, - void *p, int l); + struct sfas_dma_chain *chain, + void *p, int l); int (*sc_need_bump)(struct sfas_softc *sc, - vm_offset_t ptr, int len); + vm_offset_t ptr, int len); /* Generic Led data */ int sc_led_status; diff --git a/sys/arch/hp300/stand/include/kbdvar.h b/sys/arch/hp300/stand/include/kbdvar.h index ab2b96ec854..00074065f7d 100644 --- a/sys/arch/hp300/stand/include/kbdvar.h +++ b/sys/arch/hp300/stand/include/kbdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbdvar.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */ +/* $OpenBSD: kbdvar.h,v 1.3 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: kbdvar.h,v 1.1 1997/04/14 19:00:13 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ struct kbdsw { int (*k_getc)(void); /* get character */ - void (*k_nmi)(void); /* handle non-maskable interrupt */ + void (*k_nmi)(void); /* handle non-maskable interrupt */ int (*k_init)(void); /* probe/initialize keyboard */ }; diff --git a/sys/arch/hppa/include/iomod.h b/sys/arch/hppa/include/iomod.h index 17cc3e47ed2..d7d3c40f106 100644 --- a/sys/arch/hppa/include/iomod.h +++ b/sys/arch/hppa/include/iomod.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iomod.h,v 1.10 2002/03/14 01:26:32 millert Exp $ */ +/* $OpenBSD: iomod.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -151,10 +151,10 @@ struct pagezero { /* [0x000] Initialize Vectors */ int ivec_special; /* must be zero */ - int (*ivec_mempf)(void); /* powerfail recovery software */ + int (*ivec_mempf)(void); /* powerfail recovery software */ int (*ivec_toc)(void); /* exec'd after Transfer Of Control */ u_int ivec_toclen; /* bytes of ivec_toc code */ - int (*ivec_rendz)(void); /* exec'd after Rendezvous Signal */ + int (*ivec_rendz)(void); /* exec'd after Rendezvous Signal */ u_int ivec_mempflen; /* bytes of ivec_mempf code */ u_int ivec_resv[2]; /* (reserved) */ u_int ivec_mbz; /* must be zero */ diff --git a/sys/arch/mac68k/mac68k/macrom.h b/sys/arch/mac68k/mac68k/macrom.h index 1d0cd52770b..987517c302f 100644 --- a/sys/arch/mac68k/mac68k/macrom.h +++ b/sys/arch/mac68k/mac68k/macrom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: macrom.h,v 1.9 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: macrom.h,v 1.10 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: macrom.h,v 1.9 1996/05/25 14:45:35 briggs Exp $ */ /*- @@ -41,14 +41,14 @@ extern caddr_t ROMBase; /* Base address of ROM space */ extern caddr_t ADBBase; /* Base address of ADB scratch */ extern caddr_t ADBYMM; /* Base address of yet more ADB mem */ extern caddr_t ADBState; /* Base address of ADB scratch ? */ -extern void (*JADBProc)(void); /* ADBReInit pre/post processing */ -extern void (*Lvl1DT[8])(void); /* VIA1 interrupt table by bit */ -extern void (*Lvl2DT[8])(void); /* VIA2 interrupt table by bit */ +extern void (*JADBProc)(void); /* ADBReInit pre/post processing */ +extern void (*Lvl1DT[8])(void); /* VIA1 interrupt table by bit */ +extern void (*Lvl2DT[8])(void); /* VIA2 interrupt table by bit */ extern void (*jADBOp)(void); /* low memory pointer to ADBOp */ extern void (*jUnimplTrap)(void); /* Unimplemented trap */ /* loglob(KbdLast, 0x218) * addr of last kbd to send */ /* loglob(KbdType, 0x21E) * type of last kbd to send */ -extern void (*JKybdTask)(void); /* Keyboard task ptr? */ +extern void (*JKybdTask)(void); /* Keyboard task ptr? */ extern u_char CPUFlag; /* Type of CPU in this machine */ extern void (*MacJmp)(void); /* ??? */ extern u_long Lo3Bytes; /* 0x00ffffff */ @@ -65,13 +65,13 @@ extern caddr_t VIA; /* VIA1 base address */ extern caddr_t mrg_VIA2; /* VIA2 base address */ extern caddr_t SCCRd; /* SCC read base address */ extern u_char FinderName[20]; /* FinderName - Pascal string */ -extern void (*jSwapMMU)(void); /* Pointer to MMU Swap routine */ +extern void (*jSwapMMU)(void); /* Pointer to MMU Swap routine */ extern void (*jEgret)(void); /* Pointer to MMU Swap routine */ extern u_int16_t HwCfgFlags; /* Hardware config flags */ extern u_int32_t HwCfgFlags2; /* more hardware config flags */ extern u_int32_t HwCfgFlags3; /* more hardware config flags */ extern u_int32_t ADBReInit_JTBL; /* pointer to patch table */ -extern void (*jClkNoMem)(void); /* pointer to ClkNoMem */ +extern void (*jClkNoMem)(void); /* pointer to ClkNoMem */ extern u_char SysParam[20]; /* Place where PRam data gets stored */ extern caddr_t ExpandMem; /* pointer to Expanded Memory used by */ /* newer ADB routines (since LCIII) */ diff --git a/sys/arch/mvme88k/stand/sboot/sboot.h b/sys/arch/mvme88k/stand/sboot/sboot.h index 3bc198324b4..f50701bfabf 100644 --- a/sys/arch/mvme88k/stand/sboot/sboot.h +++ b/sys/arch/mvme88k/stand/sboot/sboot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sboot.h,v 1.3 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: sboot.h,v 1.4 2002/03/15 01:20:04 millert Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor and Seth Widoff @@ -45,7 +45,7 @@ extern caddr_t end; #define NULL ((char *)0) -void bcopy(const void *, void *, size_t); /* libc_sa */ +void bcopy(const void *, void *, size_t); /* libc_sa */ void *memset(void *, int, size_t); /* libc_sa */ int printf(const char *, ...); /* libc_sa */ diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h index e465c56ae8e..525403a986a 100644 --- a/sys/arch/sparc/include/autoconf.h +++ b/sys/arch/sparc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.10 2002/03/14 03:16:00 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.20 1997/05/24 20:03:03 pk Exp $ */ /* @@ -126,8 +126,7 @@ struct confargs { * it will use that instead of creating one, but you must only do this if * you get it from ../sparc/vaddrs.h. */ -void *mapdev(struct rom_reg *pa, int va, - int offset, int size); +void *mapdev(struct rom_reg *pa, int va, int offset, int size); #define mapiodev(pa, offset, size) \ mapdev(pa, 0, offset, size) /* diff --git a/sys/arch/sparc/include/oldmon.h b/sys/arch/sparc/include/oldmon.h index 0fc60a09c06..0a03845905a 100644 --- a/sys/arch/sparc/include/oldmon.h +++ b/sys/arch/sparc/include/oldmon.h @@ -1,4 +1,4 @@ -/* $OpenBSD: oldmon.h,v 1.8 2002/03/14 01:26:43 millert Exp $ */ +/* $OpenBSD: oldmon.h,v 1.9 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: oldmon.h,v 1.11 1996/03/31 22:21:38 pk Exp $ */ /* @@ -155,14 +155,14 @@ struct om_vector { int *diagberr; /* Bus err handler for diags */ /* Monitor and hardware revision and identification */ - struct om_bootparam **bootParam; /* Info for bootstrapped pgm */ + struct om_bootparam **bootParam;/* Info for bootstrapped pgm */ u_long *memorySize; /* Usable memory in bytes */ /* Single-character input and output */ int (*getChar)(void); /* Get char from input source */ void (*putChar)(int); /* Put char to output sink */ int (*mayGet)(void); /* Maybe get char, or -1 */ - int (*mayPut)(int); /* Maybe put char, or -1 */ + int (*mayPut)(int); /* Maybe put char, or -1 */ u_char *echo; /* Should getchar echo? */ u_char *inSource; /* Input source selector */ u_char *outSink; /* Output sink selector */ @@ -173,7 +173,7 @@ struct om_vector { /* Keyboard input (scanned by monitor nmi routine) */ int (*getKey)(void); /* Get next key if one exists */ - int (*initGetKey)(void);/* Initialize get key */ + int (*initGetKey)(void); /* Initialize get key */ u_int *translation; /* Kbd translation selector */ u_char *keyBid; /* Keyboard ID byte */ int *screen_x; /* V2: Screen x pos (R/O) */ @@ -184,7 +184,7 @@ struct om_vector { char *monId; /* Frame buffer output and terminal emulation */ - int (*fbWriteChar)(void);/* Write a character to FB */ + int (*fbWriteChar)(void); /* Write a character to FB */ int *fbAddr; /* Address of frame buffer */ char **font; /* Font table for FB */ void (*fbWriteStr)(char *, int); @@ -198,14 +198,14 @@ struct om_vector { u_char **linePtr; /* Cur pointer into linebuf */ int *lineSize; /* length of line in linebuf */ int (*getLine)(void); /* Get line from user */ - u_char (*getNextChar)(void);/* Get next char from linebuf */ - u_char (*peekNextChar)(void);/* Peek at next char */ + u_char (*getNextChar)(void); /* Get next char from linebuf */ + u_char (*peekNextChar)(void); /* Peek at next char */ int *fbThere; /* =1 if frame buffer there */ int (*getNum)(void); /* Grab hex num from line */ /* Print formatted output to current output sink */ int (*printf)(void); /* Similar to "Kernel printf" */ - int (*printHex)(void);/* Format N digits in hex */ + int (*printHex)(void); /* Format N digits in hex */ /* Led stuff */ u_char *leds; /* RAM copy of LED register */ @@ -213,7 +213,7 @@ struct om_vector { /* Non-maskable interrupt (nmi) information */ int (*nmiAddr)(void); /* Addr for level 7 vector */ - void (*abortEntry)(void);/* Entry for keyboard abort */ + void (*abortEntry)(void); /* Entry for keyboard abort */ int *nmiClock; /* Counts up in msec */ /* Frame buffer type: see <machine/fbio.h> */ @@ -231,9 +231,11 @@ struct om_vector { long *resetMap; /* pgmap entry for resetaddr */ /* Really struct pgmapent * */ - void (*exitToMon)(void) __attribute__((__noreturn__));/* Exit from user program */ + /* Exit from user program */ + void (*exitToMon)(void) __attribute__((__noreturn__)); u_char **memorybitmap; /* V1: &{0 or &bits} */ - void (*setcxsegmap) /* Set seg in any context */(int, caddr_t, int); + /* Set seg in any context */ + void (*setcxsegmap)(int, caddr_t, int); void (**vector_cmd)(u_long, char *);/* V2: Handler for 'v' cmd */ u_long *ExpectedTrapSig; u_long *TrapVectorTable; diff --git a/sys/arch/sparc/sparc/cache.h b/sys/arch/sparc/sparc/cache.h index 9c0accc6c82..b1caebac505 100644 --- a/sys/arch/sparc/sparc/cache.h +++ b/sys/arch/sparc/sparc/cache.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.h,v 1.7 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: cache.h,v 1.8 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: cache.h,v 1.16 1997/07/06 21:15:14 pk Exp $ */ /* @@ -151,24 +151,24 @@ extern int cache_alias_bits; * Routines for dealing with the cache. */ void sun4_cache_enable(void); /* turn it on */ -void ms1_cache_enable(void); /* turn it on */ -void viking_cache_enable(void); /* turn it on */ -void hypersparc_cache_enable(void); /* turn it on */ +void ms1_cache_enable(void); /* turn it on */ +void viking_cache_enable(void); /* turn it on */ +void hypersparc_cache_enable(void); /* turn it on */ void swift_cache_enable(void); /* turn it on */ -void cypress_cache_enable(void); /* turn it on */ -void turbosparc_cache_enable(void); /* turn it on */ +void cypress_cache_enable(void); /* turn it on */ +void turbosparc_cache_enable(void); /* turn it on */ void sun4_vcache_flush_context(void); /* flush current context */ -void sun4_vcache_flush_region(int); /* flush region in cur ctx */ -void sun4_vcache_flush_segment(int, int);/* flush seg in cur ctx */ -void sun4_vcache_flush_page(int va); /* flush page in cur ctx */ -void sun4_cache_flush(caddr_t, u_int);/* flush region */ +void sun4_vcache_flush_region(int); /* flush region in cur ctx */ +void sun4_vcache_flush_segment(int, int); /* flush seg in cur ctx */ +void sun4_vcache_flush_page(int va); /* flush page in cur ctx */ +void sun4_cache_flush(caddr_t, u_int); /* flush region */ void srmmu_vcache_flush_context(void); /* flush current context */ -void srmmu_vcache_flush_region(int); /* flush region in cur ctx */ -void srmmu_vcache_flush_segment(int, int);/* flush seg in cur ctx */ +void srmmu_vcache_flush_region(int); /* flush region in cur ctx */ +void srmmu_vcache_flush_segment(int, int); /* flush seg in cur ctx */ void srmmu_vcache_flush_page(int va); /* flush page in cur ctx */ -void srmmu_cache_flush(caddr_t, u_int);/* flush region */ +void srmmu_cache_flush(caddr_t, u_int); /* flush region */ void hypersparc_pure_vcache_flush(void); void ms1_cache_flush_all(void); diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h index 1164cca88cd..7fcdf41a0bf 100644 --- a/sys/arch/sun3/include/mon.h +++ b/sys/arch/sun3/include/mon.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mon.h,v 1.7 2002/03/14 03:16:01 millert Exp $ */ +/* $OpenBSD: mon.h,v 1.8 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: mon.h,v 1.19 1996/11/20 18:57:12 gwr Exp $ */ /*- @@ -124,7 +124,7 @@ typedef struct { u_char (*getChar)(void); /* Get char from input source */ int (*putChar)(int); /* Put char to output sink */ int (*mayGet)(void); /* Maybe get char, or -1 */ - int (*mayPut)(int); /* Maybe put char, or -1 */ + int (*mayPut)(int); /* Maybe put char, or -1 */ u_char *echo; /* Should getchar echo? */ u_char *inSource; /* Input source selector */ u_char *outSink; /* Output sink selector */ @@ -134,7 +134,7 @@ typedef struct { */ int (*getKey)(void); /* Get next key if one exists */ - int (*initGetKey)(void *); /* Initialize get key */ + int (*initGetKey)(void *); /* Initialize get key */ u_int *translation; /* Kbd translation selector (see keyboard.h in sun monitor code) */ @@ -153,7 +153,7 @@ typedef struct { * Frame buffer output and terminal emulation */ - int (*fbWriteChar)(int); /* Write a character to FB */ + int (*fbWriteChar)(int); /* Write a character to FB */ int *fbAddr; /* Address of frame buffer */ char **font; /* Font table for FB */ /* Quickly write string to FB */ @@ -174,8 +174,8 @@ typedef struct { u_char **linePtr; /* Cur pointer into linebuf */ int *lineSize; /* length of line in linebuf */ int (*getLine)(int); /* Get line from user */ - u_char (*getNextChar)(void); /* Get next char from linebuf */ - u_char (*peekNextChar)(void); /* Peek at next char */ + u_char (*getNextChar)(void); /* Get next char from linebuf */ + u_char (*peekNextChar)(void); /* Peek at next char */ int *fbThere; /* =1 if frame buffer there */ int (*getNum)(void); /* Grab hex num from line */ @@ -183,8 +183,8 @@ typedef struct { * Print formatted output to current output sink */ - int (*printf)(char *, ...); /* Similar to "Kernel printf" */ - int (*printHex)(int,int); /* Format N digits in hex */ + int (*printf)(char *, ...); /* Similar to "Kernel printf" */ + int (*printHex)(int,int); /* Format N digits in hex */ /* * Led stuff diff --git a/sys/arch/vax/include/rpb.h b/sys/arch/vax/include/rpb.h index 5e90a6c1752..e1971e5371a 100644 --- a/sys/arch/vax/include/rpb.h +++ b/sys/arch/vax/include/rpb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rpb.h,v 1.8 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: rpb.h,v 1.9 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: rpb.h,v 1.6 1998/07/01 09:37:11 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. @@ -40,7 +40,7 @@ struct rpb { /* size description */ struct rpb *rpb_base; /* 4 physical base address of block */ - void (*rpb_restart)/* 4 physical address of restart routine */(void); + void (*rpb_restart)(void);/* 4 physical address of restart routine */ long rpb_chksum;/* 4 checksum of first 31 longwords of restart */ long rpb_rstflg; /* 4 Restart in progress flag */ long rpb_haltpc; /* 4 PC at HALT/restart */ diff --git a/sys/arch/vax/mscp/mscpvar.h b/sys/arch/vax/mscp/mscpvar.h index e51901ec482..1469dc11c78 100644 --- a/sys/arch/vax/mscp/mscpvar.h +++ b/sys/arch/vax/mscp/mscpvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mscpvar.h,v 1.4 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: mscpvar.h,v 1.5 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: mscpvar.h,v 1.7 1999/06/06 19:16:18 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -81,23 +81,35 @@ struct mscp_xi { }; struct mscp_ctlr { - void (*mc_ctlrdone) /* controller operation complete */(struct device *); - void (*mc_go) /* device-specific start routine */(struct device *, struct mscp_xi *); - void (*mc_saerror) /* ctlr error handling */(struct device *, int); + /* controller operation complete */ + void (*mc_ctlrdone)(struct device *); + /* device-specific start routine */ + void (*mc_go)(struct device *, struct mscp_xi *); + /* ctlr error handling */ + void (*mc_saerror)(struct device *, int); }; struct mscp_softc; struct mscp_device { - void (*me_dgram) /* error datagram */(struct device *, struct mscp *, struct mscp_softc *); - void (*me_iodone) /* normal I/O is done */(struct device *, struct buf *); - int (*me_online) /* drive on line */(struct device *, struct mscp *); - int (*me_gotstatus) /* got unit status */(struct device *, struct mscp *); - void (*me_replace) /* replace done */(struct device *, struct mscp *); - int (*me_ioerr) /* read or write failed */(struct device *, struct mscp *, struct buf *); - void (*me_bb) /* B_BAD io done */(struct device *, struct mscp *, struct buf *); - void (*me_fillin) /* Fill in mscp info for this drive */(struct buf *,struct mscp *); - void (*me_cmddone) /* Non-data transfer operation is done */(struct device *, struct mscp *); + /* error datagram */ + void (*me_dgram)(struct device *, struct mscp *, struct mscp_softc *); + /* normal I/O is done */ + void (*me_iodone)(struct device *, struct buf *); + /* drive on line */ + int (*me_online)(struct device *, struct mscp *); + /* got unit status */ + int (*me_gotstatus)(struct device *, struct mscp *); + /* replace done */ + void (*me_replace)(struct device *, struct mscp *); + /* read or write failed */ + int (*me_ioerr)(struct device *, struct mscp *, struct buf *); + /* B_BAD io done */ + void (*me_bb)(struct device *, struct mscp *, struct buf *); + /* Fill in mscp info for this drive */ + void (*me_fillin)(struct buf *,struct mscp *); + /* Non-data transfer operation is done */ + void (*me_cmddone)(struct device *, struct mscp *); }; /* diff --git a/sys/arch/vax/uba/ubavar.h b/sys/arch/vax/uba/ubavar.h index a397a841486..9647a831952 100644 --- a/sys/arch/vax/uba/ubavar.h +++ b/sys/arch/vax/uba/ubavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ubavar.h,v 1.11 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: ubavar.h,v 1.12 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: ubavar.h,v 1.21 1999/01/19 21:04:48 ragge Exp $ */ /* @@ -79,7 +79,7 @@ struct uba_softc { struct pte *uh_mr; /* start of page map */ int uh_memsize; /* size of uba memory, pages */ caddr_t uh_iopage; /* start of uba io page */ - void (**uh_reset)(int);/* UBA reset function array */ + void (**uh_reset)(int); /* UBA reset function array */ int *uh_resarg; /* array of ubareset args */ int uh_resno; /* Number of devices to reset */ short uh_mrwant; /* someone is waiting for map reg */ diff --git a/sys/dev/cons.h b/sys/dev/cons.h index 6bf414da617..6d2bdd66786 100644 --- a/sys/dev/cons.h +++ b/sys/dev/cons.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cons.h,v 1.10 2002/03/14 04:01:23 millert Exp $ */ +/* $OpenBSD: cons.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: cons.h,v 1.14 1996/03/14 19:08:35 christos Exp $ */ /* @@ -44,18 +44,18 @@ */ struct consdev { - void (*cn_probe)(struct consdev *); /* probe hardware and fill in consdev info */ - void (*cn_init)(struct consdev *); + void (*cn_probe)(struct consdev *); /* turn on as console */ - int (*cn_getc)(dev_t); + void (*cn_init)(struct consdev *); /* kernel getchar interface */ - void (*cn_putc)(dev_t, int); + int (*cn_getc)(dev_t); /* kernel putchar interface */ - void (*cn_pollc)(dev_t, int); + void (*cn_putc)(dev_t, int); /* turn on and off polling */ - void (*cn_bell)(dev_t, u_int, u_int, u_int); + void (*cn_pollc)(dev_t, int); /* ring bell */ + void (*cn_bell)(dev_t, u_int, u_int, u_int); dev_t cn_dev; /* major/minor of device */ int cn_pri; /* pecking order; the higher the better */ }; diff --git a/sys/dev/ic/midwayvar.h b/sys/dev/ic/midwayvar.h index 85e07acd510..026ca46d4fb 100644 --- a/sys/dev/ic/midwayvar.h +++ b/sys/dev/ic/midwayvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: midwayvar.h,v 1.10 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: midwayvar.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */ /* * @@ -104,8 +104,7 @@ struct en_softc { bus_space_tag_t en_memt; /* for EN_READ/EN_WRITE */ bus_space_handle_t en_base; /* base of en card */ bus_size_t en_obmemsz; /* size of en card (bytes) */ - void (*en_busreset)(void *); - /* bus specific reset function */ + void (*en_busreset)(void *); /* bus specific reset function */ /* serv list */ u_int32_t hwslistp; /* hw pointer to service list (byte offset) */ diff --git a/sys/dev/midi_if.h b/sys/dev/midi_if.h index f527ec587bf..7c7b0276fad 100644 --- a/sys/dev/midi_if.h +++ b/sys/dev/midi_if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: midi_if.h,v 1.4 2002/03/14 03:16:03 millert Exp $ */ +/* $OpenBSD: midi_if.h,v 1.5 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: midi_if.h,v 1.3 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -54,7 +54,7 @@ struct midi_hw_if { void (*)(void *, int), /* input callback */ void (*)(void *), /* output callback */ void *); - void (*close)(void *); /* close hardware */ + void (*close)(void *); /* close hardware */ int (*output)(void *, int); /* output a byte */ void (*getinfo)(void *, struct midi_info *); int (*ioctl)(void *, u_long, caddr_t, int, struct proc *); diff --git a/sys/net/if.h b/sys/net/if.h index e4ba487fcbc..93bfabff279 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.33 2002/03/14 01:27:09 millert Exp $ */ +/* $OpenBSD: if.h,v 1.34 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -159,12 +159,17 @@ struct ifnet { /* and the entries */ int if_capabilities; /* interface capabilities */ /* procedure handles */ - int (*if_output) /* output routine (enqueue) */(struct ifnet *, struct mbuf *, struct sockaddr *, + /* output routine (enqueue) */ + int (*if_output)(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); - void (*if_start) /* initiate output routine */(struct ifnet *); - int (*if_ioctl) /* ioctl routine */(struct ifnet *, u_long, caddr_t); - int (*if_reset) /* XXX bus reset routine */(struct ifnet *); - void (*if_watchdog) /* timer routine */(struct ifnet *); + /* initiate output routine */ + void (*if_start)(struct ifnet *); + /* ioctl routine */ + int (*if_ioctl)(struct ifnet *, u_long, caddr_t); + /* XXX bus reset routine */ + int (*if_reset)(struct ifnet *); + /* timer routine */ + void (*if_watchdog)(struct ifnet *); struct ifaltq if_snd; /* output queue (includes altq) */ struct ifprefix *if_prefixlist; /* linked list of prefixes per if */ }; @@ -290,7 +295,8 @@ struct ifaddr { struct sockaddr *ifa_netmask; /* used to determine subnet */ struct ifnet *ifa_ifp; /* back-pointer to interface */ TAILQ_ENTRY(ifaddr) ifa_list; /* list of addresses for interface */ - void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */(int, struct rtentry *, struct rt_addrinfo *); + /* check or clean routes (+ or -)'d */ + void (*ifa_rtrequest)(int, struct rtentry *, struct rt_addrinfo *); u_int ifa_flags; /* mostly rt_flags for cloning */ u_int ifa_refcnt; /* count of references */ int ifa_metric; /* cost of going out this interface */ diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h index 167142bbf5e..3aa09c4e719 100644 --- a/sys/net/if_pppvar.h +++ b/sys/net/if_pppvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppvar.h,v 1.10 2002/03/14 01:27:09 millert Exp $ */ +/* $OpenBSD: if_pppvar.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: if_pppvar.h,v 1.5 1997/01/03 07:23:29 mikel Exp $ */ /* * if_pppvar.h - private structures and declarations for PPP. @@ -61,7 +61,7 @@ struct ppp_softc { int sc_unit; /* XXX unit number */ u_int sc_flags; /* control/status bits; see if_ppp.h */ void *sc_devp; /* pointer to device-dep structure */ - void (*sc_start)(struct ppp_softc *); /* start output proc */ + void (*sc_start)(struct ppp_softc *); /* start output proc */ void (*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */ void (*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */ u_int16_t sc_mru; /* max receive unit */ @@ -81,7 +81,7 @@ struct ppp_softc { void *sc_rc_state; /* receive decompressor state */ time_t sc_last_sent; /* time (secs) last NP pkt sent */ time_t sc_last_recv; /* time (secs) last NP pkt rcvd */ - struct bpf_program sc_pass_filt; /* filter for packets to pass */ + struct bpf_program sc_pass_filt; /* filter for packets to pass */ struct bpf_program sc_active_filt; /* filter for "non-idle" packets */ #ifdef VJC struct slcompress *sc_comp; /* vjc control buffer */ diff --git a/sys/net/radix.h b/sys/net/radix.h index 0aa628df683..403d7093a5c 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -1,4 +1,4 @@ -/* $OpenBSD: radix.h,v 1.7 2002/03/14 03:16:10 millert Exp $ */ +/* $OpenBSD: radix.h,v 1.8 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: radix.h,v 1.8 1996/02/13 22:00:37 christos Exp $ */ /* @@ -111,19 +111,31 @@ struct radix_node_head { struct radix_node *rnh_treetop; int rnh_addrsize; /* permit, but not require fixed keys */ int rnh_pktsize; /* permit, but not require fixed keys */ - struct radix_node *(*rnh_addaddr) /* add based on sockaddr */(void *v, void *mask, + /* add based on sockaddr */ + struct radix_node *(*rnh_addaddr)(void *v, void *mask, struct radix_node_head *head, struct radix_node nodes[]); - struct radix_node *(*rnh_addpkt) /* add based on packet hdr */(void *v, void *mask, + /* add based on packet hdr */ + struct radix_node *(*rnh_addpkt)(void *v, void *mask, struct radix_node_head *head, struct radix_node nodes[]); - struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */(void *v, void *mask, struct radix_node_head *head); - struct radix_node *(*rnh_delpkt) /* remove based on packet hdr */(void *v, void *mask, struct radix_node_head *head); - struct radix_node *(*rnh_matchaddr) /* locate based on sockaddr */(void *v, struct radix_node_head *head); - struct radix_node *(*rnh_lookup) /* locate based on sockaddr */(void *v, void *mask, struct radix_node_head *head); - struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */(void *v, struct radix_node_head *head); - int (*rnh_walktree) /* traverse tree */ - (struct radix_node_head *, + /* remove based on sockaddr */ + struct radix_node *(*rnh_deladdr)(void *v, void *mask, + struct radix_node_head *head); + /* remove based on packet hdr */ + struct radix_node *(*rnh_delpkt)(void *v, void *mask, + struct radix_node_head *head); + /* locate based on sockaddr */ + struct radix_node *(*rnh_matchaddr)(void *v, + struct radix_node_head *head); + /* locate based on sockaddr */ + struct radix_node *(*rnh_lookup)(void *v, void *mask, + struct radix_node_head *head); + /* locate based on packet hdr */ + struct radix_node *(*rnh_matchpkt)(void *v, + struct radix_node_head *head); + /* traverse tree */ + int (*rnh_walktree)(struct radix_node_head *, int (*)(struct radix_node *, void *), void *); - struct radix_node rnh_nodes[3]; /* empty tree for common case */ + struct radix_node rnh_nodes[3];/* empty tree for common case */ }; diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h index b41e01ef03a..e817f83f167 100644 --- a/sys/netccitt/hd_var.h +++ b/sys/netccitt/hd_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hd_var.h,v 1.3 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: hd_var.h,v 1.4 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: hd_var.h,v 1.7 1996/02/13 22:04:34 christos Exp $ */ /* @@ -77,7 +77,8 @@ struct hdcb { struct ifaddr *hd_ifa; /* device's X.25 network address */ struct x25config *hd_xcp; caddr_t hd_pkp; /* Level III junk */ - int (*hd_output) /* separate entry for HDLC direct output */(struct mbuf *, ...); + /* separate entry for HDLC direct output */ + int (*hd_output)(struct mbuf *, ...); /* link statistics */ diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h index ec6e923cfdd..9de04fe66aa 100644 --- a/sys/netccitt/pk_var.h +++ b/sys/netccitt/pk_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pk_var.h,v 1.3 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: pk_var.h,v 1.4 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: pk_var.h,v 1.8 1996/02/13 22:05:47 christos Exp $ */ /* @@ -55,9 +55,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 ...*/(struct mbuf *, void *); + /* switch to socket vs datagram vs ...*/ + int (*lcd_upper)(struct mbuf *, void *); caddr_t lcd_upnext; /* reference for lcd_upper() */ - void (*lcd_send) /* if X.25 front end, direct connect */(struct pklcd *); + /* if X.25 front end, direct connect */ + void (*lcd_send)(struct pklcd *); caddr_t lcd_downnext; /* reference for lcd_send() */ short lcd_lcn; /* Logical channel number */ short lcd_state; /* Logical Channel state */ @@ -109,8 +111,10 @@ struct pkcb { } pk_q; short pk_state; /* packet level status */ u_short pk_maxlcn; /* local copy of xc_maxlcn */ - int (*pk_lloutput) /* link level output procedure */(struct mbuf *, ...); - void *(*pk_llctlinput) /* link level ctloutput procedure */(int, struct sockaddr *, void *); + /* link level output procedure */ + int (*pk_lloutput)(struct mbuf *, ...); + /* link level ctloutput procedure */ + void *(*pk_llctlinput)(int, struct sockaddr *, void *); caddr_t pk_llnext; /* handle for next level down */ struct x25config *pk_xcp; /* network specific configuration */ struct x25_ifaddr *pk_ia; /* backpointer to ifaddr */ @@ -142,7 +146,7 @@ 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 */(struct pklcd *); + int (*ia_start)(struct pklcd *); /* connect, confirm method */ struct sockaddr_x25 ia_dstaddr; /* reserve space for route dst */ }; diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h index cde52d405ba..cbb4cb65eff 100644 --- a/sys/netinet6/ip6protosw.h +++ b/sys/netinet6/ip6protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6protosw.h,v 1.5 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: ip6protosw.h,v 1.6 2002/03/15 01:20:04 millert Exp $ */ /* $KAME: ip6protosw.h,v 1.22 2001/02/08 18:02:08 itojun Exp $ */ /* @@ -122,22 +122,28 @@ struct ip6protosw { short pr_flags; /* see below */ /* protocol-protocol hooks */ - int (*pr_input) /* input to protocol (from below) */(struct mbuf **, int *, int); - int (*pr_output) /* output to protocol (from above) */(struct mbuf *, ...); - void (*pr_ctlinput) /* control input (from below) */(int, struct sockaddr *, void *); - int (*pr_ctloutput) /* control output (from above) */(int, struct socket *, int, int, struct mbuf **); + /* input to protocol (from below) */ + int (*pr_input)(struct mbuf **, int *, int); + /* output to protocol (from above) */ + int (*pr_output)(struct mbuf *, ...); + /* control input (from below) */ + void (*pr_ctlinput)(int, struct sockaddr *, void *); + /* control output (from above) */ + int (*pr_ctloutput)(int, struct socket *, int, int, struct mbuf **); /* user-protocol hook */ - int (*pr_usrreq) /* user request: see list below */(struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *, struct proc *); + /* user request: see list below */ + int (*pr_usrreq)(struct socket *, int, struct mbuf *, + struct mbuf *, struct mbuf *, struct proc *); /* utility hooks */ - void (*pr_init) /* initialization hook */(void); + void (*pr_init)(void); /* initialization hook */ - void (*pr_fasttimo) /* fast timeout (200ms) */(void); - void (*pr_slowtimo) /* slow timeout (500ms) */(void); - void (*pr_drain) /* flush any excess space possible */(void); - int (*pr_sysctl) /* sysctl for protocol */(int *, u_int, void *, size_t *, void *, size_t); + void (*pr_fasttimo)(void); /* fast timeout (200ms) */ + void (*pr_slowtimo)(void); /* slow timeout (500ms) */ + void (*pr_drain)(void); /* flush any excess space possible */ + /* sysctl for protocol */ + int (*pr_sysctl)(int *, u_int, void *, size_t *, void *, size_t); }; #endif /* !_NETINET6_IP6PROTOSW_H_ */ diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h index dc95e436135..bc2a88b4d6f 100644 --- a/sys/netiso/iso_var.h +++ b/sys/netiso/iso_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iso_var.h,v 1.4 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: iso_var.h,v 1.5 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: iso_var.h,v 1.8 1996/02/13 22:10:32 christos Exp $ */ /*- @@ -144,8 +144,7 @@ int iso_hash(struct sockaddr_iso *, struct afhash *); int iso_netof(struct iso_addr *, caddr_t); int iso_control(struct socket *, u_long, caddr_t, struct ifnet *); void iso_ifscrub(struct ifnet *, struct iso_ifaddr *); -int iso_ifinit(struct ifnet *, struct iso_ifaddr *, struct sockaddr_iso *, - int ); +int iso_ifinit(struct ifnet *, struct iso_ifaddr *, struct sockaddr_iso *, int); struct ifaddr *iso_ifwithidi(struct sockaddr *); int iso_ck_addr(struct iso_addr *); int iso_eqtype(struct iso_addr *, struct iso_addr *); diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h index 151395bbb21..78cb053b6c8 100644 --- a/sys/netiso/tp_pcb.h +++ b/sys/netiso/tp_pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tp_pcb.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: tp_pcb.h,v 1.4 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: tp_pcb.h,v 1.9 1996/02/13 22:11:44 christos Exp $ */ /*- @@ -122,26 +122,43 @@ struct tp_refinfo { }; struct nl_protosw { - int nlp_afamily; /* address family */ - void (*nlp_putnetaddr) /* puts addresses in nl pcb */(void *, struct sockaddr *, int); - void (*nlp_getnetaddr) /* gets addresses from nl pcb */(void *, struct mbuf *, int); - int (*nlp_cmpnetaddr) /* compares address in pcb */(void *, struct sockaddr *, int); + int nlp_afamily; /* address family */ + /* puts addresses in nl pcb */ + void (*nlp_putnetaddr)(void *, struct sockaddr *, int); + /* gets addresses from nl pcb */ + void (*nlp_getnetaddr)(void *, struct mbuf *, int); + /* compares address in pcb */ /* with sockaddr */ - void (*nlp_putsufx) /* puts transport suffixes in */(void *, caddr_t, int, int); + int (*nlp_cmpnetaddr)(void *, struct sockaddr *, int); + /* puts transport suffixes in */ /* nl pcb */ - void (*nlp_getsufx) /* gets transport suffixes */(void *, u_short *, caddr_t, int); + void (*nlp_putsufx)(void *, caddr_t, int, int); + /* gets transport suffixes */ /* from nl pcb */ - void (*nlp_recycle_suffix) /* clears suffix from nl pcb */(void *); - int (*nlp_mtu) /* figures out mtu based on */(void *); /* nl used */ - int (*nlp_pcbbind) /* bind to pcb for net level */(void *, struct mbuf *); - int (*nlp_pcbconn) /* connect for net level */(void *, struct mbuf *); - void (*nlp_pcbdisc) /* disconnect net level */(void *); - void (*nlp_pcbdetach) /* detach net level pcb */(void *); - int (*nlp_pcballoc) /* allocate a net level pcb */(struct socket *, void *); - int (*nlp_output) /* prepare a packet to give */(struct mbuf *, ...); /* to nl */ - int (*nlp_dgoutput) /* prepare a packet to give */(struct mbuf *, ...); /*to nl*/ - int (*nlp_ctloutput) /* hook for network set/get */(int, int, caddr_t, struct mbuf *); + void (*nlp_getsufx)(void *, u_short *, caddr_t, int); + /* clears suffix from nl pcb */ + void (*nlp_recycle_suffix)(void *); + int (*nlp_mtu)(void *); /* figures out mtu based on */ + /* nl used */ + /* bind to pcb for net level */ + int (*nlp_pcbbind)(void *, struct mbuf *); + /* connect for net level */ + int (*nlp_pcbconn)(void *, struct mbuf *); + /* disconnect net level */ + void (*nlp_pcbdisc)(void *); + /* detach net level pcb */ + void (*nlp_pcbdetach)(void *); + /* allocate a net level pcb */ + int (*nlp_pcballoc)(struct socket *, void *); + /* prepare a packet to give */ + /* to nl */ + int (*nlp_output)(struct mbuf *, ...); + /* prepare a packet to give */ + /* to nl */ + int (*nlp_dgoutput)(struct mbuf *, ...); + /* hook for network set/get */ /* options */ + int (*nlp_ctloutput)(int, int, caddr_t, struct mbuf *); caddr_t nlp_pcblist; /* list of xx_pcb's for connections */ }; @@ -150,16 +167,16 @@ struct tp_pcb { struct tp_pcb *tp_next; struct tp_pcb *tp_prev; struct tp_pcb *tp_nextlisten; /* chain all listeners */ - struct socket *tp_sock;/* back ptr */ + struct socket *tp_sock; /* back ptr */ u_short tp_state; /* state of fsm */ short tp_retrans; /* # times can still retrans */ - caddr_t tp_npcb;/* to lower layer pcb */ + caddr_t tp_npcb; /* to lower layer pcb */ struct nl_protosw *tp_nlproto; /* lower-layer dependent routines */ struct rtentry **tp_routep; /* obtain mtu; inside npcb */ - RefNum tp_lref;/* local reference */ - RefNum tp_fref;/* foreign reference */ + RefNum tp_lref; /* local reference */ + RefNum tp_fref; /* foreign reference */ u_int tp_seqmask; /* mask for seq space */ u_int tp_seqbit; /* bit for seq number wraparound */ @@ -190,7 +207,7 @@ struct tp_pcb { * needed for perf measurements only */ u_short tp_lcredit; /* current local credit in # packets */ u_short tp_maxlcredit; /* needed for reassembly queue */ - struct mbuf **tp_rsyq;/* unacked stuff recvd out of order */ + struct mbuf **tp_rsyq; /* unacked stuff recvd out of order */ int tp_rsycnt; /* number of packets "" "" "" "" */ u_long tp_rhiwat; /* remember original RCVBUF size */ @@ -244,11 +261,11 @@ struct tp_pcb { * the size we'll use when sending, in # chars */ - int tp_rtv; /* max round-trip time variance */ - int tp_rtt; /* smoothed round-trip time */ + int tp_rtv; /* max round-trip time variance */ + int tp_rtt; /* smoothed round-trip time */ SeqNum tp_rttseq; /* packet being timed */ int tp_rttemit; /* when emitted, in ticks */ - int tp_idle;/* last activity, in ticks */ + int tp_idle; /* last activity, in ticks */ short tp_rxtcur; /* current retransmit value */ short tp_rxtshift; /* log(2) of rexmt exp. backoff */ u_char tp_cebit_off; /* real DEC bit algorithms not in use */ @@ -297,7 +314,7 @@ struct tp_pcb { #define SHORT_FSUFXP(tpcb) ((short *)((tpcb)->tp_fsuffix)) /* Timer stuff */ - u_char tp_vers;/* protocol version */ + u_char tp_vers; /* protocol version */ u_char tp_peer_acktime; /* used for DT retrans time */ u_char tp_refstate; /* values REF_FROZEN, etc. above */ struct tp_pcb *tp_fasttimeo; /* limit pcbs to examine */ diff --git a/sys/sys/device.h b/sys/sys/device.h index 78618aad39b..fe913dd4a18 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -1,4 +1,4 @@ -/* $OpenBSD: device.h,v 1.22 2002/03/14 03:16:12 millert Exp $ */ +/* $OpenBSD: device.h,v 1.23 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: device.h,v 1.15 1996/04/09 20:55:24 cgd Exp $ */ /* @@ -110,7 +110,7 @@ struct cfdata { int cf_flags; /* flags from config */ short *cf_parents; /* potential parents */ int cf_locnames; /* start of names */ - void (**cf_ivstubs) /* config-generated vectors, if any */(void); + void (**cf_ivstubs)(void); /* config-generated vectors, if any */ short cf_starunit1; /* 1st usable unit number by STAR */ }; extern struct cfdata cfdata[]; diff --git a/sys/sys/domain.h b/sys/sys/domain.h index 4a8693dc467..50984e2aac4 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -1,4 +1,4 @@ -/* $OpenBSD: domain.h,v 1.3 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: domain.h,v 1.4 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: domain.h,v 1.10 1996/02/09 18:25:07 christos Exp $ */ /* @@ -48,12 +48,15 @@ struct mbuf; struct domain { int dom_family; /* AF_xxx */ char *dom_name; - void (*dom_init) /* initialize domain data structures */(void); - int (*dom_externalize) /* externalize access rights */(struct mbuf *); - void (*dom_dispose) /* dispose of internalized rights */(struct mbuf *); + void (*dom_init)(void); /* initialize domain data structures */ + /* externalize access rights */ + int (*dom_externalize)(struct mbuf *); + /* dispose of internalized rights */ + void (*dom_dispose)(struct mbuf *); struct protosw *dom_protosw, *dom_protoswNPROTOSW; struct domain *dom_next; - int (*dom_rtattach) /* initialize routing table */(void **, int); + /* initialize routing table */ + int (*dom_rtattach)(void **, int); int dom_rtoffset; /* an arg to rtattach, in bits */ int dom_maxrtkey; /* for routing layer */ }; diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 1091cdc2378..9eecf486b38 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.59 2002/03/14 03:16:12 millert Exp $ */ +/* $OpenBSD: mbuf.h,v 1.60 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -90,7 +90,8 @@ struct pkthdr { /* description of external storage mapped into mbuf, valid if M_EXT set */ struct m_ext { caddr_t ext_buf; /* start of buffer */ - void (*ext_free) /* free routine if not the usual */(caddr_t, u_int, void *); + /* free routine if not the usual */ + void (*ext_free)(caddr_t, u_int, void *); void *ext_arg; /* argument for ext_free */ u_int ext_size; /* size of buffer, for ext_free */ int ext_type; diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 09cfe8e2533..aa3a170b329 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.h,v 1.45 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: mount.h,v 1.46 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */ /* @@ -566,8 +566,11 @@ extern CIRCLEQ_HEAD(mntlist, mount) mountlist; extern struct simplelock mountlist_slock; struct mount *getvfs(fsid_t *); /* return vfs given fsid */ -int vfs_export /* process mount export info */(struct mount *, struct netexport *, struct export_args *); -struct netcred *vfs_export_lookup /* lookup host in fs export list */(struct mount *, struct netexport *, struct mbuf *); + /* process mount export info */ +int vfs_export(struct mount *, struct netexport *, struct export_args *); + /* lookup host in fs export list */ +struct netcred *vfs_export_lookup(struct mount *, struct netexport *, + struct mbuf *); int vfs_allocate_syncvnode(struct mount *); int speedup_syncer(void); diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index 72b7d3de38f..bf5c9639cf9 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: protosw.h,v 1.7 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: protosw.h,v 1.8 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: protosw.h,v 1.10 1996/04/09 20:55:32 cgd Exp $ */ /*- @@ -71,22 +71,27 @@ struct protosw { short pr_flags; /* see below */ /* protocol-protocol hooks */ - void (*pr_input) /* input to protocol (from below) */(struct mbuf *, ...); - int (*pr_output) /* output to protocol (from above) */(struct mbuf *, ...); - void *(*pr_ctlinput) /* control input (from below) */(int, struct sockaddr *, void *); - int (*pr_ctloutput) /* control output (from above) */(int, struct socket *, int, int, struct mbuf **); + /* input to protocol (from below) */ + void (*pr_input)(struct mbuf *, ...); + /* output to protocol (from above) */ + int (*pr_output)(struct mbuf *, ...); + /* control input (from below) */ + void *(*pr_ctlinput)(int, struct sockaddr *, void *); + /* control output (from above) */ + int (*pr_ctloutput)(int, struct socket *, int, int, struct mbuf **); /* user-protocol hook */ - int (*pr_usrreq) /* user request: see list below */(struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *); + /* user request: see list below */ + int (*pr_usrreq)(struct socket *, int, struct mbuf *, + struct mbuf *, struct mbuf *); /* utility hooks */ - void (*pr_init) /* initialization hook */(void); - - void (*pr_fasttimo) /* fast timeout (200ms) */(void); - void (*pr_slowtimo) /* slow timeout (500ms) */(void); - void (*pr_drain) /* flush any excess space possible */(void); - int (*pr_sysctl) /* sysctl for protocol */(int *, u_int, void *, size_t *, void *, size_t); + void (*pr_init)(void); /* initialization hook */ + void (*pr_fasttimo)(void); /* fast timeout (200ms) */ + void (*pr_slowtimo)(void); /* slow timeout (500ms) */ + void (*pr_drain)(void); /* flush any excess space possible */ + /* sysctl for protocol */ + int (*pr_sysctl)(int *, u_int, void *, size_t *, void *, size_t); }; #define PR_SLOWHZ 2 /* 2 slow timeouts per second */ diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 1d7099139ee..45db9bced8d 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.12 2002/03/14 03:16:12 millert Exp $ */ +/* $OpenBSD: signal.h,v 1.13 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: signal.h,v 1.21 1996/02/09 18:25:32 christos Exp $ */ /* @@ -168,14 +168,14 @@ struct sigaltstack { * Signal vector "template" used in sigvec call. */ struct sigvec { - void (*sv_handler)(int); /* signal handler */ + void (*sv_handler)(int); /* signal handler */ int sv_mask; /* signal mask to apply */ int sv_flags; /* see signal options below */ }; #define SV_ONSTACK SA_ONSTACK #define SV_INTERRUPT SA_RESTART /* same bit, opposite sense */ #define SV_RESETHAND SA_RESETHAND -#define sv_onstack sv_flags /* isn't compatibility wonderful! */ +#define sv_onstack sv_flags /* isn't compatibility wonderful! */ /* * Structure used in sigstack call. diff --git a/sys/uvm/uvm_amap.h b/sys/uvm/uvm_amap.h index ab009d36861..1c7c2193b4a 100644 --- a/sys/uvm/uvm_amap.h +++ b/sys/uvm/uvm_amap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_amap.h,v 1.11 2002/03/14 01:27:18 millert Exp $ */ +/* $OpenBSD: uvm_amap.h,v 1.12 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: uvm_amap.h,v 1.14 2001/02/18 21:19:08 chs Exp $ */ /* @@ -81,35 +81,45 @@ struct vm_amap; * prototypes for the amap interface */ -AMAP_INLINE -void amap_add /* add an anon to an amap */(struct vm_aref *, vaddr_t, - struct vm_anon *, boolean_t); -struct vm_amap *amap_alloc /* allocate a new amap */(vaddr_t, vaddr_t, int); -void amap_copy /* clear amap needs-copy flag */(vm_map_t, vm_map_entry_t, int, - boolean_t, vaddr_t, vaddr_t); -void amap_cow_now /* resolve all COW faults now */(vm_map_t, vm_map_entry_t); -void amap_extend /* make amap larger */(vm_map_entry_t, vsize_t); -int amap_flags /* get amap's flags */(struct vm_amap *); -void amap_free /* free amap */(struct vm_amap *); -void amap_init /* init amap module (at boot time) */(void); -void amap_lock /* lock amap */(struct vm_amap *); -AMAP_INLINE -struct vm_anon *amap_lookup /* lookup an anon @ offset in amap */(struct vm_aref *, vaddr_t); -AMAP_INLINE -void amap_lookups /* lookup multiple anons */(struct vm_aref *, vaddr_t, - struct vm_anon **, int); -AMAP_INLINE -void amap_ref /* add a reference to an amap */(struct vm_amap *, vaddr_t, vsize_t, int); -int amap_refs /* get number of references of amap */(struct vm_amap *); -void amap_share_protect /* protect pages in a shared amap */(vm_map_entry_t, vm_prot_t); -void amap_splitref /* split reference to amap into two */(struct vm_aref *, struct vm_aref *, - vaddr_t); -AMAP_INLINE -void amap_unadd /* remove an anon from an amap */(struct vm_aref *, vaddr_t); -void amap_unlock /* unlock amap */(struct vm_amap *); -AMAP_INLINE -void amap_unref /* drop reference to an amap */(struct vm_amap *, vaddr_t, vsize_t, int); -void amap_wipeout /* remove all anons from amap */(struct vm_amap *); +AMAP_INLINE /* add an anon to an amap */ +void amap_add(struct vm_aref *, vaddr_t, struct vm_anon *, boolean_t); + /* allocate a new amap */ +struct vm_amap *amap_alloc(vaddr_t, vaddr_t, int); + /* clear amap needs-copy flag */ +void amap_copy(vm_map_t, vm_map_entry_t, int, boolean_t, vaddr_t, + vaddr_t); + /* resolve all COW faults now */ +void amap_cow_now(vm_map_t, vm_map_entry_t); + /* make amap larger */ +void amap_extend(vm_map_entry_t, vsize_t); + /* get amap's flags */ +int amap_flags(struct vm_amap *); + /* free amap */ +void amap_free(struct vm_amap *); + /* init amap module (at boot time) */ +void amap_init(void); + /* lock amap */ +void amap_lock(struct vm_amap *); +AMAP_INLINE /* lookup an anon @ offset in amap */ +struct vm_anon *amap_lookup(struct vm_aref *, vaddr_t); +AMAP_INLINE /* lookup multiple anons */ +void amap_lookups(struct vm_aref *, vaddr_t, struct vm_anon **, int); +AMAP_INLINE /* add a reference to an amap */ +void amap_ref(struct vm_amap *, vaddr_t, vsize_t, int); + /* get number of references of amap */ +int amap_refs(struct vm_amap *); + /* protect pages in a shared amap */ +void amap_share_protect(vm_map_entry_t, vm_prot_t); + /* split reference to amap into two */ +void amap_splitref(struct vm_aref *, struct vm_aref *, vaddr_t); +AMAP_INLINE /* remove an anon from an amap */ +void amap_unadd(struct vm_aref *, vaddr_t); + /* unlock amap */ +void amap_unlock(struct vm_amap *); +AMAP_INLINE /* drop reference to an amap */ +void amap_unref(struct vm_amap *, vaddr_t, vsize_t, int); + /* remove all anons from amap */ +void amap_wipeout(struct vm_amap *); /* * amap flag values @@ -252,9 +262,12 @@ struct vm_amap { #define PPREF_NONE ((int *) -1) /* not using ppref */ -void amap_pp_adjref /* adjust references */(struct vm_amap *, int, vsize_t, int); -void amap_pp_establish /* establish ppref */(struct vm_amap *); -void amap_wiperange /* wipe part of an amap */(struct vm_amap *, int, int); + /* adjust references */ +void amap_pp_adjref(struct vm_amap *, int, vsize_t, int); + /* establish ppref */ +void amap_pp_establish(struct vm_amap *); + /* wipe part of an amap */ +void amap_wiperange(struct vm_amap *, int, int); #endif /* UVM_AMAP_PPREF */ #endif /* _KERNEL */ diff --git a/sys/uvm/uvm_pager.h b/sys/uvm/uvm_pager.h index 054f19ba4ff..512eefdfd96 100644 --- a/sys/uvm/uvm_pager.h +++ b/sys/uvm/uvm_pager.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_pager.h,v 1.18 2002/03/14 01:27:18 millert Exp $ */ +/* $OpenBSD: uvm_pager.h,v 1.19 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: uvm_pager.h,v 1.20 2000/11/27 08:40:05 chs Exp $ */ /* @@ -87,23 +87,34 @@ */ struct uvm_pagerops { - void (*pgo_init)(void);/* init pager */ - void (*pgo_reference) /* add reference to obj */(struct uvm_object *); - void (*pgo_detach) /* drop reference to obj */(struct uvm_object *); - int (*pgo_fault) /* special nonstd fault fn */(struct uvm_faultinfo *, vaddr_t, + /* init pager */ + void (*pgo_init)(void); + /* add reference to obj */ + void (*pgo_reference)(struct uvm_object *); + /* drop reference to obj */ + void (*pgo_detach)(struct uvm_object *); + /* special nonstd fault fn */ + int (*pgo_fault)(struct uvm_faultinfo *, vaddr_t, vm_page_t *, int, int, vm_fault_t, vm_prot_t, int); - boolean_t (*pgo_flush) /* flush pages out of obj */(struct uvm_object *, voff_t, voff_t, int); - int (*pgo_get) /* get/read page */(struct uvm_object *, voff_t, + /* flush pages out of obj */ + boolean_t (*pgo_flush)(struct uvm_object *, voff_t, + voff_t, int); + /* get/read page */ + int (*pgo_get)(struct uvm_object *, voff_t, vm_page_t *, int *, int, vm_prot_t, int, int); - int (*pgo_put) /* put/write page */(struct uvm_object *, vm_page_t *, + /* put/write page */ + int (*pgo_put)(struct uvm_object *, vm_page_t *, int, boolean_t); - void (*pgo_cluster) /* return range of cluster */(struct uvm_object *, voff_t, voff_t *, - voff_t *); - struct vm_page ** (*pgo_mk_pcluster) /* make "put" cluster */(struct uvm_object *, struct vm_page **, - int *, struct vm_page *, int, voff_t, - voff_t); - boolean_t (*pgo_releasepg) /* release page */(struct vm_page *, struct vm_page **); + /* return range of cluster */ + void (*pgo_cluster)(struct uvm_object *, voff_t, + voff_t *, voff_t *); + /* make "put" cluster */ + struct vm_page ** (*pgo_mk_pcluster)(struct uvm_object *, + struct vm_page **, int *, struct vm_page *, + int, voff_t, voff_t); + /* release page */ + boolean_t (*pgo_releasepg)(struct vm_page *, struct vm_page **); }; /* pager flags [mostly for flush] */ |