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

* Removed #ifndef HAIKU_TARGET_PLATFORM_HAIKU in InitKernelAccess and PreparKernelAccess as it made those fuctions useless in HAIKU, and those

Browse Source 
functions are needed to pass data back to the user space buffer.
* Fixed Jamfile


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22982 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2007-11-23 12:19:49 +00:00
parent e1070961a3
commit c62d18ceff
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/usb/Jamfile
+3
View File
@@ -8,6 +8,9 @@ SubDirSysHdrs $(SUBDIR) ;
UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName kernel ] ;
if $(TARGET_PLATFORM) != haiku { if $(TARGET_PLATFORM) != haiku {
UsePublicHeaders [ FDirName drivers ] ; UsePublicHeaders [ FDirName drivers ] ;
} else {
UseArchHeaders $(TARGET_ARCH) ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
} }
KernelStaticLibrary libusb.a : KernelStaticLibrary libusb.a :
src/add-ons/kernel/bus_managers/usb/Transfer.cpp
+10 -10
View File
@@ -8,6 +8,9 @@
*/ */
#include "usb_p.h" #include "usb_p.h"
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
#include <kernel.h>
#endif
Transfer::Transfer(Pipe *pipe) Transfer::Transfer(Pipe *pipe)
: fPipe(pipe), : fPipe(pipe),
@@ -123,7 +126,6 @@ Transfer::AdvanceByFragment(size_t actualLength)
status_t status_t
Transfer::InitKernelAccess() Transfer::InitKernelAccess()
{ {
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
// we might need to access a buffer in userspace. this will not // we might need to access a buffer in userspace. this will not
// be possible in the kernel space finisher thread unless we // be possible in the kernel space finisher thread unless we
// get the proper area id for the space we need and then clone it // get the proper area id for the space we need and then clone it
@@ -132,8 +134,11 @@ Transfer::InitKernelAccess()
for (size_t i = 0; i < fVectorCount; i++) { for (size_t i = 0; i < fVectorCount; i++) {
if (IS_USER_ADDRESS(vector[i].iov_base)) { if (IS_USER_ADDRESS(vector[i].iov_base)) {
fUserArea = area_for(vector[i].iov_base); fUserArea = area_for(vector[i].iov_base);
if (fUserArea < B_OK) if (fUserArea < B_OK) {
TRACE_ERROR(("USB Transfer: failed to find area for user"
" space buffer!\n"));
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
break; break;
} }
} }
@@ -143,8 +148,10 @@ Transfer::InitKernelAccess()
return B_OK; return B_OK;
area_info areaInfo; area_info areaInfo;
if (fUserArea < B_OK || get_area_info(fUserArea, &areaInfo) < B_OK) if (fUserArea < B_OK || get_area_info(fUserArea, &areaInfo) < B_OK) {
TRACE_ERROR(("USB Transfer: couldn't get user area info\n"));
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
for (size_t i = 0; i < fVectorCount; i++) { for (size_t i = 0; i < fVectorCount; i++) {
(uint8 *)vector[i].iov_base -= (uint8 *)areaInfo.address; (uint8 *)vector[i].iov_base -= (uint8 *)areaInfo.address;
@@ -155,8 +162,6 @@ Transfer::InitKernelAccess()
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
} }
} }
#endif // !HAIKU_TARGET_PLATFORM_HAIKU
return B_OK; return B_OK;
} }
@@ -164,7 +169,6 @@ Transfer::InitKernelAccess()
status_t status_t
Transfer::PrepareKernelAccess() Transfer::PrepareKernelAccess()
{ {
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
// done if there is no userspace buffer or if we already cloned its area // done if there is no userspace buffer or if we already cloned its area
if (fUserArea < B_OK || fClonedArea >= B_OK) if (fUserArea < B_OK || fClonedArea >= B_OK)
return B_OK; return B_OK;
@@ -180,8 +184,6 @@ Transfer::PrepareKernelAccess()
for (size_t i = 0; i < fVectorCount; i++) for (size_t i = 0; i < fVectorCount; i++)
(uint8 *)fVector[i].iov_base += (addr_t)clonedMemory; (uint8 *)fVector[i].iov_base += (addr_t)clonedMemory;
#endif // !HAIKU_TARGET_PLATFORM_HAIKU
return B_OK; return B_OK;
} }
@@ -269,7 +271,5 @@ Transfer::_CalculateBandwidth()
// Round up and set the value in microseconds // Round up and set the value in microseconds
fBandwidth = (bandwidthNS + 500) / 1000; fBandwidth = (bandwidthNS + 500) / 1000;
// For debugging purposes
TRACE(("USB Transfer: bandwidth neded %d\n", fBandwidth));
return B_OK; return B_OK;
} }