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

removed conditional testing code

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22352 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-09-28 21:20:46 +00:00
parent 91f867e016
commit 747c1927fd
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/scsi/ahci/ahci.c
-8
View File
@@ -83,19 +83,11 @@ ahci_supports_device(device_node_handle parent, bool *_noConnection)
PCI_DEVICE_DEVICE_ID_ITEM, &deviceID, false) != B_OK) PCI_DEVICE_DEVICE_ID_ITEM, &deviceID, false) != B_OK)
return B_ERROR; return B_ERROR;
#if 1
if (strcmp(bus, "pci") || baseClass != PCI_mass_storage if (strcmp(bus, "pci") || baseClass != PCI_mass_storage
|| subClass != PCI_sata || classAPI != PCI_sata_ahci) { || subClass != PCI_sata || classAPI != PCI_sata_ahci) {
free(bus); free(bus);
return 0.0f; return 0.0f;
} }
#else
if (strcmp(bus, "pci") || baseClass != PCI_mass_storage
|| subClass != PCI_ide) {
free(bus);
return 0.0;
}
#endif
TRACE("controller found! vendor 0x%04x, device 0x%04x\n", TRACE("controller found! vendor 0x%04x, device 0x%04x\n",
vendorID, deviceID); vendorID, deviceID);
src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
-6
View File
@@ -235,16 +235,10 @@ AHCIController::ResetController()
uint32 saveCaps = fRegs->cap & (CAP_SMPS | CAP_SSS | CAP_SPM | CAP_EMS | CAP_SXS); uint32 saveCaps = fRegs->cap & (CAP_SMPS | CAP_SSS | CAP_SPM | CAP_EMS | CAP_SXS);
uint32 savePI = fRegs->pi; uint32 savePI = fRegs->pi;
#if 1
fRegs->ghc |= GHC_HR; fRegs->ghc |= GHC_HR;
FlushPostedWrites(); FlushPostedWrites();
if (wait_until_clear(&fRegs->ghc, GHC_HR, 1000000) < B_OK) if (wait_until_clear(&fRegs->ghc, GHC_HR, 1000000) < B_OK)
return B_TIMED_OUT; return B_TIMED_OUT;
#else
fRegs->ghc &= ~GHC_AE;
fRegs->is = 0xffffffff;
FlushPostedWrites();
#endif
fRegs->ghc |= GHC_AE; fRegs->ghc |= GHC_AE;
FlushPostedWrites(); FlushPostedWrites();