* Fixed wrong indentation, and number of blank lines.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30367 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-04-24 12:13:22 +00:00
parent 9b65e90569
commit 8c8c904aca
5 changed files with 61 additions and 53 deletions
@@ -9,8 +9,10 @@
#include "ATAPrivate.h" #include "ATAPrivate.h"
ATAChannel::ATAChannel(device_node *node) ATAChannel::ATAChannel(device_node *node)
: fNode(node), :
fNode(node),
fChannelID(0), fChannelID(0),
fController(NULL), fController(NULL),
fCookie(NULL), fCookie(NULL),
@@ -11,7 +11,8 @@
ATADevice::ATADevice(ATAChannel *channel, uint8 index) ATADevice::ATADevice(ATAChannel *channel, uint8 index)
: fChannel(channel), :
fChannel(channel),
fRegisterMask(0), fRegisterMask(0),
fUseDMA(channel->UseDMA()), fUseDMA(channel->UseDMA()),
fDMAMode(0), fDMAMode(0),
@@ -63,8 +64,8 @@ ATADevice::SynchronizeCache(ATARequest *request)
return B_OK; return B_OK;
fRegisterMask = 0; fRegisterMask = 0;
fTaskFile.lba.command = fUse48Bits ? ATA_COMMAND_FLUSH_CACHE_EXT fTaskFile.lba.command
: ATA_COMMAND_FLUSH_CACHE; = fUse48Bits ? ATA_COMMAND_FLUSH_CACHE_EXT : ATA_COMMAND_FLUSH_CACHE;
request->SetTimeout(60 * 1000 * 1000); request->SetTimeout(60 * 1000 * 1000);
status_t result = fChannel->SendRequest(request, ATA_DEVICE_READY_REQUIRED); status_t result = fChannel->SendRequest(request, ATA_DEVICE_READY_REQUIRED);
@@ -320,15 +321,14 @@ ATADevice::SetFeature(int feature)
fTaskFile.write.command = ATA_COMMAND_SET_FEATURES; fTaskFile.write.command = ATA_COMMAND_SET_FEATURES;
fRegisterMask = ATA_MASK_FEATURES; fRegisterMask = ATA_MASK_FEATURES;
status_t result = fChannel->SendRequest(&request, status_t result = fChannel->SendRequest(&request, ATA_DEVICE_READY_REQUIRED);
ATA_DEVICE_READY_REQUIRED);
if (result != B_OK) { if (result != B_OK) {
TRACE_ERROR("sending set feature request failed\n"); TRACE_ERROR("sending set feature request failed\n");
return result; return result;
} }
result = fChannel->FinishRequest(&request, ATA_WAIT_FINISH result = fChannel->FinishRequest(&request,
| ATA_DEVICE_READY_REQUIRED, ATA_ERROR_ABORTED); ATA_WAIT_FINISH | ATA_DEVICE_READY_REQUIRED, ATA_ERROR_ABORTED);
if (result != B_OK) { if (result != B_OK) {
TRACE_ERROR("set feature request failed\n"); TRACE_ERROR("set feature request failed\n");
return result; return result;
@@ -469,8 +469,8 @@ ATADevice::Identify()
fTaskFile.write.command = IsATAPI() ? ATA_COMMAND_IDENTIFY_PACKET_DEVICE fTaskFile.write.command = IsATAPI() ? ATA_COMMAND_IDENTIFY_PACKET_DEVICE
: ATA_COMMAND_IDENTIFY_DEVICE; : ATA_COMMAND_IDENTIFY_DEVICE;
if (fChannel->SendRequest(&request, IsATAPI() ? 0 if (fChannel->SendRequest(&request,
: ATA_DEVICE_READY_REQUIRED) != B_OK) { IsATAPI() ? 0 : ATA_DEVICE_READY_REQUIRED) != B_OK) {
TRACE_ERROR("sending identify request failed\n"); TRACE_ERROR("sending identify request failed\n");
return B_ERROR; return B_ERROR;
} }
@@ -483,8 +483,8 @@ ATADevice::Identify()
} }
if (fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY, if (fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY,
ATA_CHECK_ERROR_BIT | ATA_CHECK_DEVICE_FAULT, IsATAPI() ATA_CHECK_ERROR_BIT | ATA_CHECK_DEVICE_FAULT,
? 20 * 1000 * 1000 : 500 * 1000) != B_OK) { IsATAPI() ? 20 * 1000 * 1000 : 500 * 1000) != B_OK) {
TRACE_ERROR("timeout waiting for identify request\n"); TRACE_ERROR("timeout waiting for identify request\n");
return B_TIMED_OUT; return B_TIMED_OUT;
} }
@@ -497,8 +497,9 @@ ATADevice::Identify()
return B_ERROR; return B_ERROR;
} }
if (fChannel->FinishRequest(&request, ATA_WAIT_FINISH | (IsATAPI() ? 0 if (fChannel->FinishRequest(&request,
: ATA_DEVICE_READY_REQUIRED), ATA_ERROR_ABORTED) != B_OK) { ATA_WAIT_FINISH | (IsATAPI() ? 0 : ATA_DEVICE_READY_REQUIRED),
ATA_ERROR_ABORTED) != B_OK) {
TRACE_ERROR("failed to finish identify request\n"); TRACE_ERROR("failed to finish identify request\n");
return B_ERROR; return B_ERROR;
} }
@@ -523,8 +524,8 @@ ATADevice::ExecuteReadWrite(ATARequest *request, uint64 address,
return B_ERROR; return B_ERROR;
} }
status_t result = fChannel->SendRequest(request, IsATAPI() status_t result = fChannel->SendRequest(request,
? 0 : ATA_DEVICE_READY_REQUIRED); IsATAPI() ? 0 : ATA_DEVICE_READY_REQUIRED);
if (result != B_OK) { if (result != B_OK) {
TRACE_ERROR("failed to send transfer request\n"); TRACE_ERROR("failed to send transfer request\n");
if (request->UseDMA()) if (request->UseDMA())
@@ -9,9 +9,11 @@
#include "ATAPrivate.h" #include "ATAPrivate.h"
scsi_for_sim_interface *gSCSIModule = NULL; scsi_for_sim_interface *gSCSIModule = NULL;
device_manager_info *gDeviceManager = NULL; device_manager_info *gDeviceManager = NULL;
static status_t static status_t
ata_sim_init_bus(device_node *node, void **cookie) ata_sim_init_bus(device_node *node, void **cookie)
{ {
@@ -175,8 +177,7 @@ ata_channel_added(device_node *parent)
return B_ERROR; return B_ERROR;
} }
device_attr attributes[] = device_attr attributes[] = {
{
{ {
B_DEVICE_FIXED_CHILD, B_STRING_TYPE, B_DEVICE_FIXED_CHILD, B_STRING_TYPE,
{ string: SCSI_FOR_SIM_MODULE_NAME } { string: SCSI_FOR_SIM_MODULE_NAME }
@@ -5,8 +5,10 @@
#include "ATAPrivate.h" #include "ATAPrivate.h"
ATARequest::ATARequest(bool hasLock) ATARequest::ATARequest(bool hasLock)
: fHasLock(hasLock), :
fHasLock(hasLock),
fDevice(NULL), fDevice(NULL),
fTimeout(0), fTimeout(0),
fBytesLeft(0), fBytesLeft(0),
@@ -7,9 +7,11 @@
#include <stdarg.h> #include <stdarg.h>
static char sTraceBuffer[256]; static char sTraceBuffer[256];
static uint32 sTraceBufferOffset = 0; static uint32 sTraceBufferOffset = 0;
void void
ata_trace_printf(uint32 flags, const char *format, ...) ata_trace_printf(uint32 flags, const char *format, ...)
{ {