From 53524e44efd7c7176da8dc8190a698b2fe184db1 Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 4 Mar 2007 05:59:00 +0000 Subject: Kill caddr_t; there will be some MI fallout, but it will be fixed shortly. --- sys/dev/raidframe/rf_diskqueue.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev/raidframe/rf_diskqueue.h') diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h index cef1e8ef889..5e6c95ec7e8 100644 --- a/sys/dev/raidframe/rf_diskqueue.h +++ b/sys/dev/raidframe/rf_diskqueue.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_diskqueue.h,v 1.21 2005/12/11 12:23:37 christos Exp $ */ +/* $NetBSD: rf_diskqueue.h,v 1.22 2007/03/04 06:02:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -57,7 +57,7 @@ struct RF_DiskQueueData_s { RF_SectorNum_t sectorOffset; /* sector offset into the disk */ RF_SectorCount_t numSector; /* number of sectors to read/write */ RF_IoType_t type; /* read/write/nop */ - caddr_t buf; /* buffer pointer */ + void *buf; /* buffer pointer */ RF_StripeNum_t parityStripeID; /* the RAID parity stripe ID this * access is for */ RF_ReconUnitNum_t which_ru; /* which RU within this parity stripe */ @@ -154,7 +154,7 @@ void rf_DiskIOEnqueue(RF_DiskQueue_t *, RF_DiskQueueData_t *, int); void rf_DiskIOComplete(RF_DiskQueue_t *, RF_DiskQueueData_t *, int); int rf_DiskIOPromote(RF_DiskQueue_t *, RF_StripeNum_t, RF_ReconUnitNum_t); RF_DiskQueueData_t *rf_CreateDiskQueueData(RF_IoType_t, RF_SectorNum_t, - RF_SectorCount_t , caddr_t, + RF_SectorCount_t , void *, RF_StripeNum_t, RF_ReconUnitNum_t, int (*wakeF) (void *, int), void *, -- cgit