i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed wrong indentation.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36430 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-04-23 10:56:39 +00:00
parent 6c7bc7cd22
commit 11a40e6d46
1 changed files with 191 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
+24 -27
View File
@@ -73,9 +73,8 @@ public:
status_t ScanBus();
void PathInquiry(scsi_path_inquiry *info);
void GetRestrictions(uint8 targetID,
bool *isATAPI, bool *noAutoSense,
uint32 *maxBlocks);
void GetRestrictions(uint8 targetID, bool *isATAPI,
bool *noAutoSense, uint32 *maxBlocks);
status_t ExecuteIO(scsi_ccb *ccb);
// ATA stuff
@@ -97,10 +96,9 @@ public:
status_t RecoverLostInterrupt();
// request handling
status_t SendRequest(ATARequest *request,
uint32 flags);
status_t FinishRequest(ATARequest *request,
uint32 flags, uint8 errorMask);
status_t SendRequest(ATARequest *request, uint32 flags);
status_t FinishRequest(ATARequest *request, uint32 flags,
uint8 errorMask);
// data transfers
status_t PrepareDMA(ATARequest *request);
@@ -144,9 +142,10 @@ private:
const char * _DebugContext() { return fDebugContext; }
private:
device_node * fNode;
uint32 fChannelID;
ata_controller_interface * fController;
ata_controller_interface *fController;
void * fCookie;
spinlock fInterruptLock;
@@ -167,9 +166,8 @@ private:
class ATADevice {
public:
ATADevice(ATAChannel *channel,
uint8 index);
virtual ~ATADevice();
ATADevice(ATAChannel *channel, uint8 index);
virtual ~ATADevice();
// SCSI stuff
status_t ModeSense(ATARequest *request);
@@ -178,13 +176,13 @@ virtual ~ATADevice();
status_t Eject(ATARequest *request);
status_t Inquiry(ATARequest *request);
status_t ReadCapacity(ATARequest *request);
virtual status_t ExecuteIO(ATARequest *request);
virtual status_t ExecuteIO(ATARequest *request);
void GetRestrictions(bool *noAutoSense,
uint32 *maxBlocks);
// ATA stuff
virtual bool IsATAPI() const { return false; }
virtual bool IsATAPI() const { return false; }
bool UseDMA() const { return fUseDMA; }
bool Use48Bits() const { return fUse48Bits; }
@@ -193,20 +191,19 @@ virtual bool IsATAPI() const { return false; }
status_t Select();
ata_task_file * TaskFile() { return &fTaskFile; }
ata_reg_mask RegisterMask() const
{ return fRegisterMask; }
ata_reg_mask RegisterMask() const { return fRegisterMask; }
status_t SetFeature(int feature);
status_t DisableCommandQueueing();
status_t ConfigureDMA();
virtual status_t Configure();
virtual status_t Configure();
status_t Identify();
status_t ExecuteReadWrite(ATARequest *request,
uint64 address, uint32 sectorCount);
protected:
protected:
const char * _DebugContext() { return fDebugContext; }
ATAChannel * fChannel;
@@ -218,7 +215,7 @@ protected:
uint8 fDMAMode;
uint8 fDMAFailures;
private:
private:
status_t _FillTaskFile(ATARequest *request,
uint64 address);
@@ -235,22 +232,22 @@ private:
class ATAPIDevice : public ATADevice {
public:
ATAPIDevice(ATAChannel *channel,
uint8 index);
virtual ~ATAPIDevice();
ATAPIDevice(ATAChannel *channel, uint8 index);
virtual ~ATAPIDevice();
status_t SendPacket(ATARequest *request);
virtual status_t ExecuteIO(ATARequest *request);
virtual status_t ExecuteIO(ATARequest *request);
virtual bool IsATAPI() const { return true; }
virtual bool IsATAPI() const { return true; }
virtual status_t Configure();
virtual status_t Configure();
private:
private:
status_t _FillTaskFilePacket(ATARequest *request);
status_t _FinishRequest(ATARequest *request,
uint32 flags);
private:
uint8 fPacket[12];
};
@@ -300,7 +297,7 @@ public:
uint32 SGElementsLeft() const
{ return fSGElementsLeft; }
const physical_entry * CurrentSGElement() const
const physical_entry *CurrentSGElement() const
{ return fCurrentSGElement; }
uint32 CurrentSGOffset() const
{ return fCurrentSGOffset; }
@@ -331,7 +328,7 @@ private:
scsi_ccb * fCCB;
uint32 fSGElementsLeft;
const physical_entry * fCurrentSGElement;
const physical_entry *fCurrentSGElement;
uint32 fCurrentSGOffset;
bool fHasOddByte;
uint8 fOddByte;