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

Add three more error checks for paranoias sake.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30642 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-05-06 11:47:48 +00:00
parent 5d14311137
commit 2a8d619c9e
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
+13 -5
View File
@@ -264,7 +264,13 @@ ATAChannel::SelectDevice(uint8 device)
taskFile.lba.mode = ATA_MODE_LBA; taskFile.lba.mode = ATA_MODE_LBA;
taskFile.lba.device = device; taskFile.lba.device = device;
_WriteRegs(&taskFile, ATA_MASK_DEVICE_HEAD); status_t result = _WriteRegs(&taskFile, ATA_MASK_DEVICE_HEAD);
if (result != B_OK) {
TRACE_ERROR("writing register failed when trying to select device %d\n",
device);
return result;
}
_FlushAndWait(1); _FlushAndWait(1);
#if 0 #if 0
@@ -285,7 +291,11 @@ uint8
ATAChannel::SelectedDevice() ATAChannel::SelectedDevice()
{ {
ata_task_file taskFile; ata_task_file taskFile;
_ReadRegs(&taskFile, ATA_MASK_DEVICE_HEAD); if (_ReadRegs(&taskFile, ATA_MASK_DEVICE_HEAD) != B_OK) {
TRACE_ERROR("reading register failed when detecting selected device\n");
return 2;
}
return taskFile.lba.device; return taskFile.lba.device;
} }
@@ -321,9 +331,7 @@ ATAChannel::Reset(bool *presence, uint16 *signatures)
uint8 deviceCount = fDeviceCount; uint8 deviceCount = fDeviceCount;
for (uint8 i = 0; i < deviceCount; i++) { for (uint8 i = 0; i < deviceCount; i++) {
SelectDevice(i); if (SelectDevice(i) != B_OK || SelectedDevice() != i) {
if (SelectedDevice() != i) {
TRACE_ALWAYS("cannot select device %d, assuming not present\n", i); TRACE_ALWAYS("cannot select device %d, assuming not present\n", i);
continue; continue;
} }