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

ahci: fixed typo and narrowing conversion warning.

Browse Source 
* completition -> completion.
This commit is contained in:
Jérôme Duval
2013-06-15 16:26:47 +02:00
parent 24110ddab5
commit e01b1808b3
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/scsi/ahci/ahci.c
+1 -1
View File
@@ -179,7 +179,7 @@ register_sim(device_node *parent)
{ SCSI_DESCRIPTION_CONTROLLER_NAME, B_STRING_TYPE, { SCSI_DESCRIPTION_CONTROLLER_NAME, B_STRING_TYPE,
{ string: AHCI_DEVICE_MODULE_NAME }}, { string: AHCI_DEVICE_MODULE_NAME }},
{ B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { ui32: 255 }}, { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { ui32: 255 }},
{ AHCI_ID_ITEM, B_UINT32_TYPE, { ui32: id }}, { AHCI_ID_ITEM, B_UINT32_TYPE, { ui32: (uint32)id }},
// { PNP_MANAGER_ID_GENERATOR, B_STRING_TYPE, // { PNP_MANAGER_ID_GENERATOR, B_STRING_TYPE,
// { string: AHCI_ID_GENERATOR }}, // { string: AHCI_ID_GENERATOR }},
// { PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { ui32: id }}, // { PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { ui32: id }},
src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp
+4 -4
View File
@@ -171,7 +171,7 @@ AHCIPort::Uninit()
// disable FIS receive // disable FIS receive
fRegs->cmd &= ~PORT_CMD_FER; fRegs->cmd &= ~PORT_CMD_FER;
// wait for receive completition, up to 500ms // wait for receive completion, up to 500ms
if (wait_until_clear(&fRegs->cmd, PORT_CMD_FR, 500000) < B_OK) { if (wait_until_clear(&fRegs->cmd, PORT_CMD_FR, 500000) < B_OK) {
TRACE("AHCIPort::Uninit port %d error FIS rx still running\n", fIndex); TRACE("AHCIPort::Uninit port %d error FIS rx still running\n", fIndex);
} }
@@ -179,7 +179,7 @@ AHCIPort::Uninit()
// stop DMA engine // stop DMA engine
fRegs->cmd &= ~PORT_CMD_ST; fRegs->cmd &= ~PORT_CMD_ST;
// wait for DMA completition // wait for DMA completion
if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) { if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
TRACE("AHCIPort::Uninit port %d error DMA engine still running\n", TRACE("AHCIPort::Uninit port %d error DMA engine still running\n",
fIndex); fIndex);
@@ -565,9 +565,9 @@ AHCIPort::ScsiInquiry(scsi_ccb *request)
sreq.set_data(&ataData, sizeof(ataData)); sreq.set_data(&ataData, sizeof(ataData));
sreq.set_ata_cmd(fIsATAPI ? 0xa1 : 0xec); // Identify (Packet) Device sreq.set_ata_cmd(fIsATAPI ? 0xa1 : 0xec); // Identify (Packet) Device
ExecuteSataRequest(&sreq); ExecuteSataRequest(&sreq);
sreq.wait_for_completition(); sreq.wait_for_completion();
if (sreq.completition_status() & ATA_ERR) { if (sreq.completion_status() & ATA_ERR) {
TRACE("identify device failed\n"); TRACE("identify device failed\n");
request->subsys_status = SCSI_REQ_CMP_ERR; request->subsys_status = SCSI_REQ_CMP_ERR;
gSCSI->finished(request, 1); gSCSI->finished(request, 1);
src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp
+2 -2
View File
@@ -182,7 +182,7 @@ sata_request::abort()
void void
sata_request::wait_for_completition() sata_request::wait_for_completion()
{ {
if (fCcb) panic("wrong usage"); if (fCcb) panic("wrong usage");
acquire_sem(fCompletionSem); acquire_sem(fCompletionSem);
@@ -190,7 +190,7 @@ sata_request::wait_for_completition()
int int
sata_request::completition_status() sata_request::completion_status()
{ {
if (fCcb) panic("wrong usage"); if (fCcb) panic("wrong usage");
return fCompletionStatus; return fCompletionStatus;
src/add-ons/kernel/busses/scsi/ahci/sata_request.h
+2 -2
View File
@@ -32,8 +32,8 @@ public:
void finish(int tfd, size_t bytesTransfered); void finish(int tfd, size_t bytesTransfered);
void abort(); void abort();
void wait_for_completition(); void wait_for_completion();
int completition_status(); int completion_status();
private: private:
scsi_ccb * fCcb; scsi_ccb * fCcb;