diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/raidframe/rf_ccmn.h | 115 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_debugMem.h | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_diskqueue.c | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 9 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_etimer.h | 9 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_fifo.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_geniq.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_layout.h | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_optnames.h | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_pq.c | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_raid.h | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_states.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_sys.c | 51 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_sys.h | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_threadid.h | 4 |
16 files changed, 38 insertions, 202 deletions
diff --git a/sys/dev/raidframe/rf_ccmn.h b/sys/dev/raidframe/rf_ccmn.h deleted file mode 100644 index f13778c0cd4..00000000000 --- a/sys/dev/raidframe/rf_ccmn.h +++ /dev/null @@ -1,115 +0,0 @@ -/* $OpenBSD: rf_ccmn.h,v 1.1 1999/01/11 14:29:01 niklas Exp $ */ -/* $NetBSD: rf_ccmn.h,v 1.1 1998/11/13 04:20:26 oster Exp $ */ -/* - * Copyright (c) 1995 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Mark Holland - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -/* rf_ccmn.h - * header file that declares the ccmn routines, and includes - * the files needed to use them. - */ - -/* : - * Log: rf_ccmn.h,v - * Revision 1.4 1996/07/18 22:57:14 jimz - * port simulator to AIX - * - * Revision 1.3 1996/05/23 21:46:35 jimz - * checkpoint in code cleanup (release prep) - * lots of types, function names have been fixed - * - * Revision 1.2 1995/12/01 15:16:45 root - * added copyright info - * - */ - -#ifndef _RF__RF_CCMN_H_ -#define _RF__RF_CCMN_H_ - -#ifdef __osf__ -#include <sys/errno.h> -#include <sys/types.h> -#include <sys/file.h> -#include <sys/param.h> -#include <sys/uio.h> -#include <sys/time.h> -#include <sys/buf.h> -#include <sys/ioctl.h> -#include <io/common/iotypes.h> -#include <io/cam/cam_debug.h> -#include <io/cam/cam.h> -#include <io/cam/dec_cam.h> -#include <io/cam/uagt.h> -#include <io/cam/scsi_all.h> -#include <io/cam/scsi_direct.h> - -#ifdef KERNEL -#include <sys/conf.h> -#include <sys/mtio.h> -#include <io/common/devio.h> -#include <io/common/devdriver.h> -#include <io/cam/scsi_status.h> -#include <io/cam/pdrv.h> -#include <io/common/pt.h> -#include <sys/disklabel.h> -#include <io/cam/cam_disk.h> -#include <io/cam/ccfg.h> - -extern void ccmn_init(); -extern long ccmn_open_unit(); -extern void ccmn_close_unit(); -extern u_long ccmn_send_ccb(); -extern void ccmn_rem_ccb(); -extern void ccmn_abort_que(); -extern void ccmn_term_que(); -extern CCB_HEADER *ccmn_get_ccb(); -extern void ccmn_rel_ccb(); -extern CCB_SCSIIO *ccmn_io_ccb_bld(); -extern CCB_GETDEV *ccmn_gdev_ccb_bld(); -extern CCB_SETDEV *ccmn_sdev_ccb_bld(); -extern CCB_SETASYNC *ccmn_sasy_ccb_bld(); -extern CCB_RELSIM *ccmn_rsq_ccb_bld(); -extern CCB_PATHINQ *ccmn_pinq_ccb_bld(); -extern CCB_ABORT *ccmn_abort_ccb_bld(); -extern CCB_TERMIO *ccmn_term_ccb_bld(); -extern CCB_RESETDEV *ccmn_bdr_ccb_bld(); -extern CCB_RESETBUS *ccmn_br_ccb_bld(); -extern CCB_SCSIIO *ccmn_tur(); -extern CCB_SCSIIO *ccmn_mode_select(); -extern u_long ccmn_ccb_status(); -extern struct buf *ccmn_get_bp(); -extern void ccmn_rel_bp(); -extern u_char *ccmn_get_dbuf(); -extern void ccmn_rel_dbuf(); - -extern struct device *camdinfo[]; -extern struct controller *camminfo[]; -extern PDRV_UNIT_ELEM pdrv_unit_table[]; - -#endif /* KERNEL */ -#endif /* __osf__ */ - -#endif /* !_RF__RF_CCMN_H_ */ diff --git a/sys/dev/raidframe/rf_debugMem.h b/sys/dev/raidframe/rf_debugMem.h index 133c3acc91c..392fcf0b82f 100644 --- a/sys/dev/raidframe/rf_debugMem.h +++ b/sys/dev/raidframe/rf_debugMem.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_debugMem.h,v 1.2 1999/02/16 00:02:34 niklas Exp $ */ +/* $OpenBSD: rf_debugMem.h,v 1.3 1999/08/04 13:10:54 peter Exp $ */ /* $NetBSD: rf_debugMem.h,v 1.4 1999/02/05 00:06:08 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -83,7 +83,7 @@ RF_DECLARE_EXTERN_MUTEX(rf_debug_mem_mutex) rf_real_Free(__p_, _sz_, __LINE__, __FILE__); \ } -#else /* KERNEL */ +#else /* _KERNEL */ #include <sys/types.h> typedef u_int32_t U32; diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c index d050089d166..973b511b3d5 100644 --- a/sys/dev/raidframe/rf_diskqueue.c +++ b/sys/dev/raidframe/rf_diskqueue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_diskqueue.c,v 1.3 1999/07/30 14:45:32 peter Exp $ */ +/* $OpenBSD: rf_diskqueue.c,v 1.4 1999/08/04 13:10:54 peter Exp $ */ /* $NetBSD: rf_diskqueue.c,v 1.7 1999/06/04 01:51:00 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -148,7 +148,7 @@ static RF_DiskQueueSW_t diskqueuesw[] = { rf_RandomDequeue, rf_RandomPeek, rf_FifoPromote}, -#endif /* !KERNEL && RF_INCLUDE_QUEUE_RANDOM > 0 */ +#endif /* !_KERNEL && RF_INCLUDE_QUEUE_RANDOM > 0 */ }; #define NUM_DISK_QUEUE_TYPES (sizeof(diskqueuesw)/sizeof(RF_DiskQueueSW_t)) diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 887d16d44c2..683ad4ee29f 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_driver.c,v 1.4 1999/08/03 13:56:37 peter Exp $ */ +/* $OpenBSD: rf_driver.c,v 1.5 1999/08/04 13:10:54 peter Exp $ */ /* $NetBSD: rf_driver.c,v 1.12 1999/07/19 01:36:07 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -441,7 +441,6 @@ rf_Configure(raidPtr, cfgPtr) rf_clear_debug_print_buffer(); DO_INIT_CONFIGURE(rf_ConfigureAllocList); - DO_INIT_CONFIGURE(rf_ConfigureEtimer); /* * Yes, this does make debugging general to the whole system instead * of being array specific. Bummer, drag. @@ -746,14 +745,14 @@ bp_in is a buf pointer. void * to facilitate ignoring it outside the kernel IO_BUF_ERR(bp, EINVAL, raidPtr->raidid); return (EINVAL); } -#if defined(KERNEL) && DFSTRACE > 0 +#if defined(_KERNEL) && DFSTRACE > 0 if (rf_DFSTraceAccesses) { dfsrecord.raidAddr = raidAddress; dfsrecord.numBlocks = numBlocks; dfsrecord.type = type; dfs_log(DFS_NOTE, (char *) &dfsrecord, sizeof(dfsrecord), 0); } -#endif /* KERNEL && DFSTRACE > 0 */ +#endif /* _KERNEL && DFSTRACE > 0 */ rf_get_threadid(tid); if (rf_accessDebug) { @@ -1026,7 +1025,7 @@ rf_PrintThroughputStats(RF_Raid_t * raidPtr) / (raidPtr->throughputstats.sum_io_us / 1000000.0)); } } -#endif /* !KERNEL && !SIMULATE */ +#endif /* !_KERNEL && !SIMULATE */ void rf_StartUserStats(RF_Raid_t * raidPtr) diff --git a/sys/dev/raidframe/rf_etimer.h b/sys/dev/raidframe/rf_etimer.h index 826744a316f..4ed503f4ec2 100644 --- a/sys/dev/raidframe/rf_etimer.h +++ b/sys/dev/raidframe/rf_etimer.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_etimer.h,v 1.3 1999/08/03 13:56:37 peter Exp $ */ +/* $OpenBSD: rf_etimer.h,v 1.4 1999/08/04 13:10:54 peter Exp $ */ /* $NetBSD: rf_etimer.h,v 1.3 1999/02/05 00:06:11 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -30,11 +30,11 @@ #ifndef _RF__RF_TIMER_H_ #define _RF__RF_TIMER_H_ + #include "rf_options.h" #include "rf_utils.h" #include <sys/time.h> -#include <sys/kernel.h> struct RF_Etimer_s { struct timeval st; @@ -42,6 +42,9 @@ struct RF_Etimer_s { struct timeval diff; }; +#if defined(_KERNEL) +#include <sys/kernel.h> + #define RF_ETIMER_START(_t_) \ { \ int s; \ @@ -67,4 +70,6 @@ struct RF_Etimer_s { #define RF_ETIMER_VAL_US(_t_) (RF_TIMEVAL_TO_US((_t_).diff)) #define RF_ETIMER_VAL_MS(_t_) (RF_TIMEVAL_TO_US((_t_).diff)/1000) +#endif /* _KERNEL */ + #endif /* !_RF__RF_TIMER_H_ */ diff --git a/sys/dev/raidframe/rf_fifo.c b/sys/dev/raidframe/rf_fifo.c index 5c5c35af41b..317f3887a27 100644 --- a/sys/dev/raidframe/rf_fifo.c +++ b/sys/dev/raidframe/rf_fifo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_fifo.c,v 1.2 1999/02/16 00:02:46 niklas Exp $ */ +/* $OpenBSD: rf_fifo.c,v 1.3 1999/08/04 13:10:54 peter Exp $ */ /* $NetBSD: rf_fifo.c,v 1.3 1999/02/05 00:06:11 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -182,7 +182,7 @@ n_in_q(headp, tailp, countp, n, deq) } #endif -#if !defined(KERNEL) && RF_INCLUDE_QUEUE_RANDOM > 0 +#if !defined(_KERNEL) && RF_INCLUDE_QUEUE_RANDOM > 0 RF_DiskQueueData_t * rf_RandomPeek(q_in) void *q_in; @@ -233,7 +233,7 @@ rf_RandomDequeue(q_in) RF_ASSERT((q->hq_count + q->lq_count) == (req->queue->queueLength - 1)); return (req); } -#endif /* !KERNEL && RF_INCLUDE_QUEUE_RANDOM > 0 */ +#endif /* !_KERNEL && RF_INCLUDE_QUEUE_RANDOM > 0 */ /* Return ptr to item at head of queue. Used to examine request * info without actually dequeueing the request. diff --git a/sys/dev/raidframe/rf_geniq.c b/sys/dev/raidframe/rf_geniq.c index 41c190028ef..050adf7372b 100644 --- a/sys/dev/raidframe/rf_geniq.c +++ b/sys/dev/raidframe/rf_geniq.c @@ -120,11 +120,11 @@ main() /* generate the inverse tables. (i,j,p,q) */ /* The table just stores a. Get b back from the parity */ - printf("#ifdef KERNEL\n"); + printf("#ifdef _KERNEL\n"); printf("RF_ua1024_t rf_qinv[1]; /* don't compile monster table into kernel */\n"); printf("#elif defined(NO_PQ)\n"); printf("RF_ua1024_t rf_qinv[29*29];\n"); - printf("#else /* !KERNEL && NO_PQ */\n"); + printf("#else /* !_KERNEL && NO_PQ */\n"); printf("RF_ua1024_t rf_qinv[29*29] = {\n"); for (i = 0; i < 29; i++) { for (j = 0; j < 29; j++) { @@ -156,7 +156,7 @@ main() } printf("};\n"); printf("\n#endif /* (RF_INCLUDE_PQ > 0) || (RF_INCLUDE_RAID6 > 0) */\n\n"); - printf("#endif /* !KERNEL && NO_PQ */\n"); + printf("#endif /* !_KERNEL && NO_PQ */\n"); printf("#endif /* !_RF__RF_INVERTQ_H_ */\n"); exit(0); } diff --git a/sys/dev/raidframe/rf_layout.h b/sys/dev/raidframe/rf_layout.h index 5dcf56cc0df..d2b7cbc7c2a 100644 --- a/sys/dev/raidframe/rf_layout.h +++ b/sys/dev/raidframe/rf_layout.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_layout.h,v 1.2 1999/02/16 00:02:54 niklas Exp $ */ +/* $OpenBSD: rf_layout.h,v 1.3 1999/08/04 13:10:54 peter Exp $ */ /* $NetBSD: rf_layout.h,v 1.3 1999/02/05 00:06:12 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -55,7 +55,7 @@ typedef struct RF_LayoutSW_s { /* layout-specific parsing */ int (*MakeLayoutSpecific) (FILE * fp, RF_Config_t * cfgPtr, void *arg); void *makeLayoutSpecificArg; -#endif /* !KERNEL */ +#endif /* !_KERNEL */ #if RF_UTILITY == 0 /* initialization routine */ diff --git a/sys/dev/raidframe/rf_optnames.h b/sys/dev/raidframe/rf_optnames.h index dc7c67d558c..82ee3434d96 100644 --- a/sys/dev/raidframe/rf_optnames.h +++ b/sys/dev/raidframe/rf_optnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_optnames.h,v 1.2 1999/02/16 00:03:03 niklas Exp $ */ +/* $OpenBSD: rf_optnames.h,v 1.3 1999/08/04 13:10:55 peter Exp $ */ /* $NetBSD: rf_optnames.h,v 1.4 1999/02/05 00:06:13 oster Exp $ */ /* * rf_optnames.h @@ -113,7 +113,7 @@ RF_DBG_OPTION(interactiveScript, 0) /* set as a debug option for now */ RF_DBG_OPTION(looptestShowWrites, 0) /* user-level loop test write * debugging */ RF_DBG_OPTION(traceDebug, 0) -#endif /* !KERNEL */ +#endif /* !_KERNEL */ #if RF_INCLUDE_PARITYLOGGING > 0 RF_DBG_OPTION(forceParityLogReint, 0) diff --git a/sys/dev/raidframe/rf_pq.c b/sys/dev/raidframe/rf_pq.c index 654930901bd..0ec2a6e96ce 100644 --- a/sys/dev/raidframe/rf_pq.c +++ b/sys/dev/raidframe/rf_pq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_pq.c,v 1.2 1999/02/16 00:03:09 niklas Exp $ */ +/* $OpenBSD: rf_pq.c,v 1.3 1999/08/04 13:10:55 peter Exp $ */ /* $NetBSD: rf_pq.c,v 1.3 1999/02/05 00:06:14 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -745,7 +745,7 @@ QDelta( /* PQ in kernel currently not supported because the encoding/decoding * table is not present */ bzero(dest, length); -#else /* KERNEL */ +#else /* _KERNEL */ /* this code probably doesn't work and should be rewritten -wvcii */ /* 13 5 bit quants in a 64 bit word */ length /= 8; diff --git a/sys/dev/raidframe/rf_raid.h b/sys/dev/raidframe/rf_raid.h index 36b4e806b07..dc106a9e767 100644 --- a/sys/dev/raidframe/rf_raid.h +++ b/sys/dev/raidframe/rf_raid.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_raid.h,v 1.3 1999/07/30 14:45:33 peter Exp $ */ +/* $OpenBSD: rf_raid.h,v 1.4 1999/08/04 13:10:55 peter Exp $ */ /* $NetBSD: rf_raid.h,v 1.6 1999/07/08 00:45:24 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -179,7 +179,7 @@ struct RF_Raid_s { */ #if !defined(_KERNEL) && !defined(SIMULATE) RF_ThroughputStats_t throughputstats; -#endif /* !KERNEL && !SIMULATE */ +#endif /* !_KERNEL && !SIMULATE */ RF_CumulativeStats_t userstats; /* diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c index a1263674809..7debdac2ade 100644 --- a/sys/dev/raidframe/rf_reconstruct.c +++ b/sys/dev/raidframe/rf_reconstruct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_reconstruct.c,v 1.4 1999/08/03 13:56:37 peter Exp $ */ +/* $OpenBSD: rf_reconstruct.c,v 1.5 1999/08/04 13:10:55 peter Exp $ */ /* $NetBSD: rf_reconstruct.c,v 1.5 1999/03/02 03:18:49 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -258,9 +258,9 @@ rf_FreeReconDesc(reconDesc) printf("RAIDframe: %qu max exec uSec\n", reconDesc->maxReconExecuSecs); -#if (RF_RECON_STATS > 0) || defined(KERNEL) +#if (RF_RECON_STATS > 0) || defined(_KERNEL) printf("\n"); -#endif /* (RF_RECON_STATS > 0) || KERNEL */ +#endif /* (RF_RECON_STATS > 0) || _KERNEL */ RF_FREELIST_FREE(rf_recond_freelist, reconDesc, next); } diff --git a/sys/dev/raidframe/rf_states.c b/sys/dev/raidframe/rf_states.c index 4f8b39f07ad..c183945b0d2 100644 --- a/sys/dev/raidframe/rf_states.c +++ b/sys/dev/raidframe/rf_states.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_states.c,v 1.3 1999/07/30 14:45:33 peter Exp $ */ +/* $OpenBSD: rf_states.c,v 1.4 1999/08/04 13:10:55 peter Exp $ */ /* $NetBSD: rf_states.c,v 1.7 1999/07/08 00:45:24 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -44,13 +44,13 @@ #include "rf_map.h" #include "rf_etimer.h" -#if defined(KERNEL) && (DKUSAGE > 0) +#if defined(_KERNEL) && (DKUSAGE > 0) #include <sys/dkusage.h> #include <io/common/iotypes.h> #include <io/cam/dec_cam.h> #include <io/cam/cam.h> #include <io/cam/pdrv.h> -#endif /* KERNEL && DKUSAGE > 0 */ +#endif /* _KERNEL && DKUSAGE > 0 */ /* prototypes for some of the available states. diff --git a/sys/dev/raidframe/rf_sys.c b/sys/dev/raidframe/rf_sys.c deleted file mode 100644 index 68d8465035e..00000000000 --- a/sys/dev/raidframe/rf_sys.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $OpenBSD: rf_sys.c,v 1.3 1999/08/03 13:56:38 peter Exp $ */ -/* $NetBSD: rf_sys.c,v 1.3 1999/02/05 00:06:18 oster Exp $ */ -/* - * rf_sys.c - * - * Jim Zelenka, CMU/SCS, 14 June 1996 - */ -/* - * Copyright (c) 1996 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Jim Zelenka - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -#include "rf_types.h" -#include "rf_sys.h" -#include <sys/param.h> -#include <sys/time.h> -#include "rf_etimer.h" -#include "rf_general.h" -#include "rf_threadstuff.h" - -extern struct rpb *rpb; - - -int -rf_ConfigureEtimer(listp) - RF_ShutdownList_t **listp; -{ - return (0); -} diff --git a/sys/dev/raidframe/rf_sys.h b/sys/dev/raidframe/rf_sys.h index 72a9bf65d05..290e43c54a8 100644 --- a/sys/dev/raidframe/rf_sys.h +++ b/sys/dev/raidframe/rf_sys.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_sys.h,v 1.2 1999/02/16 00:03:31 niklas Exp $ */ +/* $OpenBSD: rf_sys.h,v 1.3 1999/08/04 13:10:55 peter Exp $ */ /* $NetBSD: rf_sys.h,v 1.3 1999/02/05 00:06:18 oster Exp $ */ /* * rf_sys.h @@ -37,6 +37,4 @@ #include "rf_types.h" -int rf_ConfigureEtimer(RF_ShutdownList_t ** listp); - #endif /* !_RF__RF_SYS_H_ */ diff --git a/sys/dev/raidframe/rf_threadid.h b/sys/dev/raidframe/rf_threadid.h index 39a5d26150d..f9ca8bb7599 100644 --- a/sys/dev/raidframe/rf_threadid.h +++ b/sys/dev/raidframe/rf_threadid.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_threadid.h,v 1.2 1999/02/16 00:03:31 niklas Exp $ */ +/* $OpenBSD: rf_threadid.h,v 1.3 1999/08/04 13:10:55 peter Exp $ */ /* $NetBSD: rf_threadid.h,v 1.3 1999/02/05 00:06:18 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -35,7 +35,7 @@ * This is one of two places where the pthreads package is used explicitly. * The other is in threadstuff.h * - * none of this is used in the kernel, so it all gets compiled out if KERNEL is defined + * none of this is used in the kernel, so it all gets compiled out if _KERNEL is defined */ #ifndef _RF__RF_THREADID_H_ |