gsmopen: windows now works

diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen.h b/src/mod/endpoints/mod_gsmopen/gsmopen.h
index 7c72dcf65139c551e81adb6ac6167984433b72af..f13d27775e63402723a1f5ccad4ff1350f1f388b 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/gsmopen.h
+++ b/src/mod/endpoints/mod_gsmopen/gsmopen.h
@@ -642,7 +642,7 @@ int alarm_event(private_t * tech_pvt, int alarm_code, const char *alarm_message)
 int dump_event_full(private_t * tech_pvt, int is_alarm, int alarm_code, const char *alarm_message);
 
 
-int gsmopen_serial_init_audio_port(private_t * tech_pvt, speed_t controldevice_audio_speed);
+int gsmopen_serial_init_audio_port(private_t * tech_pvt, int controldevice_audio_speed);
 int serial_audio_init(private_t * tech_pvt);
 int serial_audio_shutdown(private_t * tech_pvt);
 

diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
index 3943ede712a3b643c90f3841216b35945e5365a4..0ae0eb255f47810bca9db8fa5c45f4ccea46f3b6 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
+++ b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
@@ -55,12 +55,12 @@ int gettimeofday(struct timeval *tv, struct sk_timezone *tz)
 /***************/
 #endif /* WIN32 */
 
-int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed)
+int gsmopen_serial_init(private_t * tech_pvt, int controldevice_speed)
 {
 
        tech_pvt->serialPort_serial_control = new ctb::SerialPort();
 
-       if( tech_pvt->serialPort_serial_control->Open( "/dev/ttyUSB3", 115200, "8N1", ctb::SerialPort::NoFlowControl ) >= 0 ) {
+       if( tech_pvt->serialPort_serial_control->Open( "COM9", 115200, "8N1", ctb::SerialPort::NoFlowControl ) >= 0 ) {
                ERRORA("port SUCCESS open\n", GSMOPEN_P_LOG);
        } else {
                ERRORA("port NOT open\n", GSMOPEN_P_LOG);
@@ -3574,11 +3574,11 @@ int gsmopen_serial_getstatus_AT(private_t * tech_pvt)
 }
 
 
-int gsmopen_serial_init_audio_port(private_t * tech_pvt, speed_t controldevice_audio_speed)
+int gsmopen_serial_init_audio_port(private_t * tech_pvt, int controldevice_audio_speed)
 {
        tech_pvt->serialPort_serial_audio = new ctb::SerialPort();
 
-       if( tech_pvt->serialPort_serial_audio->Open( "/dev/ttyUSB2", 115200, "8N1", ctb::SerialPort::NoFlowControl ) >= 0 ) {
+       if( tech_pvt->serialPort_serial_audio->Open( "COM8", 115200, "8N1", ctb::SerialPort::NoFlowControl ) >= 0 ) {
                ERRORA("port SUCCESS open\n", GSMOPEN_P_LOG);
        } else {
                ERRORA("port NOT open\n", GSMOPEN_P_LOG);

diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.vc b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.vc
index 62e7b5637190c3917302039e7a66c210f451808a..6b773f429b423dfd0beaa671c49d4f5e0b64fcfb 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.vc
+++ b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.vc
@@ -44,7 +44,7 @@ INSTALLDIR = $(WXWIN)
 \r
 ### Variables: ###\r
 \r
-CTB_LIB_CXXFLAGS = /MT$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \\r
+CTB_LIB_CXXFLAGS = /MD$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \\r
        $(______DEBUG) /Fd..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.pdb \\r
        $(__OPTIMIZE_FLAG) /I..\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)\r
 CTB_LIB_OBJECTS =  \\r
@@ -56,7 +56,7 @@ CTB_LIB_OBJECTS =  \
        $(OUTPUT)\ctb_lib_serport.obj \\r
        $(OUTPUT)\ctb_lib_timer.obj \\r
        $(____GPIBSRC_FILENAMES_OBJECTS)\r
-CTB_DLL_CXXFLAGS = /MT$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \\r
+CTB_DLL_CXXFLAGS = /MD$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \\r
        $(______DEBUG) /Fd..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.pdb \\r
        $(__OPTIMIZE_FLAG) /I..\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)\r
 CTB_DLL_OBJECTS =  \\r
@@ -68,7 +68,7 @@ CTB_DLL_OBJECTS =  \
        $(OUTPUT)\ctb_dll_serport.obj \\r
        $(OUTPUT)\ctb_dll_timer.obj \\r
        $(____GPIBSRC_FILENAMES_1_OBJECTS)\r
-CTBTEST_CXXFLAGS = /MT$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \\r
+CTBTEST_CXXFLAGS = /MD$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \\r
        $(______DEBUG) /Fd$(OUTPUT)\ctbtest.pdb /DGPIB=$(GPIB) $(__OPTIMIZE_FLAG) \\r
        /I..\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)\r
 CTBTEST_OBJECTS =  \\r

diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj
index 98c5d842ab8a7d4906479dafdc164ef01fc8957e..2233a61624dc168d1939910c24b1bdbbb0996f75 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj
@@ -39,7 +39,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;gsmlib\gsmlib-1.10-patched-12ubuntu1&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-3.8.2\libtiff&quot;"\r
+                               AdditionalIncludeDirectories="&quot;libctb-0.16\include&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-3.8.2\libtiff&quot;"\r
                                PreprocessorDefinitions="NO_ALSA"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
@@ -56,9 +56,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalOptions=" gsmlib.lib &quot;..\..\..\..\w32\library\debug\freeswitchcore.lib&quot; &quot;..\..\..\..\libs\libteletone\Debug\libteletone.lib&quot; ksuser.lib &quot;..\..\..\..\libs\win32\apr\debug\libapr-1.lib&quot;&#x0D;&#x0A;rpcrt4.lib  &quot;..\..\..\..\debug\libtiff.lib&quot; &quot;..\..\..\..\libs\spandsp\src\debug\spandsp.lib&quot;"\r
+                               AdditionalOptions=" ctbd-0.16.lib &quot;..\..\..\..\w32\library\debug\freeswitchcore.lib&quot; &quot;..\..\..\..\libs\libteletone\Debug\libteletone.lib&quot; ksuser.lib &quot;..\..\..\..\libs\win32\apr\debug\libapr-1.lib&quot;&#x0D;&#x0A;rpcrt4.lib  &quot;..\..\..\..\debug\libtiff.lib&quot; &quot;..\..\..\..\libs\spandsp\src\debug\spandsp.lib&quot;"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;gsmlib/gsmlib-1.10-patched-12ubuntu1/win32/Debug/&quot;"\r
+                               AdditionalLibraryDirectories="&quot;libctb-0.16\lib&quot;"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                        />\r

diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
index 896c38ed7a0b141284b9f44db148c3371fe730f0..54996cad63218c33e216c3c053d2acf4773b1ce7 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
@@ -919,7 +919,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
                        *frame = &tech_pvt->read_frame;
 #ifdef BIGENDIAN
                        if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
-                               switch_swap_linear((*frame)->data, (int) (*frame)->datalen / 2);
+                               switch_swap_linear((int16_t *)(*frame)->data, (int) (*frame)->datalen / 2);
                        }
 #endif
                        //WARNINGA("HERE\n", GSMOPEN_P_LOG);