Merge from NetBSD, mostly indentation

1 files changed, 24 insertions, 80 deletions

diff --git a/sys/dev/raidframe/rf_raid5.h b/sys/dev/raidframe/rf_raid5.h
index a6ffc971ca4..06eecda486e 100644
--- a/sys/dev/raidframe/rf_raid5.h
+++ b/sys/dev/raidframe/rf_raid5.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rf_raid5.h,v 1.1 1999/01/11 14:29:43 niklas Exp $	*/
-/*	$NetBSD: rf_raid5.h,v 1.1 1998/11/13 04:20:33 oster Exp $	*/
+/*	$OpenBSD: rf_raid5.h,v 1.2 1999/02/16 00:03:17 niklas Exp $	*/
+/*	$NetBSD: rf_raid5.h,v 1.3 1999/02/05 00:06:16 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,85 +29,29 @@
 
 /* rf_raid5.h - header file for RAID Level 5 */
 
-/*
- * :  
- * Log: rf_raid5.h,v 
- * Revision 1.15  1996/07/27 23:36:08  jimz
- * Solaris port of simulator
- *
- * Revision 1.14  1996/07/13  00:00:59  jimz
- * sanitized generalized reconstruction architecture
- * cleaned up head sep, rbuf problems
- *
- * Revision 1.13  1996/06/10  11:55:47  jimz
- * Straightened out some per-array/not-per-array distinctions, fixed
- * a couple bugs related to confusion. Added shutdown lists. Removed
- * layout shutdown function (now subsumed by shutdown lists).
- *
- * Revision 1.12  1996/06/07  22:26:27  jimz
- * type-ify which_ru (RF_ReconUnitNum_t)
- *
- * Revision 1.11  1996/06/07  21:33:04  jimz
- * begin using consistent types for sector numbers,
- * stripe numbers, row+col numbers, recon unit numbers
- *
- * Revision 1.10  1996/06/03  23:28:26  jimz
- * more bugfixes
- * check in tree to sync for IPDS runs with current bugfixes
- * there still may be a problem with threads in the script test
- * getting I/Os stuck- not trivially reproducible (runs ~50 times
- * in a row without getting stuck)
- *
- * Revision 1.9  1996/05/31  22:26:54  jimz
- * fix a lot of mapping problems, memory allocation problems
- * found some weird lock issues, fixed 'em
- * more code cleanup
- *
- * Revision 1.8  1996/05/27  18:56:37  jimz
- * more code cleanup
- * better typing
- * compiles in all 3 environments
- *
- * Revision 1.7  1996/05/24  01:59:45  jimz
- * another checkpoint in code cleanup for release
- * time to sync kernel tree
- *
- * Revision 1.6  1996/05/18  19:51:34  jimz
- * major code cleanup- fix syntax, make some types consistent,
- * add prototypes, clean out dead code, et cetera
- *
- * Revision 1.5  1995/12/06  15:04:35  root
- * added copyright info
- *
- * Revision 1.4  1995/11/17  19:09:08  wvcii
- * added prototyping to MapParity
- *
- * Revision 1.3  1995/11/07  15:25:40  wvcii
- * changed RAIDFiveDagSelect prototype
- * function no longer generates numHdrSucc, numTermAnt
- *
- * Revision 1.2  1995/06/23  13:37:53  robby
- * updeated to prototypes in rf_layout.h
- *
- */
-
 #ifndef _RF__RF_RAID5_H_
 #define _RF__RF_RAID5_H_
 
-int  rf_ConfigureRAID5(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
-	RF_Config_t *cfgPtr);
-int rf_GetDefaultNumFloatingReconBuffersRAID5(RF_Raid_t *raidPtr);
-RF_HeadSepLimit_t rf_GetDefaultHeadSepLimitRAID5(RF_Raid_t *raidPtr);
-void rf_MapSectorRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
-	RF_RowCol_t *row, RF_RowCol_t *col, RF_SectorNum_t *diskSector, int remap);
-void rf_MapParityRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
-	RF_RowCol_t *row, RF_RowCol_t *col, RF_SectorNum_t *diskSector, int remap);
-void rf_IdentifyStripeRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
-	RF_RowCol_t **diskids, RF_RowCol_t *outRow);
-void rf_MapSIDToPSIDRAID5(RF_RaidLayout_t *layoutPtr,
-	RF_StripeNum_t stripeID, RF_StripeNum_t *psID,
-	RF_ReconUnitNum_t *which_ru);
-void rf_RaidFiveDagSelect(RF_Raid_t *raidPtr, RF_IoType_t type,
-	RF_AccessStripeMap_t *asmap, RF_VoidFuncPtr *createFunc);
+int 
+rf_ConfigureRAID5(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr,
+    RF_Config_t * cfgPtr);
+int     rf_GetDefaultNumFloatingReconBuffersRAID5(RF_Raid_t * raidPtr);
+RF_HeadSepLimit_t rf_GetDefaultHeadSepLimitRAID5(RF_Raid_t * raidPtr);
+void 
+rf_MapSectorRAID5(RF_Raid_t * raidPtr, RF_RaidAddr_t raidSector,
+    RF_RowCol_t * row, RF_RowCol_t * col, RF_SectorNum_t * diskSector, int remap);
+void 
+rf_MapParityRAID5(RF_Raid_t * raidPtr, RF_RaidAddr_t raidSector,
+    RF_RowCol_t * row, RF_RowCol_t * col, RF_SectorNum_t * diskSector, int remap);
+void 
+rf_IdentifyStripeRAID5(RF_Raid_t * raidPtr, RF_RaidAddr_t addr,
+    RF_RowCol_t ** diskids, RF_RowCol_t * outRow);
+void 
+rf_MapSIDToPSIDRAID5(RF_RaidLayout_t * layoutPtr,
+    RF_StripeNum_t stripeID, RF_StripeNum_t * psID,
+    RF_ReconUnitNum_t * which_ru);
+void 
+rf_RaidFiveDagSelect(RF_Raid_t * raidPtr, RF_IoType_t type,
+    RF_AccessStripeMap_t * asmap, RF_VoidFuncPtr * createFunc);
 
-#endif /* !_RF__RF_RAID5_H_ */
+#endif				/* !_RF__RF_RAID5_H_ */