# HG changeset patch # User William Roberts # Date 1272639995 -3600 # Node ID 2ab9028ab7b88d12eae08f84fbb01c878c2afd3f # Parent 191c8407e577023eb6d0b9957d085cb4531f6f53 Extend wlan_hw_initialization_data_api into a full SHAI interface definition - Build the DLL import library - Export the def files for use by implementations of the interface - Export an "mmh" file to define the fixed parts of the MMP file for implementations See sf/adaptation/stubs for an example of how to use this diff -r 191c8407e577 -r 2ab9028ab7b8 wlan_plat/wlan_hw_initialization_data_api/group/bld.inf --- a/wlan_plat/wlan_hw_initialization_data_api/group/bld.inf Tue Apr 27 18:30:32 2010 +0300 +++ b/wlan_plat/wlan_hw_initialization_data_api/group/bld.inf Fri Apr 30 16:06:35 2010 +0100 @@ -20,8 +20,6 @@ * %version: tr1cfwln#5 % */ -#include - PRJ_PLATFORMS DEFAULT @@ -30,3 +28,17 @@ ../inc/wlanhwinitinterface.h OS_LAYER_PLATFORM_EXPORT_PATH(wlanhwinitinterface.h) ../inc/wlanhwinit.h OS_LAYER_PLATFORM_EXPORT_PATH(wlanhwinit.h) ../inc/wlanhwconfiguredata.h OS_LAYER_PLATFORM_EXPORT_PATH(wlanhwconfiguredata.h) + +// DEF file for wlanhwinit.dll + +bwins.def OS_LAYER_PLATFORM_EXPORT_PATH(shai/bwins/wlanhwinitu.def) +eabi.def OS_LAYER_PLATFORM_EXPORT_PATH(shai/eabi/wlanhwinitu.def) + +// MMH file for people implementing wlanhwinit.dll + +wlanhwinit.mmh OS_LAYER_PLATFORM_EXPORT_PATH(shai/wlanhwinit.mmh) + + +PRJ_MMPFILES + +wlanhwinit_lib diff -r 191c8407e577 -r 2ab9028ab7b8 wlan_plat/wlan_hw_initialization_data_api/group/bwins.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wlan_plat/wlan_hw_initialization_data_api/group/bwins.def Fri Apr 30 16:06:35 2010 +0100 @@ -0,0 +1,9 @@ +EXPORTS + ??1CWlanHwInit@@UAE@XZ @ 1 NONAME ; CWlanHwInit::~CWlanHwInit(void) + ?GetHwInitData@CWlanHwInit@@UAEXPAPBEAAI01@Z @ 2 NONAME ; void CWlanHwInit::GetHwInitData(unsigned char const * *, unsigned int &, unsigned char const * *, unsigned int &) + ?GetHwTestData@CWlanHwInit@@UAEHIAAVTDes8@@@Z @ 3 NONAME ; int CWlanHwInit::GetHwTestData(unsigned int, class TDes8 &) + ?GetHwTestInitData@CWlanHwInit@@UAEXPAPBEAAI01@Z @ 4 NONAME ; void CWlanHwInit::GetHwTestInitData(unsigned char const * *, unsigned int &, unsigned char const * *, unsigned int &) + ?GetMacAddress@CWlanHwInit@@UAEHAAUTMacAddr@@@Z @ 5 NONAME ; int CWlanHwInit::GetMacAddress(struct TMacAddr &) + ?NewL@CWlanHwInit@@SAPAV1@XZ @ 6 NONAME ; class CWlanHwInit * CWlanHwInit::NewL(void) + ?SetHwTestData@CWlanHwInit@@UAEHIAAVTDesC8@@@Z @ 7 NONAME ; int CWlanHwInit::SetHwTestData(unsigned int, class TDesC8 &) + diff -r 191c8407e577 -r 2ab9028ab7b8 wlan_plat/wlan_hw_initialization_data_api/group/eabi.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wlan_plat/wlan_hw_initialization_data_api/group/eabi.def Fri Apr 30 16:06:35 2010 +0100 @@ -0,0 +1,16 @@ +EXPORTS + _ZN11CWlanHwInit13GetHwInitDataEPPKhRjS2_S3_ @ 1 NONAME + _ZN11CWlanHwInit13GetHwTestDataEjR5TDes8 @ 2 NONAME + _ZN11CWlanHwInit13GetMacAddressER8TMacAddr @ 3 NONAME + _ZN11CWlanHwInit13SetHwTestDataEjR6TDesC8 @ 4 NONAME + _ZN11CWlanHwInit17GetHwTestInitDataEPPKhRjS2_S3_ @ 5 NONAME + _ZN11CWlanHwInit4NewLEv @ 6 NONAME + _ZN11CWlanHwInitD0Ev @ 7 NONAME + _ZN11CWlanHwInitD1Ev @ 8 NONAME + _ZN11CWlanHwInitD2Ev @ 9 NONAME + _ZThn4_N11CWlanHwInit13GetHwInitDataEPPKhRjS2_S3_ @ 10 NONAME ; ## + _ZThn4_N11CWlanHwInit13GetHwTestDataEjR5TDes8 @ 11 NONAME ; ## + _ZThn4_N11CWlanHwInit13GetMacAddressER8TMacAddr @ 12 NONAME ; ## + _ZThn4_N11CWlanHwInit13SetHwTestDataEjR6TDesC8 @ 13 NONAME ; ## + _ZThn4_N11CWlanHwInit17GetHwTestInitDataEPPKhRjS2_S3_ @ 14 NONAME ; ## + diff -r 191c8407e577 -r 2ab9028ab7b8 wlan_plat/wlan_hw_initialization_data_api/group/wlanhwinit.mmh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wlan_plat/wlan_hw_initialization_data_api/group/wlanhwinit.mmh Fri Apr 30 16:06:35 2010 +0100 @@ -0,0 +1,37 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Fixed parts of MMP file for implementation of wlanhwinit.dll +* +*/ + +// Implementiation mmp file must supply +// +// TARGET myimpl_wlanwhinit. +// SOURCEPATH xxx +// SOURCE ... +// +// Optionally add extra include paths and libraries + +TARGETTYPE dll +UID 0x1000008d 0x10207267 + +CAPABILITY CAP_GENERAL_DLL +VENDORID VID_DEFAULT + +DEFFILE /epoc32/include/platform/shai/~/wlanhwinit.def +NOEXPORTLIBRARY + +OS_LAYER_SYSTEMINCLUDE + +LIBRARY euser.lib diff -r 191c8407e577 -r 2ab9028ab7b8 wlan_plat/wlan_hw_initialization_data_api/group/wlanhwinit_lib.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wlan_plat/wlan_hw_initialization_data_api/group/wlanhwinit_lib.mmp Fri Apr 30 16:06:35 2010 +0100 @@ -0,0 +1,22 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Build import library for wlanhwinit.dll +* +*/ + +TARGET wlanhwinit.lib +TARGETTYPE implib +UID 0x1000008d 0x10207267 + +DEFFILE /epoc32/include/platform/shai/~/wlanhwinit.def