Author: colin Date: 2010-02-04 10:28:27 +0100 (Thu, 04 Feb 2010) New Revision: 35405 Changeset: http://dev.haiku-os.org/changeset/35405/haiku Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Stack.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/interfaces/Result.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/Roster.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/frames/Frame.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/frames/FrameFactory.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/AuthenticateRequest.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/AuthenticateRequest.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/JoinRequest.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/JoinRequest.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/results/RequestResult.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/services/AuthenticateService.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/services/DistributeService.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/Roster.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/services/EncryptService.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/services/FragmentateService.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/Roster.cpp haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/Roster.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/requests/ConnectRequest.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/results/RequestResult.h Log: * Collapsed namespace usage, where applicable. * Use common spacing rule when defining classes. Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Stack.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Stack.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Stack.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -26,7 +26,7 @@ /*! Tells whether the Stack class was constructed successful. This works around the fact, that you can't return something when object instantiation goes wrong. - + \return B_OK Stack was constructed successful. \return B_ERROR An error occurred during class construction. */ @@ -38,7 +38,7 @@ /*! Create an Ieee80211::Device. - + \param haikuDeviceName is the name used by Haiku to identify this device. \param devicePointer used to return the pointer to the created Ieee80211::Device. @@ -69,7 +69,7 @@ /*! Frees all resources occupied by the Ieee80211::Device. - + \param device used to identify the resources to be freed. */ void @@ -81,7 +81,7 @@ /*! Activates processing of management and data frames. - + \param device to be enabled for processing of management and data frames. \return B_OK Ieee80211::Device successfully enabled. \return B_ERROR Ieee80211::Device still disabled. @@ -107,7 +107,7 @@ /*! Initializes the request converter with the data it needs for converting. - + \param device delivers device specific data. \param request to be converted. */ @@ -120,7 +120,7 @@ /*! Utilizes the request converter to convert a system request into a request as needed by the station management. - + \param request only used to return the converted request. Memory allocation is carried out by this method. \return B_OK Request was successfully converted and is safe for further @@ -136,7 +136,7 @@ /*! Connects synchronously to the desired wireless network. \sa StationManagement::Roster::ConnectToNetwork - + \param request contains data needed to accomplish the request. \return B_OK Connection established. \return B_ERROR Connection failed. Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/interfaces/Result.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/interfaces/Result.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/interfaces/Result.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -9,7 +9,6 @@ namespace Ieee80211 { class Result { - }; } /* namespace Ieee80211 */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/Roster.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/Roster.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/Roster.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -21,8 +21,7 @@ #include <mac_management/Roster.h> -using namespace Ieee80211; -using namespace MacManagement; +using namespace Ieee80211::MacManagement; /*! Handling over a new authenticate request to the MAC Layer Management Entity Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/frames/Frame.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/frames/Frame.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/frames/Frame.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -14,6 +14,7 @@ class Frame; } /* namespace MacManagement */ + class MacManagement::Frame : public Ieee80211::Frame { }; Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/frames/FrameFactory.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/frames/FrameFactory.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/frames/FrameFactory.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -18,6 +18,7 @@ class FrameFactory; } /* namespace MacManagement */ + class MacManagement::FrameFactory : public Ieee80211::FrameFactory { public: status_t CreateAuthentication(AuthenticateRequest*, Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/AuthenticateRequest.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/AuthenticateRequest.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/AuthenticateRequest.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -16,7 +16,7 @@ #include <mac_management/requests/AuthenticateRequest.h> -using namespace Ieee80211; +using namespace Ieee80211::MacManagement; /*! Constructs a new object by using relevant data from the ConnectRequest. @@ -26,7 +26,7 @@ \return NULL not enough memory. \return AuthenticateRequest otherwise. */ -MacManagement::AuthenticateRequest::AuthenticateRequest( +AuthenticateRequest::AuthenticateRequest( StationManagement::ConnectRequest* request) { return; Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/AuthenticateRequest.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/AuthenticateRequest.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/AuthenticateRequest.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -12,7 +12,6 @@ namespace Ieee80211 { - namespace MacManagement { class AuthenticateRequest; } /* namespace MacManagement */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/JoinRequest.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/JoinRequest.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/JoinRequest.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -17,7 +17,7 @@ #include <station_management/requests/ConnectRequest.h> -using namespace Ieee80211; +using namespace Ieee80211::MacManagement; /*! Constructs a new object by using relevant data from the ConnectRequest. @@ -26,8 +26,7 @@ \return NULL not enough memory. \return JoinRequest otherwise. */ -MacManagement::JoinRequest::JoinRequest( - StationManagement::ConnectRequest* request) +JoinRequest::JoinRequest(StationManagement::ConnectRequest* request) { return; } Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/JoinRequest.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/JoinRequest.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/requests/JoinRequest.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -12,7 +12,6 @@ namespace Ieee80211 { - namespace MacManagement { class JoinRequest; } /* namespace MacManagement */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/results/RequestResult.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/results/RequestResult.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/results/RequestResult.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -14,6 +14,7 @@ class RequestResult; } /* namespace MacManagement */ + class MacManagement::RequestResult : public Result { }; Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/services/AuthenticateService.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/services/AuthenticateService.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/services/AuthenticateService.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -21,8 +21,7 @@ #include <mac_management/services/AuthenticateService.h> -using namespace Ieee80211; -using namespace MacManagement; +using namespace Ieee80211::MacManagement; // #pragma mark - service interface implementation Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/services/DistributeService.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/services/DistributeService.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mac_management/services/DistributeService.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -18,6 +18,7 @@ namespace Ieee80211 { namespace MacManagement { + class DistributeService : public Service<Frame>, public Observable { public: virtual status_t Process(Frame*); @@ -33,6 +34,7 @@ Queue<Frame> fProcessQueue; MpduCoordination::Roster fMpduRoster; }; + } /* namespace MacManagement */ } /* namespace Ieee80211 */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/Roster.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/Roster.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/Roster.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -21,7 +21,6 @@ #include <mpdu_coordination/Roster.h> -using namespace Ieee80211; using namespace Ieee80211::MpduCoordination; Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/services/EncryptService.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/services/EncryptService.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/services/EncryptService.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -16,7 +16,6 @@ #include <mpdu_coordination/services/EncryptService.h> -using namespace Ieee80211; using namespace Ieee80211::MpduCoordination; Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/services/FragmentateService.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/services/FragmentateService.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/mpdu_coordination/services/FragmentateService.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -20,8 +20,7 @@ #include <mpdu_coordination/services/FragmentateService.h> -using namespace Ieee80211; -using namespace MpduCoordination; +using namespace Ieee80211::MpduCoordination; /* #pragma mark - service interface implementation */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/Roster.cpp =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/Roster.cpp 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/Roster.cpp 2010-02-04 09:28:27 UTC (rev 35405) @@ -20,7 +20,7 @@ #include <station_management/Roster.h> -using namespace Ieee80211; +using namespace Ieee80211::StationManagement; /*! Connects to a wireless network in a synchronous way. @@ -40,8 +40,7 @@ \return B_ERROR Connection not established. */ status_t -StationManagement::Roster::ConnectToNetwork( - StationManagement::ConnectRequest* request) +Roster::ConnectToNetwork(ConnectRequest* request) { if (request == NULL) return B_BAD_VALUE; @@ -89,8 +88,7 @@ \return B_ERROR Request misses data and the method failed in obtaining it. */ status_t -StationManagement::Roster::_RetrieveMissingConnectRequestData( - StationManagement::ConnectRequest* request) +Roster::_RetrieveMissingConnectRequestData(ConnectRequest* request) { return B_OK; } Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/Roster.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/Roster.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/Roster.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -13,7 +13,6 @@ namespace Ieee80211 { - namespace StationManagement { class Roster; } /* namespace StationManagement */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/requests/ConnectRequest.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/requests/ConnectRequest.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/requests/ConnectRequest.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -15,6 +15,7 @@ class ConnectRequest; } /* namespace StationManagement */ + class StationManagement::ConnectRequest : public Request<StationManagement::ConnectRequestResult> { }; Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/results/RequestResult.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/results/RequestResult.h 2010-02-04 08:30:35 UTC (rev 35404) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/station_management/results/RequestResult.h 2010-02-04 09:28:27 UTC (rev 35405) @@ -14,6 +14,7 @@ class RequestResult; } /* namespace StationManagement */ + class StationManagement::RequestResult : public Result { };