From 86cea5c5f192ce43ce1965d47aadd1f1f55c6e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 22 Jul 2008 00:45:25 +0000 Subject: [PATCH] * Renamed IOOperation::SetRequest() to Prepare(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26557 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/device_manager/IOScheduler.cpp | 2 +- src/system/kernel/device_manager/dma_resources.cpp | 2 +- src/system/kernel/device_manager/io_requests.cpp | 2 +- src/system/kernel/device_manager/io_requests.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/device_manager/IOScheduler.cpp b/src/system/kernel/device_manager/IOScheduler.cpp index 4e164884d6..46a4a562fb 100644 --- a/src/system/kernel/device_manager/IOScheduler.cpp +++ b/src/system/kernel/device_manager/IOScheduler.cpp @@ -202,7 +202,7 @@ IOScheduler::_Scheduler() // TODO: If the device has block size restrictions, we might need to use a // bounce buffer. IOOperation* operation = _GetOperation(); - operation->SetRequest(request); + operation->Prepare(request); operation->SetOriginalRange(request->Offset(), request->Length()); fIOCallback(fIOCallbackData, operation); } diff --git a/src/system/kernel/device_manager/dma_resources.cpp b/src/system/kernel/device_manager/dma_resources.cpp index 1037c54522..ef84eec97b 100644 --- a/src/system/kernel/device_manager/dma_resources.cpp +++ b/src/system/kernel/device_manager/dma_resources.cpp @@ -582,7 +582,7 @@ DMAResource::TranslateNext(IORequest* request, IOOperation* operation) operation->SetPartial(partialBegin != 0, offset + dmaLength > requestEnd); operation->SetUsesBounceBuffer(bounceLeft < fBounceBufferSize); - status_t error = operation->SetRequest(request); + status_t error = operation->Prepare(request); if (error != B_OK) return error; diff --git a/src/system/kernel/device_manager/io_requests.cpp b/src/system/kernel/device_manager/io_requests.cpp index 6e3db22ed5..f71eb2bbff 100644 --- a/src/system/kernel/device_manager/io_requests.cpp +++ b/src/system/kernel/device_manager/io_requests.cpp @@ -226,7 +226,7 @@ IOOperation::Finish() /*! Note: SetPartial() must be called first! */ status_t -IOOperation::SetRequest(IORequest* request) +IOOperation::Prepare(IORequest* request) { if (fParent != NULL) fParent->RemoveOperation(this); diff --git a/src/system/kernel/device_manager/io_requests.h b/src/system/kernel/device_manager/io_requests.h index 97c5239668..d1238ae439 100644 --- a/src/system/kernel/device_manager/io_requests.h +++ b/src/system/kernel/device_manager/io_requests.h @@ -100,7 +100,7 @@ public: bool Finish(); // returns true, if it can be recycled - status_t SetRequest(IORequest* request); + status_t Prepare(IORequest* request); void SetOriginalRange(off_t offset, size_t length); // also sets range void SetRange(off_t offset, size_t length);