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
+10 -13
View File
@@ -73,9 +73,8 @@ public:
status_t ScanBus(); status_t ScanBus();
void PathInquiry(scsi_path_inquiry *info); void PathInquiry(scsi_path_inquiry *info);
void GetRestrictions(uint8 targetID, void GetRestrictions(uint8 targetID, bool *isATAPI,
bool *isATAPI, bool *noAutoSense, bool *noAutoSense, uint32 *maxBlocks);
uint32 *maxBlocks);
status_t ExecuteIO(scsi_ccb *ccb); status_t ExecuteIO(scsi_ccb *ccb);
// ATA stuff // ATA stuff
@@ -97,10 +96,9 @@ public:
status_t RecoverLostInterrupt(); status_t RecoverLostInterrupt();
// request handling // request handling
status_t SendRequest(ATARequest *request, status_t SendRequest(ATARequest *request, uint32 flags);
uint32 flags); status_t FinishRequest(ATARequest *request, uint32 flags,
status_t FinishRequest(ATARequest *request, uint8 errorMask);
uint32 flags, uint8 errorMask);
// data transfers // data transfers
status_t PrepareDMA(ATARequest *request); status_t PrepareDMA(ATARequest *request);
@@ -144,6 +142,7 @@ private:
const char * _DebugContext() { return fDebugContext; } const char * _DebugContext() { return fDebugContext; }
private:
device_node * fNode; device_node * fNode;
uint32 fChannelID; uint32 fChannelID;
ata_controller_interface *fController; ata_controller_interface *fController;
@@ -167,8 +166,7 @@ private:
class ATADevice { class ATADevice {
public: public:
ATADevice(ATAChannel *channel, ATADevice(ATAChannel *channel, uint8 index);
uint8 index);
virtual ~ATADevice(); virtual ~ATADevice();
// SCSI stuff // SCSI stuff
@@ -193,8 +191,7 @@ virtual bool IsATAPI() const { return false; }
status_t Select(); status_t Select();
ata_task_file * TaskFile() { return &fTaskFile; } ata_task_file * TaskFile() { return &fTaskFile; }
ata_reg_mask RegisterMask() const ata_reg_mask RegisterMask() const { return fRegisterMask; }
{ return fRegisterMask; }
status_t SetFeature(int feature); status_t SetFeature(int feature);
status_t DisableCommandQueueing(); status_t DisableCommandQueueing();
@@ -235,8 +232,7 @@ private:
class ATAPIDevice : public ATADevice { class ATAPIDevice : public ATADevice {
public: public:
ATAPIDevice(ATAChannel *channel, ATAPIDevice(ATAChannel *channel, uint8 index);
uint8 index);
virtual ~ATAPIDevice(); virtual ~ATAPIDevice();
status_t SendPacket(ATARequest *request); status_t SendPacket(ATARequest *request);
@@ -251,6 +247,7 @@ private:
status_t _FinishRequest(ATARequest *request, status_t _FinishRequest(ATARequest *request,
uint32 flags); uint32 flags);
private:
uint8 fPacket[12]; uint8 fPacket[12];
}; };