[haiku-commits] haiku: hrev45763 - in src: add-ons/kernel/busses/scsi/ahci add-ons/kernel/bus_managers/scsi system/kernel/device_manager
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 15 Jun 2013 16:27:21 +0200 (CEST)
hrev45763 adds 3 changesets to branch 'master'
old head: 24110ddab59dd5542e33e3e476cc271969324063
new head: 6121ae660c7e10d5101d8b67143b7be290433ed9
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=6121ae6+%5E24110dd
----------------------------------------------------------------------------
e01b180: ahci: fixed typo and narrowing conversion warning.
* completition -> completion.
fc68c4c: scsi: fixed header guard comment in wrapper.h
6121ae6: device_manager: init DMAResource::fScratchVecs.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
6 files changed, 12 insertions(+), 10 deletions(-)
src/add-ons/kernel/bus_managers/scsi/wrapper.h | 2 +-
src/add-ons/kernel/busses/scsi/ahci/ahci.c | 2 +-
src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp | 8 ++++----
src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp | 4 ++--
src/add-ons/kernel/busses/scsi/ahci/sata_request.h | 4 ++--
src/system/kernel/device_manager/dma_resources.cpp | 2 ++
############################################################################
Commit: e01b1808b33a937d1f61613eb74cbf946222d701
URL: http://cgit.haiku-os.org/haiku/commit/?id=e01b180
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Fri Jun 14 19:21:24 2013 UTC
ahci: fixed typo and narrowing conversion warning.
* completition -> completion.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci.c
b/src/add-ons/kernel/busses/scsi/ahci/ahci.c
index aa9e0e3..761355b 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci.c
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci.c
@@ -179,7 +179,7 @@ register_sim(device_node *parent)
{ SCSI_DESCRIPTION_CONTROLLER_NAME, B_STRING_TYPE,
{ string: AHCI_DEVICE_MODULE_NAME }},
{ 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,
// { string: AHCI_ID_GENERATOR }},
// { PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { ui32: id }},
diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp
b/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp
index e88a1a4..ecc84d0 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp
@@ -171,7 +171,7 @@ AHCIPort::Uninit()
// disable FIS receive
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) {
TRACE("AHCIPort::Uninit port %d error FIS rx still running\n",
fIndex);
}
@@ -179,7 +179,7 @@ AHCIPort::Uninit()
// stop DMA engine
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) {
TRACE("AHCIPort::Uninit port %d error DMA engine still
running\n",
fIndex);
@@ -565,9 +565,9 @@ AHCIPort::ScsiInquiry(scsi_ccb *request)
sreq.set_data(&ataData, sizeof(ataData));
sreq.set_ata_cmd(fIsATAPI ? 0xa1 : 0xec); // Identify (Packet) Device
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");
request->subsys_status = SCSI_REQ_CMP_ERR;
gSCSI->finished(request, 1);
diff --git a/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp
b/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp
index c2750d4..9bd871b 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp
+++ b/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp
@@ -182,7 +182,7 @@ sata_request::abort()
void
-sata_request::wait_for_completition()
+sata_request::wait_for_completion()
{
if (fCcb) panic("wrong usage");
acquire_sem(fCompletionSem);
@@ -190,7 +190,7 @@ sata_request::wait_for_completition()
int
-sata_request::completition_status()
+sata_request::completion_status()
{
if (fCcb) panic("wrong usage");
return fCompletionStatus;
diff --git a/src/add-ons/kernel/busses/scsi/ahci/sata_request.h
b/src/add-ons/kernel/busses/scsi/ahci/sata_request.h
index f1efcf2..71550f6 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/sata_request.h
+++ b/src/add-ons/kernel/busses/scsi/ahci/sata_request.h
@@ -32,8 +32,8 @@ public:
void finish(int tfd, size_t bytesTransfered);
void abort();
- void wait_for_completition();
- int completition_status();
+ void wait_for_completion();
+ int completion_status();
private:
scsi_ccb * fCcb;
############################################################################
Commit: fc68c4cb59eb3e7831005cff799162db33576f37
URL: http://cgit.haiku-os.org/haiku/commit/?id=fc68c4c
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Jun 15 14:22:59 2013 UTC
scsi: fixed header guard comment in wrapper.h
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/bus_managers/scsi/wrapper.h
b/src/add-ons/kernel/bus_managers/scsi/wrapper.h
index 22381df..0265b5c 100644
--- a/src/add-ons/kernel/bus_managers/scsi/wrapper.h
+++ b/src/add-ons/kernel/bus_managers/scsi/wrapper.h
@@ -87,4 +87,4 @@
dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \
}} while( 0 )
-#endif /* _BENAPHORE_H */
+#endif /* _WRAPPER_H */
############################################################################
Revision: hrev45763
Commit: 6121ae660c7e10d5101d8b67143b7be290433ed9
URL: http://cgit.haiku-os.org/haiku/commit/?id=6121ae6
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Jun 15 14:24:47 2013 UTC
device_manager: init DMAResource::fScratchVecs.
----------------------------------------------------------------------------
diff --git a/src/system/kernel/device_manager/dma_resources.cpp
b/src/system/kernel/device_manager/dma_resources.cpp
index 71753c8..af5e130 100644
--- a/src/system/kernel/device_manager/dma_resources.cpp
+++ b/src/system/kernel/device_manager/dma_resources.cpp
@@ -92,6 +92,8 @@ DMABuffer::Dump() const
DMAResource::DMAResource()
+ :
+ fScratchVecs(NULL)
{
mutex_init(&fLock, "dma resource");
}
Other related posts:
- » [haiku-commits] haiku: hrev45763 - in src: add-ons/kernel/busses/scsi/ahci add-ons/kernel/bus_managers/scsi system/kernel/device_manager - korli
