# HG changeset patch # User William Roberts # Date 1272639840 -3600 # Node ID c1bdc4b1fbad5127a800eb0e954568f09010163d # Parent 205ca2b22b4db2c52ca5605ebe630a84d3d87e2e Convert wlanhwinit_stub to use the published SHAI interface pieces - use epoc32/include/platform/shai/wlanhwinit.mmh to get fixed parts of the mmp file, including def files - don't have a local copy of the def files diff -r 205ca2b22b4d -r c1bdc4b1fbad wlanhwinit_stub/bwinscw/wlanhwinitU.DEF --- a/wlanhwinit_stub/bwinscw/wlanhwinitU.DEF Wed Apr 28 12:37:53 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -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 205ca2b22b4d -r c1bdc4b1fbad wlanhwinit_stub/eabi/wlanhwinitU.DEF --- a/wlanhwinit_stub/eabi/wlanhwinitU.DEF Wed Apr 28 12:37:53 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -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 205ca2b22b4d -r c1bdc4b1fbad wlanhwinit_stub/group/wlanhwinit.mmp --- a/wlanhwinit_stub/group/wlanhwinit.mmp Wed Apr 28 12:37:53 2010 +0100 +++ b/wlanhwinit_stub/group/wlanhwinit.mmp Fri Apr 30 16:04:00 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -15,33 +15,9 @@ * */ -/* -* %version: 7 % -*/ - -#include +#include TARGET wlanhwinit.dll -TARGETTYPE dll -UID 0x1000008d 0x10207267 - -CAPABILITY CAP_GENERAL_DLL -VENDORID VID_DEFAULT - -#if defined( ARMCC ) -DEFFILE ../eabi/ -#elif defined( WINSCW ) -DEFFILE ../bwinscw/ -#elif defined( WINS ) -DEFFILE ../bwins/ -#else -DEFFILE ../bmarm/ -#endif SOURCEPATH ../src SOURCE wlanhwinit.cpp - -USERINCLUDE ../inc -OS_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib