--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/IConnAPILibrary.java	Thu Feb 11 15:09:23 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/IConnAPILibrary.java	Thu Feb 11 16:07:33 2010 -0600
@@ -19,10 +19,7 @@
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-import org.eclipse.core.runtime.CoreException;
-
-import com.sun.jna.Callback;
-import com.sun.jna.Native;
+import com.sun.jna.WString;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.ShortByReference;
 import com.sun.jna.win32.StdCallLibrary;
@@ -39,12 +36,12 @@
 	int DMAPI_Initialize(int dwAPIVersion, IntByReference pdwParam);
 	int DMAPI_Terminate(IntByReference pdwParam);
 	int DMAPI_GetAPIVersion();
-	int CONAOpenDM(LPDMHANDLE mHDMHandle);
-	int CONACloseDM(DMHANDLE mHDMHandle);
-	int CONAGetDeviceCount(DMHANDLE hDMHandle, IntByReference pdwCount);
-	int CONAGetDevices(DMHANDLE hDMHandle, IntByReference pdwCount, CONAPI_DEVICE[] pDevices );
+	int CONAOpenDM(LPAPIHANDLE mHDMHandle);
+	int CONACloseDM(APIHANDLE mHDMHandle);
+	int CONAGetDeviceCount(APIHANDLE hDMHandle, IntByReference pdwCount);
+	int CONAGetDevices(APIHANDLE hDMHandle, IntByReference pdwCount, CONAPI_DEVICE[] pDevices );
 	int CONAFreeDeviceStructure( int dwCount, CONAPI_DEVICE[] pDevices );
-	int CONARegisterNotifyCallback(DMHANDLE hDMHandle, int dwState, IConnAPIDeviceCallback pfnNotify);
+	int CONARegisterNotifyCallback(APIHANDLE hDMHandle, int dwState, IConnAPIDeviceCallback pfnNotify);
 
 	// CFAPI Common APIs
 	int CFAPI_Initialize(int dwAPIVersion, IntByReference pdwParam);
@@ -59,14 +56,14 @@
 	int MCAPI_Initialize(int dwAPIVersion, IntBuffer pdwParam);
 	int MCAPI_Terminate(IntBuffer pdwParam);
 	int MCAPI_GetAPIVersion();
-	int CONAOpenMM(LPMCHANDLE phMCHandle, int dwValue);
-	int CONACloseMM(MCHANDLE hMCHandle);
-	int CONAMMGetMedia(MCHANDLE hMCHandle, IntBuffer pdwCountOfMedia, CONAPI_MEDIA.ByReference ppMedia[]); //TODO: c++ - CONAPI_MEDIA**	ppMedia
-	int CONAMMSetMedia(MCHANDLE hMCHandle, CONAPI_MEDIA[] pMedia);
+	int CONAOpenMM(LPAPIHANDLE phMCHandle, int dwValue);
+	int CONACloseMM(APIHANDLE hMCHandle);
+	int CONAMMGetMedia(APIHANDLE hMCHandle, IntBuffer pdwCountOfMedia, CONAPI_MEDIA.ByReference[] ppMedia); //TODO: c++ - CONAPI_MEDIA**	ppMedia
+	int CONAMMSetMedia(APIHANDLE hMCHandle, CONAPI_MEDIA[] pMedia);
 	int CONAMMFreeMediaStructures(int dwCountOfMedia, CONAPI_MEDIA[] pMedia);
-	int MCAPI_GetMediaInfo(MCHANDLE hMCHandle, ShortBuffer pstrMediaID, CONAPI_MEDIA_INFO[] pMediaInfo);
+	int MCAPI_GetMediaInfo(APIHANDLE hMCHandle, ShortBuffer pstrMediaID, CONAPI_MEDIA_INFO[] pMediaInfo);
 	int MCAPI_FreeMediaInfo(CONAPI_MEDIA_INFO[] pMediaInfo);
-	int CONARegisterMMNotifyCallback(MCHANDLE hMCHandle, int dwState, IConnAPIMediaCallback pfnNotify);
+	int CONARegisterMMNotifyCallback(APIHANDLE hMCHandle, int dwState, IConnAPIMediaCallback pfnNotify);
 
 	
 	// UPAPI USB Personality
@@ -74,18 +71,18 @@
 	int UPAPI_Initialize(int dwAPIVersion, IntBuffer pdwParam);
 	int UPAPI_Terminate(IntBuffer pdwParam);
 	int UPAPI_GetAPIVersion();
-	int UPAPI_OpenUSBPersonality(int dwVendorId, LPUPHANDLE phUPHandle);
-	int UPAPI_CloseUSBPersonality(UPHANDLE hUPHandle);
-	int UPAPI_QueryDeviceCount(UPHANDLE hUPHandle, IntBuffer pdwDeviceCount);
-	int UPAPI_QueryDevices(com.sun.jna.Pointer hUPHandle, IntBuffer pdwDeviceCount, UP_DEVICE_DESCRIPTOR[] pDeviceDescriptor);
+	int UPAPI_OpenUSBPersonality(int dwVendorId, LPAPIHANDLE phUPHandle);
+	int UPAPI_CloseUSBPersonality(APIHANDLE hUPHandle);
+	int UPAPI_QueryDeviceCount(APIHANDLE hUPHandle, IntBuffer pdwDeviceCount);
+	int UPAPI_QueryDevices(APIHANDLE hUPHandle, IntBuffer pdwDeviceCount, UP_DEVICE_DESCRIPTOR[] pDeviceDescriptor);
 	int UPAPI_FreeDeviceDescriptor(int dwDeviceCount, UP_DEVICE_DESCRIPTOR[] pDeviceDescriptor);
-	int UPAPI_GetConfigurationDescriptor(UPHANDLE hUPHandle, ShortBuffer pstrDeviceId, UP_CONFIGURATION_DESCRIPTOR[] pConfigurationDescriptor);
-	int UPAPI_GetStringDescriptor(UPHANDLE hUPHandle, ShortBuffer pstrDeviceId, int dwDescriptorIndex, int dwLanguageID, UP_STRING_DESCRIPTOR[] pStringDescriptor);
-	int UPAPI_FreeStringDescriptor(UP_STRING_DESCRIPTOR[] pStringDescriptor);
-	int UPAPI_GetPersonalityDescriptors(UPHANDLE hUPHandle, ShortBuffer pstrDeviceId, UP_PERSONALITY_DESCRIPTORS[] pPersonalityDescriptors);
+	int UPAPI_GetConfigurationDescriptor(APIHANDLE hUPHandle, WString pstrDeviceId, UP_CONFIGURATION_DESCRIPTOR[] pConfigurationDescriptor);
+	int UPAPI_GetStringDescriptor(APIHANDLE hUPHandle, WString pstrDeviceId, int dwDescriptorIndex, int dwLanguageID, UP_STRING_DESCRIPTOR pStringDescriptor);
+	int UPAPI_FreeStringDescriptor(UP_STRING_DESCRIPTOR pStringDescriptor);
+	int UPAPI_GetPersonalityDescriptors(APIHANDLE hUPHandle, WString pstrDeviceId, UP_PERSONALITY_DESCRIPTORS[] pPersonalityDescriptors);
 	int UPAPI_FreePersonalityDescriptors(UP_PERSONALITY_DESCRIPTORS[] pPersonalityDescriptors);
-	int UPAPI_SetPersonality(UPHANDLE hUPHandle, ShortBuffer pstrDeviceId, int dwPersonalityCode);
-	int UPAPI_SendCommandToDevice(UPHANDLE hUPHandle, ShortBuffer pstrDeviceId, int dwDataDirection, UP_DATA_BUFFER[] pDataBuffer);
+	int UPAPI_SetPersonality(APIHANDLE hUPHandle, WString pstrDeviceId, int dwPersonalityCode);
+	int UPAPI_SendCommandToDevice(APIHANDLE hUPHandle, WString pstrDeviceId, int dwDataDirection, UP_DATA_BUFFER[] pDataBuffer);
 	
 
 }