From 38dc91e54020e77989b75b14f648d711e03160ca Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 30 Oct 2008 21:09:39 +0000
Subject: [PATCH] Added WhoIs to bit string returned for Services Supported.

---
 bacnet-stack/ports/atmega168/apdu.c     | 3 +++
 bacnet-stack/ports/atmega168/bacnet.aps | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bacnet-stack/ports/atmega168/apdu.c b/bacnet-stack/ports/atmega168/apdu.c
index cfd0f9cc..3cc2469e 100644
--- a/bacnet-stack/ports/atmega168/apdu.c
+++ b/bacnet-stack/ports/atmega168/apdu.c
@@ -49,6 +49,9 @@ bool apdu_service_supported(
     if (service_supported == SERVICE_SUPPORTED_READ_PROPERTY) {
         status = true;
     }
+    if (service_supported == SERVICE_SUPPORTED_WHO_IS) {
+        status = true;
+    }
 #ifdef WRITE_PROPERTY
     if (service_supported == SERVICE_SUPPORTED_WRITE_PROPERTY) {
         status = true;
diff --git a/bacnet-stack/ports/atmega168/bacnet.aps b/bacnet-stack/ports/atmega168/bacnet.aps
index 55a9cae9..a39bd51c 100644
--- a/bacnet-stack/ports/atmega168/bacnet.aps
+++ b/bacnet-stack/ports/atmega168/bacnet.aps
@@ -1 +1 @@
-<AVRStudio><MANAGEMENT><Created>13-Aug-2007 15:08:27</Created><LastEdit>20-Mar-2008 16:30:00</LastEdit><ProjectType>0</ProjectType><Created>13-Aug-2007 15:08:27</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName><ICON>241</ICON><ProjectName>bacnet</ProjectName><Created>13-Aug-2007 15:11:07</Created><LastEdit>13-Aug-2007 15:11:07</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>13-Aug-2007 15:11:07</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>bacnet.elf</ObjectFile><EntryFile></EntryFile><ObjectFile></ObjectFile><EntryFile></EntryFile><SaveFolder>C:\code\bacnet-stack\ports\atmega168\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_PART>ATmega168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><CURRENT_TARGET>AVR Dragon</CURRENT_TARGET><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_PART>ATmega168.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND></IO_EXPAND><REGISTERNAMES></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>property_len</Variables><Variables>object_index</Variables><Variables>Present_Value</Variables><Variables>value</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>rs485.c</SOURCEFILE><SOURCEFILE>timer.c</SOURCEFILE><SOURCEFILE>dlmstp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\txbuf.c</SOURCEFILE><SOURCEFILE>device.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\crc.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\npdu.c</SOURCEFILE><SOURCEFILE>apdu.c</SOURCEFILE><SOURCEFILE>h_rp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\iam.c</SOURCEFILE><SOURCEFILE>av.c</SOURCEFILE><SOURCEFILE>h_wp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacapp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacstr.c</SOURCEFILE><SOURCEFILE>bv.c</SOURCEFILE><SOURCEFILE>h_whois.c</SOURCEFILE><HEADERFILE>avr035.h</HEADERFILE><HEADERFILE>hardware.h</HEADERFILE><HEADERFILE>rs485.h</HEADERFILE><HEADERFILE>timer.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\crc.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\dlmstp.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\iam.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\npdu.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\txbuf.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacenum.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacdcode.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacapp.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacstr.h</HEADERFILE><OTHERFILE>Makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>Makefile</EXTERNALMAKEFILE><PART>atmega168</PART><HEX>1</HEX><LIST>0</LIST><MAP>0</MAP><OUTPUTFILENAME>bacnet.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>C:\code\bacnet-stack\crc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\mstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>dlmstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rs485.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>..\..\demo\handler\</INCLUDE><INCLUDE>.\</INCLUDE><INCLUDE>..\..\</INCLUDE><INCLUDE>..\..\demo\object\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2  -DMAX_APDU=50  -DBACDL_MSTP  -DBIG_ENDIAN=0 -DF_CPU=7372800UL -O0 -fsigned-char</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20071221rc1\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20071221rc1\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><MANAGEMENT></MANAGEMENT><CODE_CREATION></CODE_CREATION><DEBUG_TARGET></DEBUG_TARGET><Debugger></Debugger><AVRSimulator><FuseExt>0</FuseExt><FuseHigh>28</FuseHigh><FuseLow>216</FuseLow><LockBits>193</LockBits><Frequency>7372800</Frequency><ExtSRAM>0</ExtSRAM><SimBoot>1</SimBoot><SimBootnew>1</SimBootnew></AVRSimulator><AVRDragon><DAISY_CHAIN>0</DAISY_CHAIN><DEVS_BEFORE>0</DEVS_BEFORE><DEVS_AFTER>0</DEVS_AFTER><INSTRBITS_BEFORE>0</INSTRBITS_BEFORE><INSTRBITS_AFTER>0</INSTRBITS_AFTER><BAUDRATE>19200</BAUDRATE><JTAG_FREQ>1000000</JTAG_FREQ><TIMERS_RUNNING>0</TIMERS_RUNNING><PRESERVE_EEPROM>0</PRESERVE_EEPROM><ALWAYS_EXT_RESET>0</ALWAYS_EXT_RESET><PRINT_BRK_CAUSE>1</PRINT_BRK_CAUSE><ENABLE_IDR_IN_RUN_MODE>0</ENABLE_IDR_IN_RUN_MODE><ALLOW_BRK_INSTR>1</ALLOW_BRK_INSTR><STOPIF_ENTRYFUNC_NOTFOUND>1</STOPIF_ENTRYFUNC_NOTFOUND><ENTRY_FUNCTION>main</ENTRY_FUNCTION><REPROGRAM>1</REPROGRAM></AVRDragon><IOView><usergroups/><sort sorted="0" column="0" ordername="0" orderaddress="0" ordergroup="0"/></IOView><Files><File00000><FileId>00000</FileId><FileName>main.c</FileName><Status>259</Status></File00000><File00001><FileId>00001</FileId><FileName>dlmstp.c</FileName><Status>259</Status></File00001><File00002><FileId>00002</FileId><FileName>C:\code\bacnet-stack\src\crc.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>C:\code\bacnet-stack\src\bacstr.c</FileName><Status>257</Status></File00003><File00004><FileId>00004</FileId><FileName>av.c</FileName><Status>257</Status></File00004><File00005><FileId>00005</FileId><FileName>bv.c</FileName><Status>258</Status></File00005><File00006><FileId>00006</FileId><FileName>h_whois.c</FileName><Status>257</Status></File00006></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
+<AVRStudio><MANAGEMENT><Created>13-Aug-2007 15:08:27</Created><LastEdit>30-Oct-2008 15:54:44</LastEdit><ProjectType>0</ProjectType><Created>13-Aug-2007 15:08:27</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName><ICON>241</ICON><ProjectName>bacnet</ProjectName><Created>13-Aug-2007 15:11:07</Created><LastEdit>13-Aug-2007 15:11:07</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>13-Aug-2007 15:11:07</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>bacnet.elf</ObjectFile><EntryFile></EntryFile><ObjectFile></ObjectFile><EntryFile></EntryFile><SaveFolder>C:\code\bacnet-stack\ports\atmega168\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_PART>ATMEGA168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><CURRENT_TARGET>AVR Dragon</CURRENT_TARGET><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_PART>ATmega168.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND></IO_EXPAND><REGISTERNAMES></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>property_len</Variables><Variables>object_index</Variables><Variables>Present_Value</Variables><Variables>value</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers><trigger clsid="{113824F1-C410-4699-A25E-867CC860C28E}" enabled="1" boundTo="0" hitCount="1" updateAndContinue="0" line="192" file="main.c" token="            npdu_handler(&amp;src, &amp;PDUBuffer[0], pdu_len);" offset="0"/></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>rs485.c</SOURCEFILE><SOURCEFILE>timer.c</SOURCEFILE><SOURCEFILE>dlmstp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\txbuf.c</SOURCEFILE><SOURCEFILE>device.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\crc.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\npdu.c</SOURCEFILE><SOURCEFILE>apdu.c</SOURCEFILE><SOURCEFILE>h_rp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\iam.c</SOURCEFILE><SOURCEFILE>av.c</SOURCEFILE><SOURCEFILE>h_wp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacapp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacstr.c</SOURCEFILE><SOURCEFILE>bv.c</SOURCEFILE><SOURCEFILE>h_whois.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\whois.c</SOURCEFILE><HEADERFILE>avr035.h</HEADERFILE><HEADERFILE>hardware.h</HEADERFILE><HEADERFILE>rs485.h</HEADERFILE><HEADERFILE>timer.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\crc.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\dlmstp.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\iam.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\npdu.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\txbuf.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacenum.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacdcode.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacapp.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacstr.h</HEADERFILE><OTHERFILE>Makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>Makefile</EXTERNALMAKEFILE><PART>atmega168</PART><HEX>1</HEX><LIST>0</LIST><MAP>0</MAP><OUTPUTFILENAME>bacnet.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>C:\code\bacnet-stack\crc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\mstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>dlmstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rs485.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>..\..\demo\handler\</INCLUDE><INCLUDE>.\</INCLUDE><INCLUDE>..\..\</INCLUDE><INCLUDE>..\..\demo\object\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2  -DMAX_APDU=50  -DBACDL_MSTP  -DBIG_ENDIAN=0 -DF_CPU=7372800UL -O0 -fsigned-char</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20071221rc1\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20071221rc1\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><MANAGEMENT></MANAGEMENT><CODE_CREATION></CODE_CREATION><DEBUG_TARGET></DEBUG_TARGET><Debugger></Debugger><AVRSimulator><FuseExt>0</FuseExt><FuseHigh>28</FuseHigh><FuseLow>216</FuseLow><LockBits>193</LockBits><Frequency>7372800</Frequency><ExtSRAM>0</ExtSRAM><SimBoot>1</SimBoot><SimBootnew>1</SimBootnew></AVRSimulator><AVRDragon><DAISY_CHAIN>0</DAISY_CHAIN><DEVS_BEFORE>0</DEVS_BEFORE><DEVS_AFTER>0</DEVS_AFTER><INSTRBITS_BEFORE>0</INSTRBITS_BEFORE><INSTRBITS_AFTER>0</INSTRBITS_AFTER><BAUDRATE>19200</BAUDRATE><JTAG_FREQ>1000000</JTAG_FREQ><TIMERS_RUNNING>0</TIMERS_RUNNING><PRESERVE_EEPROM>0</PRESERVE_EEPROM><ALWAYS_EXT_RESET>0</ALWAYS_EXT_RESET><PRINT_BRK_CAUSE>1</PRINT_BRK_CAUSE><ENABLE_IDR_IN_RUN_MODE>0</ENABLE_IDR_IN_RUN_MODE><ALLOW_BRK_INSTR>1</ALLOW_BRK_INSTR><STOPIF_ENTRYFUNC_NOTFOUND>1</STOPIF_ENTRYFUNC_NOTFOUND><ENTRY_FUNCTION>main</ENTRY_FUNCTION><REPROGRAM>1</REPROGRAM></AVRDragon><IOView><usergroups/><sort sorted="0" column="0" ordername="1" orderaddress="1" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>main.c</FileName><Status>259</Status></File00000><File00001><FileId>00001</FileId><FileName>dlmstp.c</FileName><Status>259</Status></File00001><File00002><FileId>00002</FileId><FileName>C:\code\bacnet-stack\src\crc.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>C:\code\bacnet-stack\src\bacstr.c</FileName><Status>257</Status></File00003><File00004><FileId>00004</FileId><FileName>av.c</FileName><Status>257</Status></File00004><File00005><FileId>00005</FileId><FileName>bv.c</FileName><Status>258</Status></File00005><File00006><FileId>00006</FileId><FileName>h_whois.c</FileName><Status>259</Status></File00006><File00007><FileId>00007</FileId><FileName>rs485.c</FileName><Status>257</Status></File00007><File00008><FileId>00008</FileId><FileName>C:\code\bacnet-stack\demo\handler\h_npdu.c</FileName><Status>3</Status></File00008><File00009><FileId>00009</FileId><FileName>apdu.c</FileName><Status>3</Status></File00009><File00010><FileId>00010</FileId><FileName>C:\code\bacnet-stack\src\whois.c</FileName><Status>1</Status></File00010><File00011><FileId>00011</FileId><FileName>device.c</FileName><Status>1</Status></File00011></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>