dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed up most warnings after bacdcode changes to unsigned and signed decoding.

Browse Source 
Fixed up the Visual C++ demo in ports/win32/bacnet/
This commit is contained in:
skarg
2006-01-16 15:00:22 +00:00
parent 2adca3320d
commit cabdeab081
25 changed files with 138 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/win32/bacnet.ide
BIN
View File
Binary file not shown.
bacnet-stack/ports/win32/bacnet/bacnet.dsp
+47 -3
View File
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /I "c:\code\bacnet-stack\demo\object\\" /I "c:\code\bacnet-stack\demo\handler\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BACDL_BIP" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /I "c:\code\bacnet-stack\demo\object" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "BACDL_BIP" /FR /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "c:\code\bacnet-stack\demo\object" /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /I "c:\code\bacnet-stack\demo\object\\" /I "c:\code\bacnet-stack\demo\handler\\" /D "_DEBUG" /D "BACDL_BIP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -161,7 +161,31 @@ SOURCE=..\..\..\demo\object\device.c
# End Source File
# Begin Source File
SOURCE=..\..\..\handlers.c
SOURCE=..\..\..\demo\handler\h_arf.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\h_arf_a.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\h_iam.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\h_rp.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\h_rp_a.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\h_whois.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\h_wp.c
# End Source File
# Begin Source File
@@ -177,6 +201,10 @@ SOURCE=..\main.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\noserv.c
# End Source File
# Begin Source File
SOURCE=..\..\..\npdu.c
# End Source File
# Begin Source File
@@ -193,10 +221,26 @@ SOURCE=..\..\..\rp.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\s_rp.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\s_whois.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\s_wp.c
# End Source File
# Begin Source File
SOURCE=..\..\..\tsm.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\txbuf.c
# End Source File
# Begin Source File
SOURCE=..\..\..\whois.c
# End Source File
# Begin Source File
bacnet-stack/ports/win32/bacnet/bacnet.ncb
BIN
View File
Binary file not shown.
bacnet-stack/ports/win32/bacnet/bacnet.opt
BIN
View File
Binary file not shown.
bacnet-stack/ports/win32/bacnet/bacnet.plg
+36 -83
View File
@@ -8,36 +8,8 @@
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58A.tmp" with contents
[
/nologo /MLd /W3 /Gm /GX /ZI /Od /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /I "c:\code\bacnet-stack\demo\object" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "BACDL_BIP" /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\code\bacnet-stack\abort.c"
"C:\code\bacnet-stack\address.c"
"C:\code\bacnet-stack\apdu.c"
"C:\code\bacnet-stack\arf.c"
"C:\code\bacnet-stack\bacapp.c"
"C:\code\bacnet-stack\bacdcode.c"
"C:\code\bacnet-stack\bacerror.c"
"C:\code\bacnet-stack\bacstr.c"
"C:\code\bacnet-stack\bactext.c"
"C:\code\bacnet-stack\bigend.c"
"C:\code\bacnet-stack\ports\win32\bip-init.c"
"C:\code\bacnet-stack\bip.c"
"C:\code\bacnet-stack\crc.c"
"C:\code\bacnet-stack\datalink.c"
"C:\code\bacnet-stack\handlers.c"
"C:\code\bacnet-stack\iam.c"
"C:\code\bacnet-stack\indtext.c"
/nologo /MLd /W3 /Gm /GX /ZI /Od /I "c:\code\bacnet-stack\demo\object" /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /I "c:\code\bacnet-stack\demo\object\\" /I "c:\code\bacnet-stack\demo\handler\\" /D "_DEBUG" /D "BACDL_BIP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\code\bacnet-stack\ports\win32\main.c"
"C:\code\bacnet-stack\npdu.c"
"C:\code\bacnet-stack\reject.c"
"C:\code\bacnet-stack\ringbuf.c"
"C:\code\bacnet-stack\rp.c"
"C:\code\bacnet-stack\tsm.c"
"C:\code\bacnet-stack\whois.c"
"C:\code\bacnet-stack\wp.c"
"C:\code\bacnet-stack\demo\object\device.c"
"C:\code\bacnet-stack\demo\object\ai.c"
"C:\code\bacnet-stack\demo\object\ao.c"
"C:\code\bacnet-stack\demo\object\bacfile.c"
]
Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58A.tmp"
Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58B.tmp" with contents
@@ -45,11 +17,14 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58B.tmp" with conten
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/bacnet.pdb" /debug /machine:I386 /out:"Debug/bacnet.exe" /pdbtype:sept
".\Debug\abort.obj"
".\Debug\address.obj"
".\Debug\ai.obj"
".\Debug\ao.obj"
".\Debug\apdu.obj"
".\Debug\arf.obj"
".\Debug\bacapp.obj"
".\Debug\bacdcode.obj"
".\Debug\bacerror.obj"
".\Debug\bacfile.obj"
".\Debug\bacstr.obj"
".\Debug\bactext.obj"
".\Debug\bigend.obj"
@@ -57,7 +32,7 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
".\Debug\bip.obj"
".\Debug\crc.obj"
".\Debug\datalink.obj"
".\Debug\handlers.obj"
".\Debug\device.obj"
".\Debug\iam.obj"
".\Debug\indtext.obj"
".\Debug\main.obj"
@@ -68,69 +43,39 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
".\Debug\tsm.obj"
".\Debug\whois.obj"
".\Debug\wp.obj"
".\Debug\device.obj"
".\Debug\ai.obj"
".\Debug\ao.obj"
".\Debug\bacfile.obj"
".\Debug\s_rp.obj"
".\Debug\s_whois.obj"
".\Debug\s_wp.obj"
".\Debug\txbuf.obj"
".\Debug\h_arf.obj"
".\Debug\h_arf_a.obj"
".\Debug\h_iam.obj"
".\Debug\h_rp.obj"
".\Debug\h_rp_a.obj"
".\Debug\h_whois.obj"
".\Debug\h_wp.obj"
".\Debug\noserv.obj"
]
Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58B.tmp"
<h3>Output Window</h3>
Compiling...
abort.c
address.c
apdu.c
arf.c
bacapp.c
bacdcode.c
bacerror.c
bacstr.c
bactext.c
bigend.c
bip-init.c
bip.c
crc.c
datalink.c
handlers.c
iam.c
indtext.c
main.c
c:\code\bacnet-stack\ports\win32\net.h(30) : warning C4005: 'STRICT' : macro redefinition
c:\program files\microsoft visual studio\vc98\include\windef.h(15) : see previous definition of 'STRICT'
npdu.c
reject.c
Generating Code...
c:\code\bacnet-stack\npdu.c(332) : warning C4761: integral size mismatch in argument; conversion supplied
c:\code\bacnet-stack\handlers.c(194) : warning C4761: integral size mismatch in argument; conversion supplied
c:\code\bacnet-stack\handlers.c(271) : warning C4761: integral size mismatch in argument; conversion supplied
Compiling...
ringbuf.c
rp.c
tsm.c
whois.c
wp.c
device.c
ai.c
c:\code\bacnet-stack\demo\object\ai.c(76) : warning C4305: 'initializing' : truncation from 'const double ' to 'float '
ao.c
c:\code\bacnet-stack\demo\object\ao.c(157) : warning C4305: 'initializing' : truncation from 'const double ' to 'float '
bacfile.c
Generating Code...
c:\code\bacnet-stack\demo\object\bacfile.c(285) : warning C4761: integral size mismatch in argument; conversion supplied
c:\code\bacnet-stack\demo\object\device.c(611) : warning C4761: integral size mismatch in argument; conversion supplied
c:\code\bacnet-stack\demo\object\device.c(624) : warning C4761: integral size mismatch in argument; conversion supplied
c:\code\bacnet-stack\demo\object\device.c(637) : warning C4761: integral size mismatch in argument; conversion supplied
c:\code\bacnet-stack\wp.c(129) : warning C4761: integral size mismatch in argument; conversion supplied
Linking...
Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58D.tmp" with contents
Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58C.tmp" with contents
[
/nologo /o"Debug/bacnet.bsc"
".\Debug\abort.sbr"
".\Debug\address.sbr"
".\Debug\ai.sbr"
".\Debug\ao.sbr"
".\Debug\apdu.sbr"
".\Debug\arf.sbr"
".\Debug\bacapp.sbr"
".\Debug\bacdcode.sbr"
".\Debug\bacerror.sbr"
".\Debug\bacfile.sbr"
".\Debug\bacstr.sbr"
".\Debug\bactext.sbr"
".\Debug\bigend.sbr"
@@ -138,7 +83,7 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58D.tmp" with conten
".\Debug\bip.sbr"
".\Debug\crc.sbr"
".\Debug\datalink.sbr"
".\Debug\handlers.sbr"
".\Debug\device.sbr"
".\Debug\iam.sbr"
".\Debug\indtext.sbr"
".\Debug\main.sbr"
@@ -149,18 +94,26 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58D.tmp" with conten
".\Debug\tsm.sbr"
".\Debug\whois.sbr"
".\Debug\wp.sbr"
".\Debug\device.sbr"
".\Debug\ai.sbr"
".\Debug\ao.sbr"
".\Debug\bacfile.sbr"]
Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58D.tmp"
".\Debug\s_rp.sbr"
".\Debug\s_whois.sbr"
".\Debug\s_wp.sbr"
".\Debug\txbuf.sbr"
".\Debug\h_arf.sbr"
".\Debug\h_arf_a.sbr"
".\Debug\h_iam.sbr"
".\Debug\h_rp.sbr"
".\Debug\h_rp_a.sbr"
".\Debug\h_whois.sbr"
".\Debug\h_wp.sbr"
".\Debug\noserv.sbr"]
Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP58C.tmp"
Creating browse info file...
<h3>Output Window</h3>
<h3>Results</h3>
bacnet.exe - 0 error(s), 11 warning(s)
bacnet.exe - 0 error(s), 1 warning(s)
</pre>
</body>
</html>
bacnet-stack/ports/win32/bip-init.c
+6
View File
@@ -85,6 +85,12 @@ static void cleanup(void)
WSACleanup();
}
void bip_set_interface(char *ifname)
{
(void)ifname;
/* dummy function */
}
bool bip_init(void)
{
int rv = 0; // return from socket lib calls
bacnet-stack/ports/win32/main.c
+12 -8
View File
@@ -24,7 +24,7 @@
*********************************************************************/
// This is one way to use the embedded BACnet stack under Win32
// compiled with Borland C++ 5.02
// compiled with Borland C++ 5.02 or Visual C++ 6.0
#include <winsock2.h>
#include <stddef.h>
#include <stdint.h>
@@ -38,10 +38,14 @@
#include "apdu.h"
#include "device.h"
#include "handlers.h"
#include "client.h"
#include "datalink.h"
#include "txbuf.h"
// buffer used for receive
static uint8_t Rx_Buf[MAX_MPDU] = {0};
/* send a whois to see who is on the network */
static bool Who_Is_Request = true;
static void Read_Properties(void)
{
@@ -164,7 +168,7 @@ static void Init_Service_Handlers(void)
// we need to handle who-is to support dynamic device binding
apdu_set_unconfirmed_handler(
SERVICE_UNCONFIRMED_WHO_IS,
WhoIsHandler);
handler_who_is);
apdu_set_unconfirmed_handler(
SERVICE_UNCONFIRMED_I_AM,
LocalIAmHandler);
@@ -172,18 +176,18 @@ static void Init_Service_Handlers(void)
// set the handler for all the services we don't implement
// It is required to send the proper reject message...
apdu_set_unrecognized_service_handler_handler(
UnrecognizedServiceHandler);
handler_unrecognized_service);
// we must implement read property - it's required!
apdu_set_confirmed_handler(
SERVICE_CONFIRMED_READ_PROPERTY,
ReadPropertyHandler);
handler_read_property);
apdu_set_confirmed_handler(
SERVICE_CONFIRMED_WRITE_PROPERTY,
WritePropertyHandler);
handler_write_property);
// handle the data coming back from confirmed requests
apdu_set_confirmed_ack_handler(
SERVICE_CONFIRMED_READ_PROPERTY,
ReadPropertyAckHandler);
handler_read_property_ack);
}
static void print_address(
@@ -274,11 +278,11 @@ int main(int argc, char *argv[])
if (I_Am_Request)
{
I_Am_Request = false;
Send_IAm();
iam_send(&Handler_Transmit_Buffer[0]);
} else if (Who_Is_Request)
{
Who_Is_Request = false;
Send_WhoIs();
Send_WhoIs(-1,-1);
}
else
{