From a4d9a2eb69d80a2c2a1d115e45dcb7ab9fb71e35 Mon Sep 17 00:00:00 2001 From: skarg Date: Thu, 18 Oct 2007 12:13:46 +0000 Subject: [PATCH] Moved bacdcode.c and bacreal.c back to src, and removed the separate bacdcode directory. Since gcc linker can remove unused functions, this was wasted effort. Added bacreal unit test. --- bacnet-stack/lib/Makefile | 6 +- bacnet-stack/lib/makefile.b32 | 6 +- bacnet-stack/ports/at91sam7s/makefile | 6 +- bacnet-stack/ports/atmega168/Makefile | 6 +- bacnet-stack/src/{bacdcode => }/bacdcode.c | 0 bacnet-stack/src/bacdcode/bacreal_test.c | 79 ------------------- bacnet-stack/src/{bacdcode => }/bacint.c | 0 bacnet-stack/src/{bacdcode => }/bacreal.c | 0 .../{src/bacdcode => test}/bacdcode.mak | 0 .../{src/bacdcode => test}/bacint.mak | 0 10 files changed, 12 insertions(+), 91 deletions(-) rename bacnet-stack/src/{bacdcode => }/bacdcode.c (100%) delete mode 100644 bacnet-stack/src/bacdcode/bacreal_test.c rename bacnet-stack/src/{bacdcode => }/bacint.c (100%) rename bacnet-stack/src/{bacdcode => }/bacreal.c (100%) rename bacnet-stack/{src/bacdcode => test}/bacdcode.mak (100%) rename bacnet-stack/{src/bacdcode => test}/bacint.mak (100%) diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile index 8652b222..d24a9638 100644 --- a/bacnet-stack/lib/Makefile +++ b/bacnet-stack/lib/Makefile @@ -27,9 +27,9 @@ CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) CORE_SRC = \ $(BACNET_CORE)/apdu.c \ $(BACNET_CORE)/npdu.c \ - $(BACNET_CORE)/bacdcode/bacdcode.c \ - $(BACNET_CORE)/bacdcode/bacint.c \ - $(BACNET_CORE)/bacdcode/bacreal.c \ + $(BACNET_CORE)/bacdcode.c \ + $(BACNET_CORE)/bacint.c \ + $(BACNET_CORE)/bacreal.c \ $(BACNET_CORE)/bacstr.c \ $(BACNET_CORE)/bacapp.c \ $(BACNET_CORE)/bacprop.c \ diff --git a/bacnet-stack/lib/makefile.b32 b/bacnet-stack/lib/makefile.b32 index 23ccd42e..ea025b56 100644 --- a/bacnet-stack/lib/makefile.b32 +++ b/bacnet-stack/lib/makefile.b32 @@ -37,9 +37,9 @@ INCLUDES = \ CORE1_SRC = $(BACNET_CORE)\apdu.c \ $(BACNET_CORE)\npdu.c \ - $(BACNET_CORE)\bacdcode\bacdcode.c \ - $(BACNET_CORE)\bacdcode\bacint.c \ - $(BACNET_CORE)\bacdcode\bacreal.c \ + $(BACNET_CORE)\bacdcode.c \ + $(BACNET_CORE)\bacint.c \ + $(BACNET_CORE)\bacreal.c \ $(BACNET_CORE)\bacstr.c \ $(BACNET_CORE)\bacapp.c \ $(BACNET_CORE)\bacprop.c \ diff --git a/bacnet-stack/ports/at91sam7s/makefile b/bacnet-stack/ports/at91sam7s/makefile index 16930f68..8cf2581f 100644 --- a/bacnet-stack/ports/at91sam7s/makefile +++ b/bacnet-stack/ports/at91sam7s/makefile @@ -65,9 +65,9 @@ DEMOSRC = ai.c \ CORESRC = $(BACNET_CORE)/npdu.c \ $(BACNET_CORE)/apdu.c \ - $(BACNET_CORE)/bacdcode/bacdcode.c \ - $(BACNET_CORE)/bacdcode/bacint.c \ - $(BACNET_CORE)/bacdcode/bacreal.c \ + $(BACNET_CORE)/bacdcode.c \ + $(BACNET_CORE)/bacint.c \ + $(BACNET_CORE)/bacreal.c \ $(BACNET_CORE)/bacstr.c \ $(BACNET_CORE)/bacaddr.c \ $(BACNET_CORE)/abort.c \ diff --git a/bacnet-stack/ports/atmega168/Makefile b/bacnet-stack/ports/atmega168/Makefile index 26a8c549..c415665e 100644 --- a/bacnet-stack/ports/atmega168/Makefile +++ b/bacnet-stack/ports/atmega168/Makefile @@ -36,9 +36,9 @@ DEMOSRC = h_rp.c \ CORESRC = \ $(BACNET_CORE)/apdu.c \ $(BACNET_CORE)/npdu.c \ - $(BACNET_CORE)/bacdcode/bacdcode.c \ - $(BACNET_CORE)/bacdcode/bacint.c \ - $(BACNET_CORE)/bacdcode/bacreal.c \ + $(BACNET_CORE)/bacdcode.c \ + $(BACNET_CORE)/bacint.c \ + $(BACNET_CORE)/bacreal.c \ $(BACNET_CORE)/bacstr.c \ $(BACNET_CORE)/iam.c \ $(BACNET_CORE)/rp.c \ diff --git a/bacnet-stack/src/bacdcode/bacdcode.c b/bacnet-stack/src/bacdcode.c similarity index 100% rename from bacnet-stack/src/bacdcode/bacdcode.c rename to bacnet-stack/src/bacdcode.c diff --git a/bacnet-stack/src/bacdcode/bacreal_test.c b/bacnet-stack/src/bacdcode/bacreal_test.c deleted file mode 100644 index 714f6e66..00000000 --- a/bacnet-stack/src/bacdcode/bacreal_test.c +++ /dev/null @@ -1,79 +0,0 @@ -/*####COPYRIGHTBEGIN#### - ------------------------------------------- - Copyright (C) 2004 Steve Karg - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - The Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA. - - As a special exception, if other files instantiate templates or - use macros or inline functions from this file, or you compile - this file and link it with other works to produce a work based - on this file, this file does not by itself cause the resulting - work to be covered by the GNU General Public License. However - the source code for this file must still be made available in - accordance with section (3) of the GNU General Public License. - - This exception does not invalidate any other reasons why a work - based on this file might be covered by the GNU General Public - License. - ------------------------------------------- -####COPYRIGHTEND####*/ - -#include - -#include "bacdef.h" -#include "bacdcode.h" -#include "bacenum.h" -#include "bits.h" -#include "bacstr.h" -#include "bacint.h" -#include -#include -#include -#include "ctest.h" - -void testBACDCodeReal(Test * pTest) -{ - uint8_t real_array[4] = { 0 }; - uint8_t encoded_array[4] = { 0 }; - float value = 42.123; - float decoded_value = 0; - uint8_t apdu[MAX_APDU] = { 0 }; - int len = 0, apdu_len = 0; - uint8_t tag_number = 0; - uint32_t long_value = 0; - - encode_bacnet_real(value, &real_array[0]); - decode_real(&real_array[0], &decoded_value); - ct_test(pTest, decoded_value == value); - encode_bacnet_real(value, &encoded_array[0]); - ct_test(pTest, memcmp(&real_array, &encoded_array, - sizeof(real_array)) == 0); - - /* a real will take up 4 octects plus a one octet tag */ - apdu_len = encode_application_real(&apdu[0], value); - ct_test(pTest, apdu_len == 5); - /* len tells us how many octets were used for encoding the value */ - len = decode_tag_number_and_value(&apdu[0], &tag_number, &long_value); - ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_REAL); - ct_test(pTest, decode_is_context_specific(&apdu[0]) == false); - ct_test(pTest, len == 1); - ct_test(pTest, long_value == 4); - decode_real(&apdu[len], &decoded_value); - ct_test(pTest, decoded_value == value); - - return; -} diff --git a/bacnet-stack/src/bacdcode/bacint.c b/bacnet-stack/src/bacint.c similarity index 100% rename from bacnet-stack/src/bacdcode/bacint.c rename to bacnet-stack/src/bacint.c diff --git a/bacnet-stack/src/bacdcode/bacreal.c b/bacnet-stack/src/bacreal.c similarity index 100% rename from bacnet-stack/src/bacdcode/bacreal.c rename to bacnet-stack/src/bacreal.c diff --git a/bacnet-stack/src/bacdcode/bacdcode.mak b/bacnet-stack/test/bacdcode.mak similarity index 100% rename from bacnet-stack/src/bacdcode/bacdcode.mak rename to bacnet-stack/test/bacdcode.mak diff --git a/bacnet-stack/src/bacdcode/bacint.mak b/bacnet-stack/test/bacint.mak similarity index 100% rename from bacnet-stack/src/bacdcode/bacint.mak rename to bacnet-stack/test/bacint.mak