Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added missing const in ATAPIDevice::IsATAPI() that prevented CD-ROMs from

Browse Source 
working since r36416.
* Added more const, and removed all superfluous semicolons.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36429 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-04-23 10:43:10 +00:00
parent d39c5aa3c9
commit 6c7bc7cd22
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
View File

@ -65,11 +65,11 @@ public:
~ATAChannel(); ~ATAChannel();
status_t InitCheck(); status_t InitCheck();
uint32 ChannelID() { return fChannelID; }; uint32 ChannelID() const { return fChannelID; }
// SCSI stuff // SCSI stuff
void SetBus(scsi_bus bus); void SetBus(scsi_bus bus);
scsi_bus Bus() { return fSCSIBus; }; scsi_bus Bus() const { return fSCSIBus; }
status_t ScanBus(); status_t ScanBus();
void PathInquiry(scsi_path_inquiry *info); void PathInquiry(scsi_path_inquiry *info);
@ -84,7 +84,7 @@ public:
status_t Reset(); status_t Reset();
bool UseDMA() { return fUseDMA; }; bool UseDMA() const { return fUseDMA; }
status_t Wait(uint8 setBits, uint8 clearedBits, status_t Wait(uint8 setBits, uint8 clearedBits,
uint32 flags, bigtime_t timeout); uint32 flags, bigtime_t timeout);
@ -142,7 +142,7 @@ private:
uint8 *virtualAddress, size_t length, uint8 *virtualAddress, size_t length,
size_t *transferred); size_t *transferred);
const char * _DebugContext() { return fDebugContext; }; const char * _DebugContext() { return fDebugContext; }
device_node * fNode; device_node * fNode;
uint32 fChannelID; uint32 fChannelID;
@ -207,7 +207,7 @@ virtual status_t Configure();
uint64 address, uint32 sectorCount); uint64 address, uint32 sectorCount);
protected: protected:
const char * _DebugContext() { return fDebugContext; }; const char * _DebugContext() { return fDebugContext; }
ATAChannel * fChannel; ATAChannel * fChannel;
ata_device_infoblock fInfoBlock; ata_device_infoblock fInfoBlock;
@ -242,7 +242,7 @@ virtual ~ATAPIDevice();
status_t SendPacket(ATARequest *request); status_t SendPacket(ATARequest *request);
virtual status_t ExecuteIO(ATARequest *request); virtual status_t ExecuteIO(ATARequest *request);
virtual bool IsATAPI() { return true; }; virtual bool IsATAPI() const { return true; }
virtual status_t Configure(); virtual status_t Configure();
@ -261,47 +261,49 @@ public:
~ATARequest(); ~ATARequest();
void SetStatus(uint8 status); void SetStatus(uint8 status);
uint8 Status() { return fStatus; }; uint8 Status() const { return fStatus; }
void ClearSense(); void ClearSense();
void SetSense(uint8 key, uint16 codeQualifier); void SetSense(uint8 key, uint16 codeQualifier);
uint8 SenseKey() { return fSenseKey; }; uint8 SenseKey() const { return fSenseKey; }
uint8 SenseCode() { return fSenseCode; }; uint8 SenseCode() const { return fSenseCode; }
uint8 SenseQualifier() { return fSenseQualifier; }; uint8 SenseQualifier() const
{ return fSenseQualifier; }
void SetDevice(ATADevice *device); void SetDevice(ATADevice *device);
ATADevice * Device() { return fDevice; }; ATADevice * Device() const { return fDevice; }
void SetTimeout(bigtime_t timeout); void SetTimeout(bigtime_t timeout);
bigtime_t Timeout() { return fTimeout; }; bigtime_t Timeout() const { return fTimeout; }
void SetIsWrite(bool isWrite); void SetIsWrite(bool isWrite);
bool IsWrite() { return fIsWrite; }; bool IsWrite() const { return fIsWrite; }
void SetUseDMA(bool useDMA); void SetUseDMA(bool useDMA);
bool UseDMA() { return fUseDMA; }; bool UseDMA() const { return fUseDMA; }
void SetBytesLeft(uint32 bytesLeft); void SetBytesLeft(uint32 bytesLeft);
size_t * BytesLeft() { return &fBytesLeft; }; size_t * BytesLeft() { return &fBytesLeft; }
bool HasData() { return fCCB->data_length > 0; }; bool HasData() const
bool HasSense() { return fSenseKey != 0; }; { return fCCB->data_length > 0; }
bool HasSense() const { return fSenseKey != 0; }
status_t Finish(bool resubmit); status_t Finish(bool resubmit);
// SCSI stuff // SCSI stuff
status_t Start(scsi_ccb *ccb); status_t Start(scsi_ccb *ccb);
scsi_ccb * CCB() { return fCCB; }; scsi_ccb * CCB() { return fCCB; }
void PrepareSGInfo(); void PrepareSGInfo();
void AdvanceSG(uint32 bytes); void AdvanceSG(uint32 bytes);
uint32 SGElementsLeft() uint32 SGElementsLeft() const
{ return fSGElementsLeft; }; { return fSGElementsLeft; }
const physical_entry * CurrentSGElement() const physical_entry * CurrentSGElement() const
{ return fCurrentSGElement; }; { return fCurrentSGElement; }
uint32 CurrentSGOffset() uint32 CurrentSGOffset() const
{ return fCurrentSGOffset; }; { return fCurrentSGOffset; }
void SetOddByte(uint8 byte); void SetOddByte(uint8 byte);
bool GetOddByte(uint8 *byte); bool GetOddByte(uint8 *byte);