diff --git a/bacnet-stack/demo/epics/main.c b/bacnet-stack/demo/epics/main.c index c9b63dbc..8b839034 100644 --- a/bacnet-stack/demo/epics/main.c +++ b/bacnet-stack/demo/epics/main.c @@ -277,8 +277,8 @@ static void Init_Service_Handlers( uint32_t Object_Instance; /* Put this client Device into the Routing table (first entry) */ Object_Instance = Device_Object_Instance_Number(); - Add_Routed_Device( Object_Instance, Device_Object_Name(), - Device_Description() ); + Add_Routed_Device(Object_Instance, Device_Object_Name(), + Device_Description()); #endif /* we need to handle who-is @@ -797,10 +797,8 @@ void PrintUsage( (" -t: declare target's MAC instead of using Who-Is to bind to \r\n"); printf (" device-instance. Format is \"C0:A8:00:18:BA:C0\" (as usual) \r\n"); - printf - (" Use \"7F:00:00:01:BA:C0\" for loopback testing \r\n"); - printf - (" -n: specify target's DNET if not local BACnet network \r\n"); + printf(" Use \"7F:00:00:01:BA:C0\" for loopback testing \r\n"); + printf(" -n: specify target's DNET if not local BACnet network \r\n"); printf(" or on routed Virtual Network \r\n"); printf("\r\n"); printf("Insert the output in your EPICS file as the last section: \r\n"); @@ -839,10 +837,12 @@ int CheckCommandLineArgs( break; case 'n': /* Destination Network Number */ - if ( Target_Address.mac_len == 0 ) - fprintf(stderr, "Must provide a Target MAC before DNET \r\n"); + if (Target_Address.mac_len == 0) + fprintf(stderr, + "Must provide a Target MAC before DNET \r\n"); if (++i < argc) - Target_Address.net = (uint16_t) strtol(argv[i], NULL, 0); + Target_Address.net = + (uint16_t) strtol(argv[i], NULL, 0); /* Used strtol so dest.net can be either 0x1234 or 4660 */ break; case 't': @@ -854,10 +854,9 @@ int CheckCommandLineArgs( /* loop counter */ unsigned j; count = - sscanf(argv[i], "%x:%x:%x:%x:%x:%x", - &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], - &mac[5]); - if (count == 6) { /* success */ + sscanf(argv[i], "%x:%x:%x:%x:%x:%x", &mac[0], + &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); + if (count == 6) { /* success */ Target_Address.mac_len = count; for (j = 0; j < 6; j++) { Target_Address.mac[j] = (uint8_t) mac[j]; @@ -967,30 +966,30 @@ int main( timeout_seconds = (apdu_timeout() / 1000) * apdu_retries(); if (My_BIP_Port > 0) - bip_set_port(htons(0xBAC0)); /* Set back to std BACnet/IP port */ + bip_set_port(htons(0xBAC0)); /* Set back to std BACnet/IP port */ /* try to bind with the target device */ found = address_bind_request(Target_Device_Object_Instance, &max_apdu, &Target_Address); if (!found) { if (Provided_Targ_MAC) { - if ( Target_Address.net > 0 ) { + if (Target_Address.net > 0) { /* We specified a DNET; call Who-Is to find the full * routed path to this Device */ Send_WhoIs_Remote(&Target_Address, - Target_Device_Object_Instance, - Target_Device_Object_Instance); + Target_Device_Object_Instance, + Target_Device_Object_Instance); } else { /* Update by adding the MAC address */ if (max_apdu == 0) - max_apdu = MAX_APDU; /* Whatever set for this datalink. */ + max_apdu = MAX_APDU; /* Whatever set for this datalink. */ address_add_binding(Target_Device_Object_Instance, max_apdu, - &Target_Address); + &Target_Address); } } else { Send_WhoIs(Target_Device_Object_Instance, - Target_Device_Object_Instance); + Target_Device_Object_Instance); } } myObject.type = OBJECT_DEVICE; @@ -1036,7 +1035,7 @@ int main( } else { /* Print out the header information */ printf("List of Objects in device %u: \r\n", - Target_Device_Object_Instance); + Target_Device_Object_Instance); /* Print Opening brace, then kick off the Device Object */ printf("{ \r\n"); printf(" { \r\n"); /* And opening brace for the first object */ @@ -1158,11 +1157,11 @@ int main( (invoke_id == Read_Property_Multiple_Data.service_data.invoke_id)) { Read_Property_Multiple_Data.new_data = false; - PrintReadPropertyData(Read_Property_Multiple_Data. - rpm_data->object_type, + PrintReadPropertyData + (Read_Property_Multiple_Data.rpm_data->object_type, Read_Property_Multiple_Data.rpm_data->object_instance, - Read_Property_Multiple_Data.rpm_data-> - listOfProperties); + Read_Property_Multiple_Data. + rpm_data->listOfProperties); if (tsm_invoke_id_free(invoke_id)) { invoke_id = 0; } else { diff --git a/bacnet-stack/demo/gateway/gateway.h b/bacnet-stack/demo/gateway/gateway.h index 4e862562..5361c878 100644 --- a/bacnet-stack/demo/gateway/gateway.h +++ b/bacnet-stack/demo/gateway/gateway.h @@ -38,7 +38,7 @@ /* Device configuration definitions. */ #define FIRST_DEVICE_NUMBER 260001 -#define VIRTUAL_DNET 2709 /* your choice of number here */ +#define VIRTUAL_DNET 2709 /* your choice of number here */ #define DEV_NAME_BASE "Gateway Demo Device" #define DEV_DESCR_GATEWAY "Gateway Device and Router" #define DEV_DESCR_REMOTE "Routed Remote Device" diff --git a/bacnet-stack/demo/gateway/main.c b/bacnet-stack/demo/gateway/main.c index 29ca55fc..8903906c 100644 --- a/bacnet-stack/demo/gateway/main.c +++ b/bacnet-stack/demo/gateway/main.c @@ -85,7 +85,7 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, + {DEVICE_OBJ_FUNCTIONS}, {ANALOG_INPUT_OBJ_FUNCTIONS}, {ANALOG_OUTPUT_OBJ_FUNCTIONS}, {ANALOG_VALUE_OBJ_FUNCTIONS}, @@ -110,7 +110,7 @@ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; * Only one entry since we don't support downstream routers. */ int DNET_list[2] = { - VIRTUAL_DNET, -1 /* Need -1 terminator */ + VIRTUAL_DNET, -1 /* Need -1 terminator */ }; @@ -120,7 +120,7 @@ int DNET_list[2] = { instance number, and subsequent devices to incremented values. */ void Devices_Init( - uint32_t first_object_instance ) + uint32_t first_object_instance) { int i; char nameText[MAX_DEV_NAME_LEN]; @@ -128,24 +128,20 @@ void Devices_Init( /* Gateway Device has already been initialized. * But give it a better Description. */ - Routed_Device_Set_Description(DEV_DESCR_GATEWAY, strlen(DEV_DESCR_GATEWAY)); + Routed_Device_Set_Description(DEV_DESCR_GATEWAY, + strlen(DEV_DESCR_GATEWAY)); /* Now initialize the remote Device objects. */ - for ( i = 1; i < MAX_NUM_DEVICES; i++ ) - { + for (i = 1; i < MAX_NUM_DEVICES; i++) { #ifdef _MSC_VER - _snprintf( nameText, MAX_DEV_NAME_LEN, "%s %d", - DEV_NAME_BASE, i+1); - _snprintf( descText, MAX_DEV_DESC_LEN, "%s %d", - DEV_DESCR_REMOTE, i); + _snprintf(nameText, MAX_DEV_NAME_LEN, "%s %d", DEV_NAME_BASE, i + 1); + _snprintf(descText, MAX_DEV_DESC_LEN, "%s %d", DEV_DESCR_REMOTE, i); #else - snprintf( nameText, MAX_DEV_NAME_LEN, "%s %d", - DEV_NAME_BASE, i+1); - snprintf( descText, MAX_DEV_DESC_LEN, "%s %d", - DEV_DESCR_REMOTE, i); + snprintf(nameText, MAX_DEV_NAME_LEN, "%s %d", DEV_NAME_BASE, i + 1); + snprintf(descText, MAX_DEV_DESC_LEN, "%s %d", DEV_DESCR_REMOTE, i); #endif - Add_Routed_Device( (first_object_instance+i), nameText, descText ); + Add_Routed_Device((first_object_instance + i), nameText, descText); } } @@ -155,18 +151,18 @@ void Devices_Init( * @see Device_Init, apdu_set_unconfirmed_handler, apdu_set_confirmed_handler */ static void Init_Service_Handlers( - uint32_t first_object_instance ) + uint32_t first_object_instance) { Device_Initialize_Object_Functions(&Object_Table[0]); - Routing_Device_Init( first_object_instance ); + Routing_Device_Init(first_object_instance); /* we need to handle who-is to support dynamic device binding * For the gateway, we want the routing handlers, and we will use the * unicast variety so we can get back through switches to different subnets */ apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, - handler_who_is_unicast_for_routing); + handler_who_is_unicast_for_routing); apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_HAS, - handler_who_has_for_routing); + handler_who_has_for_routing); /* 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 @@ -210,21 +206,22 @@ static void Init_Service_Handlers( * device.) This is sure to be unique! The port number stays the same. * - For MS/TP, [Steve inserts a good idea here] */ -void Initialize_Device_Addresses( ) +void Initialize_Device_Addresses( + ) { - int i = 0; /* First entry is Gateway Device */ - DEVICE_OBJECT_DATA* pDev; + int i = 0; /* First entry is Gateway Device */ + DEVICE_OBJECT_DATA *pDev; uint16_t myPort; /* Setup info for the main gateway device first */ #if defined(BACDL_BIP) - struct in_addr *netPtr; /* Lets us cast to this type */ + struct in_addr *netPtr; /* Lets us cast to this type */ uint8_t *gatewayMac = NULL; uint32_t myAddr = bip_get_addr(); - pDev = Get_Routed_Device_Object( i ); - gatewayMac = pDev->bacDevAddr.mac; /* Keep pointer to the main MAC */ - memcpy( pDev->bacDevAddr.mac, &myAddr, 4 ); + pDev = Get_Routed_Device_Object(i); + gatewayMac = pDev->bacDevAddr.mac; /* Keep pointer to the main MAC */ + memcpy(pDev->bacDevAddr.mac, &myAddr, 4); myPort = bip_get_port(); - memcpy( &pDev->bacDevAddr.mac[4], &myPort, 2 ); + memcpy(&pDev->bacDevAddr.mac[4], &myPort, 2); pDev->bacDevAddr.mac_len = 6; #elif defined(BACDL_MSTP) /* Todo: */ @@ -235,23 +232,23 @@ void Initialize_Device_Addresses( ) /* broadcast an I-Am on startup */ Send_I_Am(&Handler_Transmit_Buffer[0]); - for (i = 1; i < MAX_NUM_DEVICES; i++ ) { - pDev = Get_Routed_Device_Object( i ); - if ( pDev == NULL ) - continue; + for (i = 1; i < MAX_NUM_DEVICES; i++) { + pDev = Get_Routed_Device_Object(i); + if (pDev == NULL) + continue; #if defined(BACDL_BIP) netPtr = (struct in_addr *) pDev->bacDevAddr.mac; pDev->bacDevAddr.mac[0] = gatewayMac[3]; pDev->bacDevAddr.mac[1] = gatewayMac[2]; pDev->bacDevAddr.mac[2] = gatewayMac[1]; pDev->bacDevAddr.mac[3] = i; - memcpy( &pDev->bacDevAddr.mac[4], &myPort, 2 ); + memcpy(&pDev->bacDevAddr.mac[4], &myPort, 2); pDev->bacDevAddr.mac_len = 6; pDev->bacDevAddr.net = VIRTUAL_DNET; - memcpy( &pDev->bacDevAddr.adr[0], &pDev->bacDevAddr.mac[0], 6 ); + memcpy(&pDev->bacDevAddr.adr[0], &pDev->bacDevAddr.mac[0], 6); pDev->bacDevAddr.len = 6; - printf( " - Routed device [%d] ID %u at %s \n", i, - pDev->bacObj.Object_Instance_Number, inet_ntoa( *netPtr ) ); + printf(" - Routed device [%d] ID %u at %s \n", i, + pDev->bacObj.Object_Instance_Number, inet_ntoa(*netPtr)); #elif defined(BACDL_MSTP) /* Todo: set MS/TP net and port #s */ pDev->bacDevAddr.mac_len = 2; @@ -298,34 +295,35 @@ int main( time_t current_seconds = 0; uint32_t elapsed_seconds = 0; uint32_t elapsed_milliseconds = 0; - uint32_t first_object_instance = FIRST_DEVICE_NUMBER; + uint32_t first_object_instance = FIRST_DEVICE_NUMBER; #ifdef BACNET_TEST_VMAC /* Router data */ - BACNET_DEVICE_PROFILE* device; + BACNET_DEVICE_PROFILE *device; BACNET_VMAC_ADDRESS adr; #endif /* allow the device ID to be set */ if (argc > 1) { - first_object_instance = strtol(argv[1], NULL, 0); - if ( ( first_object_instance == 0 ) || - ( first_object_instance >= BACNET_MAX_INSTANCE ) ) { - printf( "Error: Invalid Object Instance %s \n", argv[1] ); - printf( "Provide a number from 1 to %ul \n", BACNET_MAX_INSTANCE -1 ); - exit(1); - } + first_object_instance = strtol(argv[1], NULL, 0); + if ((first_object_instance == 0) || + (first_object_instance >= BACNET_MAX_INSTANCE)) { + printf("Error: Invalid Object Instance %s \n", argv[1]); + printf("Provide a number from 1 to %ul \n", + BACNET_MAX_INSTANCE - 1); + exit(1); + } } printf("BACnet Router Demo\n" "BACnet Stack Version %s\n" "BACnet Device ID: %u\n" "Max APDU: %d\n", BACnet_Version, first_object_instance, MAX_APDU); - Init_Service_Handlers( first_object_instance ); + Init_Service_Handlers(first_object_instance); dlenv_init(); - Devices_Init( first_object_instance ); - Initialize_Device_Addresses( ); + Devices_Init(first_object_instance); + Initialize_Device_Addresses(); atexit(cleanup); #ifdef BACNET_TEST_VMAC - /* initialize vmac table and router device */ + /* initialize vmac table and router device */ device = vmac_initialize(99, 2001); debug_printf(device->name, "ROUTER:%u", vmac_get_subnet()); #endif @@ -333,8 +331,8 @@ int main( last_seconds = time(NULL); /* broadcast an I-am-router-to-network on startup */ - printf( "Remote Network DNET Number %d \n", DNET_list[0] ); - Send_I_Am_Router_To_Network( DNET_list ); + printf("Remote Network DNET Number %d \n", DNET_list[0]); + Send_I_Am_Router_To_Network(DNET_list); /* loop forever */ for (;;) { @@ -346,7 +344,7 @@ int main( /* process */ if (pdu_len) { - routing_npdu_handler(&src, DNET_list, &Rx_Buf[0], pdu_len); + routing_npdu_handler(&src, DNET_list, &Rx_Buf[0], pdu_len); } /* at least one second has passed */ elapsed_seconds = current_seconds - last_seconds; diff --git a/bacnet-stack/demo/handler/h_cov.c b/bacnet-stack/demo/handler/h_cov.c index 456e3f09..56d397d8 100644 --- a/bacnet-stack/demo/handler/h_cov.c +++ b/bacnet-stack/demo/handler/h_cov.c @@ -346,9 +346,8 @@ static bool cov_send_request( value_list[1].next = NULL; switch (cov_subscription->monitoredObjectIdentifier.type) { case OBJECT_BINARY_INPUT: - Binary_Input_Encode_Value_List - (cov_subscription->monitoredObjectIdentifier.instance, - &value_list[0]); + Binary_Input_Encode_Value_List(cov_subscription-> + monitoredObjectIdentifier.instance, &value_list[0]); break; default: goto COV_FAILED; @@ -465,8 +464,8 @@ static bool cov_subscribe( switch (cov_data->monitoredObjectIdentifier.type) { case OBJECT_BINARY_INPUT: - if (Binary_Input_Valid_Instance - (cov_data->monitoredObjectIdentifier.instance)) { + if (Binary_Input_Valid_Instance(cov_data-> + monitoredObjectIdentifier.instance)) { status = cov_list_subscribe(src, cov_data, error_class, error_code); } else { diff --git a/bacnet-stack/demo/handler/h_routed_npdu.c b/bacnet-stack/demo/handler/h_routed_npdu.c index 78b18e97..36e877ed 100644 --- a/bacnet-stack/demo/handler/h_routed_npdu.c +++ b/bacnet-stack/demo/handler/h_routed_npdu.c @@ -67,9 +67,9 @@ */ static void network_control_handler( BACNET_ADDRESS * src, - int * DNET_list, + int *DNET_list, BACNET_NPDU_DATA * npdu_data, - uint8_t * npdu, + uint8_t * npdu, uint16_t npdu_len) { uint16_t npdu_offset = 0; @@ -78,23 +78,19 @@ static void network_control_handler( switch (npdu_data->network_message_type) { case NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK: - /* Send I-am-router-to-network with our one-network list if - * our specific network is requested, or no specific - * network is requested. Silently drop other DNET requests. - */ - if (npdu_len >= 2) - { - uint16_t network; - len += decode_unsigned16(&npdu[len], &network); - if (network == DNET_list[0] ) - { - Send_I_Am_Router_To_Network( DNET_list ); - } - } - else - { - Send_I_Am_Router_To_Network( DNET_list ); - } + /* Send I-am-router-to-network with our one-network list if + * our specific network is requested, or no specific + * network is requested. Silently drop other DNET requests. + */ + if (npdu_len >= 2) { + uint16_t network; + len += decode_unsigned16(&npdu[len], &network); + if (network == DNET_list[0]) { + Send_I_Am_Router_To_Network(DNET_list); + } + } else { + Send_I_Am_Router_To_Network(DNET_list); + } break; case NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK: /* Per the standard, we are supposed to process this message and @@ -108,9 +104,9 @@ static void network_control_handler( * -- Unless we act upon NETWORK_MESSAGE_ROUTER_BUSY_TO_NETWORK * later for congestion control - then it could matter. */ - debug_printf("%s for Networks: ", - bactext_network_layer_msg_name( - NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK ) ); + debug_printf("%s for Networks: ", + bactext_network_layer_msg_name + (NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK)); while (npdu_len) { len = decode_unsigned16(&npdu[npdu_offset], &dnet); debug_printf("%hu", dnet); @@ -126,12 +122,12 @@ static void network_control_handler( /* Do nothing, same as previous case. */ break; case NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK: - if ( npdu_len >= 3 ) { + if (npdu_len >= 3) { decode_unsigned16(&npdu[1], &dnet); debug_printf("Received %s for Network: ", - bactext_network_layer_msg_name( - NETWORK_MESSAGE_I_COULD_BE_ROUTER_TO_NETWORK ) ); - debug_printf("%hu, Reason code: %d \n", dnet, npdu[0] ); + bactext_network_layer_msg_name + (NETWORK_MESSAGE_I_COULD_BE_ROUTER_TO_NETWORK)); + debug_printf("%hu, Reason code: %d \n", dnet, npdu[0]); } break; case NETWORK_MESSAGE_ROUTER_BUSY_TO_NETWORK: @@ -143,18 +139,18 @@ static void network_control_handler( * NETWORK_MESSAGE_INIT_RT_TABLE_ACK and a list of all our * reachable networks. */ - if ( npdu_len > 0) { - /* If Number of Ports is 0, broadcast our "full" table */ - if (npdu[0] == 0) - Send_Initialize_Routing_Table_Ack( NULL, DNET_list ); - else { - /* If they sent us a list, just politely ACK it - * with no routing list of our own. But we don't DO - * anything with the info, either. - */ - int listTerminator = -1; - Send_Initialize_Routing_Table_Ack( src, &listTerminator ); - } + if (npdu_len > 0) { + /* If Number of Ports is 0, broadcast our "full" table */ + if (npdu[0] == 0) + Send_Initialize_Routing_Table_Ack(NULL, DNET_list); + else { + /* If they sent us a list, just politely ACK it + * with no routing list of our own. But we don't DO + * anything with the info, either. + */ + int listTerminator = -1; + Send_Initialize_Routing_Table_Ack(src, &listTerminator); + } break; } /* Else, fall through to do nothing. */ @@ -168,9 +164,9 @@ static void network_control_handler( break; default: /* An unrecognized message is bad; send an error response. */ - Send_Reject_Message_To_Network( src, - NETWORK_REJECT_UNKNOWN_MESSAGE_TYPE, DNET_list[0] ); - /* Sending our DNET doesn't make a lot of sense, does it? */ + Send_Reject_Message_To_Network(src, + NETWORK_REJECT_UNKNOWN_MESSAGE_TYPE, DNET_list[0]); + /* Sending our DNET doesn't make a lot of sense, does it? */ break; } } @@ -190,31 +186,32 @@ static void network_control_handler( * Normally just one valid entry; terminated with a -1 value. * @param apdu [in] The apdu portion of the request, to be processed. * @param apdu_len [in] The total (remaining) length of the apdu. - */ + */ static void routed_apdu_handler( - BACNET_ADDRESS * src, + BACNET_ADDRESS * src, BACNET_ADDRESS * dest, - int * DNET_list, - uint8_t * apdu, + int *DNET_list, + uint8_t * apdu, uint16_t apdu_len) -{ - int cursor = 0; /* Starting hint */ +{ + int cursor = 0; /* Starting hint */ bool bGotOne = false; - - if (!Routed_Device_Is_Valid_Network( dest->net, DNET_list ) ) { + + if (!Routed_Device_Is_Valid_Network(dest->net, DNET_list)) { /* We don't know how to reach this one */ - Send_Reject_Message_To_Network( src, NETWORK_REJECT_NO_ROUTE, dest->net ); + Send_Reject_Message_To_Network(src, NETWORK_REJECT_NO_ROUTE, + dest->net); return; } - while ( Routed_Device_GetNext( dest, DNET_list, &cursor ) ) { - apdu_handler(src, apdu, apdu_len); - bGotOne = true; - if ( cursor < 0 ) /* If no more matches, */ - break; /* We don't need to keep looking */ + while (Routed_Device_GetNext(dest, DNET_list, &cursor)) { + apdu_handler(src, apdu, apdu_len); + bGotOne = true; + if (cursor < 0) /* If no more matches, */ + break; /* We don't need to keep looking */ } - if ( !bGotOne ) { - /* Just silently drop this packet. */ + if (!bGotOne) { + /* Just silently drop this packet. */ } } @@ -249,10 +246,10 @@ static void routed_apdu_handler( */ void routing_npdu_handler( BACNET_ADDRESS * src, - int * DNET_list, - uint8_t * pdu, + int *DNET_list, + uint8_t * pdu, uint16_t pdu_len) -{ +{ int apdu_offset = 0; BACNET_ADDRESS dest = { 0 }; BACNET_NPDU_DATA npdu_data = { 0 }; @@ -260,29 +257,28 @@ void routing_npdu_handler( /* only handle the version that we know how to handle */ if (pdu[0] == BACNET_PROTOCOL_VERSION) { apdu_offset = npdu_decode(&pdu[0], &dest, src, &npdu_data); - if ( apdu_offset <= 0 ) { + if (apdu_offset <= 0) { debug_printf("NPDU: Decoding failed; Discarded!\n"); } else if (npdu_data.network_layer_message) { if ((dest.net == 0) || (dest.net == BACNET_BROADCAST_NETWORK)) { - network_control_handler( src, DNET_list, &npdu_data, - &pdu[apdu_offset], - (uint16_t) (pdu_len - apdu_offset)); + network_control_handler(src, DNET_list, &npdu_data, + &pdu[apdu_offset], (uint16_t) (pdu_len - apdu_offset)); } else { /* The DNET is set, but we don't support downstream routers, * so we just silently drop this network layer message, * since only routers can handle it (even if for our DNET) */ } } else if (apdu_offset <= pdu_len) { - if ( (dest.net == 0) || (npdu_data.hop_count > 1) ) - routed_apdu_handler(src, &dest, DNET_list, &pdu[apdu_offset], - (uint16_t) (pdu_len - apdu_offset)); - /* Else, hop_count bottomed out and we discard this one. */ + if ((dest.net == 0) || (npdu_data.hop_count > 1)) + routed_apdu_handler(src, &dest, DNET_list, &pdu[apdu_offset], + (uint16_t) (pdu_len - apdu_offset)); + /* Else, hop_count bottomed out and we discard this one. */ } } else { /* Should we send NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK? */ - debug_printf( - "NPDU: Unsupported BACnet Protocol Version=%u. Discarded!\n", - (unsigned) pdu[0]); + debug_printf + ("NPDU: Unsupported BACnet Protocol Version=%u. Discarded!\n", + (unsigned) pdu[0]); } return; diff --git a/bacnet-stack/demo/handler/h_rp_a.c b/bacnet-stack/demo/handler/h_rp_a.c index fa62b01a..ee41a133 100644 --- a/bacnet-stack/demo/handler/h_rp_a.c +++ b/bacnet-stack/demo/handler/h_rp_a.c @@ -170,7 +170,7 @@ int rp_ack_fully_decode_service_request( read_access_data->listOfProperties = rp1_property; if (rp1_property == NULL) { /* can't proceed if calloc failed. */ - return BACNET_STATUS_ERROR; + return BACNET_STATUS_ERROR; } rp1_property->propertyIdentifier = rp1data.object_property; rp1_property->propertyArrayIndex = rp1data.array_index; @@ -227,7 +227,7 @@ int rp_ack_fully_decode_service_request( read_access_data->listOfProperties = NULL; return BACNET_STATUS_ERROR; } - if (vlen > 0) { + if (vlen > 0) { /* If more values */ old_value = value; value = calloc(1, sizeof(BACNET_APPLICATION_DATA_VALUE)); diff --git a/bacnet-stack/demo/handler/h_rpm_a.c b/bacnet-stack/demo/handler/h_rpm_a.c index b150d86e..cfa53799 100644 --- a/bacnet-stack/demo/handler/h_rpm_a.c +++ b/bacnet-stack/demo/handler/h_rpm_a.c @@ -220,8 +220,8 @@ void rpm_ack_print_data( #if PRINT_ENABLED if (listOfProperties->propertyIdentifier < 512) { fprintf(stdout, " %s: ", - bactext_property_name(listOfProperties-> - propertyIdentifier)); + bactext_property_name + (listOfProperties->propertyIdentifier)); } else { fprintf(stdout, " proprietary %u: ", (unsigned) listOfProperties->propertyIdentifier); @@ -268,10 +268,10 @@ void rpm_ack_print_data( #if PRINT_ENABLED /* AccessError */ fprintf(stdout, "BACnet Error: %s: %s\r\n", - bactext_error_class_name((int) listOfProperties-> - error.error_class), - bactext_error_code_name((int) listOfProperties-> - error.error_code)); + bactext_error_class_name((int) listOfProperties->error. + error_class), + bactext_error_code_name((int) listOfProperties->error. + error_code)); #endif } listOfProperties = listOfProperties->next; diff --git a/bacnet-stack/demo/handler/h_ucov.c b/bacnet-stack/demo/handler/h_ucov.c index f5c198e0..6b872b5a 100644 --- a/bacnet-stack/demo/handler/h_ucov.c +++ b/bacnet-stack/demo/handler/h_ucov.c @@ -104,8 +104,8 @@ void handler_ucov_notification( fprintf(stderr, "UCOV: "); if (pProperty_value->propertyIdentifier < 512) { fprintf(stderr, "%s ", - bactext_property_name - (pProperty_value->propertyIdentifier)); + bactext_property_name(pProperty_value-> + propertyIdentifier)); } else { fprintf(stderr, "proprietary %u ", pProperty_value->propertyIdentifier); diff --git a/bacnet-stack/demo/handler/h_whohas.c b/bacnet-stack/demo/handler/h_whohas.c index 479ec01c..a96f795d 100644 --- a/bacnet-stack/demo/handler/h_whohas.c +++ b/bacnet-stack/demo/handler/h_whohas.c @@ -42,8 +42,8 @@ * or object ID, if the Device has a match. * @param data [in] The decoded who-has payload from the request. */ -static void match_name_or_object( - BACNET_WHO_HAS_DATA * data) +static void match_name_or_object( + BACNET_WHO_HAS_DATA * data) { char *object_name = NULL; int object_type = 0; @@ -98,10 +98,10 @@ void handler_who_has( if ((data.low_limit == -1) || (data.high_limit == -1)) directed_to_me = true; else if ((Device_Object_Instance_Number() >= (uint32_t) data.low_limit) - && (Device_Object_Instance_Number() <= (uint32_t) data.high_limit)) + && (Device_Object_Instance_Number() <= (uint32_t) data.high_limit)) directed_to_me = true; if (directed_to_me) { - match_name_or_object(&data); + match_name_or_object(&data); } } } @@ -126,23 +126,23 @@ void handler_who_has_for_routing( int len = 0; BACNET_WHO_HAS_DATA data; int32_t dev_instance; - int cursor = 0; /* Starting hint */ - int my_list[2] = {0, -1}; /* Not really used, so dummy values */ + int cursor = 0; /* Starting hint */ + int my_list[2] = { 0, -1 }; /* Not really used, so dummy values */ BACNET_ADDRESS bcast_net; (void) src; len = whohas_decode_service_request(service_request, service_len, &data); if (len > 0) { /* Go through all devices, starting with the root gateway Device */ - memset( &bcast_net, 0, sizeof(BACNET_ADDRESS)); - bcast_net.net = BACNET_BROADCAST_NETWORK; /* That's all we have to set */ - while ( Routed_Device_GetNext( &bcast_net, my_list, &cursor ) ) { - dev_instance = Device_Object_Instance_Number(); - if ( (data.low_limit == -1) || (data.high_limit == -1) || - ((dev_instance >= data.low_limit) && - (dev_instance <= data.high_limit))) - match_name_or_object(&data); + memset(&bcast_net, 0, sizeof(BACNET_ADDRESS)); + bcast_net.net = BACNET_BROADCAST_NETWORK; /* That's all we have to set */ + while (Routed_Device_GetNext(&bcast_net, my_list, &cursor)) { + dev_instance = Device_Object_Instance_Number(); + if ((data.low_limit == -1) || (data.high_limit == -1) || + ((dev_instance >= data.low_limit) && + (dev_instance <= data.high_limit))) + match_name_or_object(&data); } } } -#endif /* BAC_ROUTING */ +#endif /* BAC_ROUTING */ diff --git a/bacnet-stack/demo/handler/h_whois.c b/bacnet-stack/demo/handler/h_whois.c index 884333d3..438bdee7 100644 --- a/bacnet-stack/demo/handler/h_whois.c +++ b/bacnet-stack/demo/handler/h_whois.c @@ -127,44 +127,44 @@ static void check_who_is_for_routing( uint8_t * service_request, uint16_t service_len, BACNET_ADDRESS * src, - bool is_unicast ) + bool is_unicast) { int len = 0; int32_t low_limit = 0; int32_t high_limit = 0; int32_t dev_instance; - int cursor = 0; /* Starting hint */ - int my_list[2] = {0, -1}; /* Not really used, so dummy values */ + int cursor = 0; /* Starting hint */ + int my_list[2] = { 0, -1 }; /* Not really used, so dummy values */ BACNET_ADDRESS bcast_net; - + len = whois_decode_service_request(service_request, service_len, &low_limit, &high_limit); if (len == -1) { - /* Invalid; just leave */ - return; + /* Invalid; just leave */ + return; } /* If len == 0, then high_limit is untouched and still == 0 */ /* BACnet wildcard is the max instance number - everyone responds */ if ((BACNET_MAX_INSTANCE >= (uint32_t) low_limit) && (BACNET_MAX_INSTANCE <= (uint32_t) high_limit)) - high_limit = 0; - /* This is the "always accept" case we will test for below */ + high_limit = 0; + /* This is the "always accept" case we will test for below */ /* Go through all devices, starting with the root gateway Device */ - memset( &bcast_net, 0, sizeof(BACNET_ADDRESS)); - bcast_net.net = BACNET_BROADCAST_NETWORK; /* That's all we have to set */ - - while ( Routed_Device_GetNext( &bcast_net, my_list, &cursor ) ) { - dev_instance = Device_Object_Instance_Number(); - if ( (high_limit == 0) || - ((dev_instance >= low_limit) && (dev_instance <= high_limit))) { - if ( is_unicast ) - Send_I_Am_Unicast(&Handler_Transmit_Buffer[0], src); - else - Send_I_Am(&Handler_Transmit_Buffer[0]); - } - } + memset(&bcast_net, 0, sizeof(BACNET_ADDRESS)); + bcast_net.net = BACNET_BROADCAST_NETWORK; /* That's all we have to set */ + + while (Routed_Device_GetNext(&bcast_net, my_list, &cursor)) { + dev_instance = Device_Object_Instance_Number(); + if ((high_limit == 0) || ((dev_instance >= low_limit) && + (dev_instance <= high_limit))) { + if (is_unicast) + Send_I_Am_Unicast(&Handler_Transmit_Buffer[0], src); + else + Send_I_Am(&Handler_Transmit_Buffer[0]); + } + } } @@ -185,7 +185,7 @@ void handler_who_is_bcast_for_routing( uint16_t service_len, BACNET_ADDRESS * src) { - check_who_is_for_routing(service_request, service_len, src, false ); + check_who_is_for_routing(service_request, service_len, src, false); } @@ -205,6 +205,6 @@ void handler_who_is_unicast_for_routing( uint16_t service_len, BACNET_ADDRESS * src) { - check_who_is_for_routing(service_request, service_len, src, true ); + check_who_is_for_routing(service_request, service_len, src, true); } -#endif /* BAC_ROUTING */ +#endif /* BAC_ROUTING */ diff --git a/bacnet-stack/demo/handler/h_wp.c b/bacnet-stack/demo/handler/h_wp.c index 56707274..95f9be7f 100644 --- a/bacnet-stack/demo/handler/h_wp.c +++ b/bacnet-stack/demo/handler/h_wp.c @@ -178,12 +178,11 @@ bool WPValidateString( 0)) { *pErrorCode = ERROR_CODE_VALUE_OUT_OF_RANGE; } else if ((bEmptyAllowed == false) && - (!characterstring_printable( - &pValue->type.Character_String))) { + (!characterstring_printable(&pValue->type.Character_String))) { /* assumption: non-empty also means must be "printable" */ *pErrorCode = ERROR_CODE_VALUE_OUT_OF_RANGE; - } else if (characterstring_length(&pValue-> - type.Character_String) >= iMaxLen) { + } else if (characterstring_length(&pValue->type. + Character_String) >= iMaxLen) { *pErrorClass = ERROR_CLASS_RESOURCES; *pErrorCode = ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY; } else diff --git a/bacnet-stack/demo/handler/s_cevent.c b/bacnet-stack/demo/handler/s_cevent.c index 0c362490..6ba75e17 100644 --- a/bacnet-stack/demo/handler/s_cevent.c +++ b/bacnet-stack/demo/handler/s_cevent.c @@ -70,7 +70,7 @@ uint8_t Send_CEvent_Notify( invoke_id = tsm_next_free_invokeID(); if (invoke_id) { /* encode the NPDU portion of the packet */ - datalink_get_my_address(&my_address); + datalink_get_my_address(&my_address); npdu_encode_npdu_data(&npdu_data, true, MESSAGE_PRIORITY_NORMAL); pdu_len = npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, diff --git a/bacnet-stack/demo/handler/s_iam.c b/bacnet-stack/demo/handler/s_iam.c index 149dede1..26906768 100644 --- a/bacnet-stack/demo/handler/s_iam.c +++ b/bacnet-stack/demo/handler/s_iam.c @@ -65,7 +65,8 @@ int iam_encode_pdu( pdu_len = npdu_encode_pdu(&buffer[0], dest, &my_address, npdu_data); /* encode the APDU portion of the packet */ - len = iam_encode_apdu(&buffer[pdu_len], Device_Object_Instance_Number(), + len = + iam_encode_apdu(&buffer[pdu_len], Device_Object_Instance_Number(), MAX_APDU, SEGMENTATION_NONE, Device_Vendor_Identifier()); pdu_len += len; @@ -139,8 +140,9 @@ int iam_unicast_encode_pdu( npdu_encode_npdu_data(npdu_data, false, MESSAGE_PRIORITY_NORMAL); npdu_len = npdu_encode_pdu(&buffer[0], dest, &my_address, npdu_data); /* encode the APDU portion of the packet */ - apdu_len = iam_encode_apdu(&buffer[npdu_len], Device_Object_Instance_Number(), - MAX_APDU, SEGMENTATION_NONE, Device_Vendor_Identifier()); + apdu_len = + iam_encode_apdu(&buffer[npdu_len], Device_Object_Instance_Number(), + MAX_APDU, SEGMENTATION_NONE, Device_Vendor_Identifier()); pdu_len = npdu_len + apdu_len; return pdu_len; diff --git a/bacnet-stack/demo/handler/s_ihave.c b/bacnet-stack/demo/handler/s_ihave.c index 00ca896c..7927b1d1 100644 --- a/bacnet-stack/demo/handler/s_ihave.c +++ b/bacnet-stack/demo/handler/s_ihave.c @@ -75,7 +75,9 @@ void Send_I_Have( datalink_get_broadcast_address(&dest); /* encode the NPDU portion of the packet */ npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); - pdu_len = npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, &npdu_data); + pdu_len = + npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, + &npdu_data); /* encode the APDU portion of the packet */ data.device_id.type = OBJECT_DEVICE; diff --git a/bacnet-stack/demo/handler/s_router.c b/bacnet-stack/demo/handler/s_router.c index e7310729..17f58a8c 100644 --- a/bacnet-stack/demo/handler/s_router.c +++ b/bacnet-stack/demo/handler/s_router.c @@ -71,7 +71,7 @@ static void npdu_encode_npdu_network( npdu_data->network_message_type = network_message_type; /* optional */ npdu_data->vendor_id = 0; /* optional, if net message type is > 0x80 */ npdu_data->priority = priority; - npdu_data->hop_count = DFLT_HOP_COUNT; + npdu_data->hop_count = DFLT_HOP_COUNT; } } @@ -97,119 +97,117 @@ static void npdu_encode_npdu_network( * the type of message. * @return Number of bytes sent, or <=0 if no message was sent. */ -int Send_Network_Layer_Message( - BACNET_NETWORK_MESSAGE_TYPE network_message_type, - BACNET_ADDRESS * dst, - int * iArgs ) +int Send_Network_Layer_Message( + BACNET_NETWORK_MESSAGE_TYPE network_message_type, + BACNET_ADDRESS * dst, + int *iArgs) { int len = 0; int pdu_len = 0; int bytes_sent = 0; - int *pVal = iArgs; /* Start with first value */ + int *pVal = iArgs; /* Start with first value */ bool data_expecting_reply = false; BACNET_NPDU_DATA npdu_data; BACNET_ADDRESS bcastDest; - - if ( iArgs == NULL ) - return 0; /* Can't do anything here */ - + + if (iArgs == NULL) + return 0; /* Can't do anything here */ + /* If dst was NULL, get our (local net) broadcast MAC address. */ - if ( dst == NULL ) { - datalink_get_broadcast_address(&bcastDest); - dst = &bcastDest; + if (dst == NULL) { + datalink_get_broadcast_address(&bcastDest); + dst = &bcastDest; } - if ( network_message_type == NETWORK_MESSAGE_INIT_RT_TABLE ) + if (network_message_type == NETWORK_MESSAGE_INIT_RT_TABLE) data_expecting_reply = true; /* DER in this one case */ - npdu_encode_npdu_network(&npdu_data, - network_message_type, data_expecting_reply, - MESSAGE_PRIORITY_NORMAL); - + npdu_encode_npdu_network(&npdu_data, network_message_type, + data_expecting_reply, MESSAGE_PRIORITY_NORMAL); + /* We don't need src information, since a message can't originate from * our downstream BACnet network. */ pdu_len = npdu_encode_pdu(&Handler_Transmit_Buffer[0], dst, NULL, &npdu_data); - - /* Now encode the optional payload bytes, per message type */ - switch ( network_message_type ) - { - case NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK: - if (*pVal >= 0) { - len = - encode_unsigned16(&Handler_Transmit_Buffer[pdu_len], - (uint16_t) *pVal); - pdu_len += len; - } - /* else, don't encode a DNET */ - break; - - case NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK: - case NETWORK_MESSAGE_ROUTER_BUSY_TO_NETWORK: - case NETWORK_MESSAGE_ROUTER_AVAILABLE_TO_NETWORK: - while ( *pVal >= 0 ) { - len = - encode_unsigned16(&Handler_Transmit_Buffer[pdu_len], - (uint16_t) *pVal); - pdu_len += len; - pVal++; - } - break; - - case NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK: - /* Encode the Reason byte, then the DNET */ - Handler_Transmit_Buffer[pdu_len++] = (uint8_t) *pVal; - pVal++; - len = - encode_unsigned16(&Handler_Transmit_Buffer[pdu_len], - (uint16_t) *pVal); - pdu_len += len; - break; - case NETWORK_MESSAGE_INIT_RT_TABLE: - case NETWORK_MESSAGE_INIT_RT_TABLE_ACK: - /* First, count the number of Ports we will encode */ - len = 0; /* Re-purpose len as our counter here */ - while ( *pVal >= 0 ) { - len++; - pVal++; - } - Handler_Transmit_Buffer[pdu_len++] = (uint8_t) len; - - if ( len > 0 ) { - uint8_t portID = 1; - pVal = iArgs; /* Reset to beginning */ - /* Now encode each (virtual) BACNET_ROUTER_PORT. - * We will simply use a positive index for PortID, - * and have no PortInfo. - */ - while ( *pVal >= 0 ) { + /* Now encode the optional payload bytes, per message type */ + switch (network_message_type) { + case NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK: + if (*pVal >= 0) { len = encode_unsigned16(&Handler_Transmit_Buffer[pdu_len], - (uint16_t) *pVal); + (uint16_t) * pVal); + pdu_len += len; + } + /* else, don't encode a DNET */ + break; + + case NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK: + case NETWORK_MESSAGE_ROUTER_BUSY_TO_NETWORK: + case NETWORK_MESSAGE_ROUTER_AVAILABLE_TO_NETWORK: + while (*pVal >= 0) { + len = + encode_unsigned16(&Handler_Transmit_Buffer[pdu_len], + (uint16_t) * pVal); pdu_len += len; - Handler_Transmit_Buffer[pdu_len++] = portID++; - Handler_Transmit_Buffer[pdu_len++] = 0; - debug_printf( " Sending Routing Table entry for %u \n", *pVal ); pVal++; } - } - break; - - default: - debug_printf("Not sent: %s message unsupported \n", - bactext_network_layer_msg_name( network_message_type ) ); - return 0; - break; /* Will never reach this line */ + break; + + case NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK: + /* Encode the Reason byte, then the DNET */ + Handler_Transmit_Buffer[pdu_len++] = (uint8_t) * pVal; + pVal++; + len = + encode_unsigned16(&Handler_Transmit_Buffer[pdu_len], + (uint16_t) * pVal); + pdu_len += len; + break; + + case NETWORK_MESSAGE_INIT_RT_TABLE: + case NETWORK_MESSAGE_INIT_RT_TABLE_ACK: + /* First, count the number of Ports we will encode */ + len = 0; /* Re-purpose len as our counter here */ + while (*pVal >= 0) { + len++; + pVal++; + } + Handler_Transmit_Buffer[pdu_len++] = (uint8_t) len; + + if (len > 0) { + uint8_t portID = 1; + pVal = iArgs; /* Reset to beginning */ + /* Now encode each (virtual) BACNET_ROUTER_PORT. + * We will simply use a positive index for PortID, + * and have no PortInfo. + */ + while (*pVal >= 0) { + len = + encode_unsigned16(&Handler_Transmit_Buffer[pdu_len], + (uint16_t) * pVal); + pdu_len += len; + Handler_Transmit_Buffer[pdu_len++] = portID++; + Handler_Transmit_Buffer[pdu_len++] = 0; + debug_printf(" Sending Routing Table entry for %u \n", + *pVal); + pVal++; + } + } + break; + + default: + debug_printf("Not sent: %s message unsupported \n", + bactext_network_layer_msg_name(network_message_type)); + return 0; + break; /* Will never reach this line */ } - - if ( dst != NULL ) - debug_printf("Sending %s message to BACnet network %u \n", - bactext_network_layer_msg_name( network_message_type ), - dst->net ); + + if (dst != NULL) + debug_printf("Sending %s message to BACnet network %u \n", + bactext_network_layer_msg_name(network_message_type), dst->net); else - debug_printf("Sending %s message to local BACnet network \n", - bactext_network_layer_msg_name( network_message_type ) ); + debug_printf("Sending %s message to local BACnet network \n", + bactext_network_layer_msg_name(network_message_type)); /* Now send the message */ bytes_sent = @@ -217,13 +215,13 @@ int Send_Network_Layer_Message( pdu_len); #if PRINT_ENABLED if (bytes_sent <= 0) { - int wasErrno = errno; /* preserve the errno */ - debug_printf("Failed to send %s message (%s)!\n", - bactext_network_layer_msg_name( network_message_type ), + int wasErrno = errno; /* preserve the errno */ + debug_printf("Failed to send %s message (%s)!\n", + bactext_network_layer_msg_name(network_message_type), strerror(wasErrno)); } #endif - return bytes_sent; + return bytes_sent; } @@ -242,8 +240,8 @@ void Send_Who_Is_Router_To_Network( BACNET_ADDRESS * dst, int dnet) { - Send_Network_Layer_Message( NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK, - dst, &dnet ); + Send_Network_Layer_Message(NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK, dst, + &dnet); } /** Broadcast an I-am-router-to-network message, giving the list of networks @@ -259,8 +257,8 @@ void Send_I_Am_Router_To_Network( const int DNET_list[]) { /* Use a NULL dst here since we want a broadcast MAC address. */ - Send_Network_Layer_Message( NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK, - NULL, (int *) DNET_list ); + Send_Network_Layer_Message(NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK, NULL, + (int *) DNET_list); } /** Finds a specific router, or all reachable BACnet networks. @@ -281,9 +279,9 @@ void Send_Reject_Message_To_Network( int iArgs[2]; iArgs[0] = reject_reason; iArgs[1] = dnet; - Send_Network_Layer_Message( NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK, - dst, iArgs ); - debug_printf(" Reject Reason=%d, DNET=%u\n", reject_reason, dnet ); + Send_Network_Layer_Message(NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK, dst, + iArgs); + debug_printf(" Reject Reason=%d, DNET=%u\n", reject_reason, dnet); } @@ -308,8 +306,8 @@ void Send_Initialize_Routing_Table( const int DNET_list[]) { /* Use a NULL dst here since we want a broadcast MAC address. */ - Send_Network_Layer_Message( NETWORK_MESSAGE_INIT_RT_TABLE, - dst, (int *) DNET_list ); + Send_Network_Layer_Message(NETWORK_MESSAGE_INIT_RT_TABLE, dst, + (int *) DNET_list); } @@ -334,6 +332,6 @@ void Send_Initialize_Routing_Table_Ack( BACNET_ADDRESS * dst, const int DNET_list[]) { - Send_Network_Layer_Message( NETWORK_MESSAGE_INIT_RT_TABLE_ACK, - dst, (int *) DNET_list ); + Send_Network_Layer_Message(NETWORK_MESSAGE_INIT_RT_TABLE_ACK, dst, + (int *) DNET_list); } diff --git a/bacnet-stack/demo/handler/s_ts.c b/bacnet-stack/demo/handler/s_ts.c index ac1fb323..8d755964 100644 --- a/bacnet-stack/demo/handler/s_ts.c +++ b/bacnet-stack/demo/handler/s_ts.c @@ -65,7 +65,8 @@ void Send_TimeSync( /* encode the NPDU portion of the packet */ npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); pdu_len = - npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, &npdu_data); + npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, + &npdu_data); /* encode the APDU portion of the packet */ len = @@ -101,7 +102,8 @@ void Send_TimeSyncUTC( /* encode the NPDU portion of the packet */ npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); pdu_len = - npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, &npdu_data); + npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, + &npdu_data); /* encode the APDU portion of the packet */ pdu_len = diff --git a/bacnet-stack/demo/handler/s_upt.c b/bacnet-stack/demo/handler/s_upt.c index b16967d9..be310564 100644 --- a/bacnet-stack/demo/handler/s_upt.c +++ b/bacnet-stack/demo/handler/s_upt.c @@ -61,7 +61,9 @@ void Send_UnconfirmedPrivateTransfer( datalink_get_my_address(&my_address); /* encode the NPDU portion of the packet */ npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); - pdu_len = npdu_encode_pdu(&Handler_Transmit_Buffer[0], dest, &my_address, &npdu_data); + pdu_len = + npdu_encode_pdu(&Handler_Transmit_Buffer[0], dest, &my_address, + &npdu_data); /* encode the APDU portion of the packet */ len = diff --git a/bacnet-stack/demo/handler/s_whohas.c b/bacnet-stack/demo/handler/s_whohas.c index 05a2569a..d8e3fd35 100644 --- a/bacnet-stack/demo/handler/s_whohas.c +++ b/bacnet-stack/demo/handler/s_whohas.c @@ -77,7 +77,8 @@ void Send_WhoHas_Name( /* encode the NPDU portion of the packet */ npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); pdu_len = - npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, &npdu_data); + npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, + &npdu_data); /* encode the APDU portion of the packet */ data.low_limit = low_limit; @@ -131,7 +132,8 @@ void Send_WhoHas_Object( /* encode the NPDU portion of the packet */ npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); pdu_len = - npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, &npdu_data); + npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, + &npdu_data); /* encode the APDU portion of the packet */ data.low_limit = low_limit; diff --git a/bacnet-stack/demo/handler/s_whois.c b/bacnet-stack/demo/handler/s_whois.c index 1442f056..aa538013 100644 --- a/bacnet-stack/demo/handler/s_whois.c +++ b/bacnet-stack/demo/handler/s_whois.c @@ -72,7 +72,8 @@ void Send_WhoIs_To_Network( npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); pdu_len = - npdu_encode_pdu(&Handler_Transmit_Buffer[0], target_address, &my_address, &npdu_data); + npdu_encode_pdu(&Handler_Transmit_Buffer[0], target_address, + &my_address, &npdu_data); /* encode the APDU portion of the packet */ len = whois_encode_apdu(&Handler_Transmit_Buffer[pdu_len], low_limit, diff --git a/bacnet-stack/demo/handler/s_wp.c b/bacnet-stack/demo/handler/s_wp.c index d6e46192..1b66e13b 100644 --- a/bacnet-stack/demo/handler/s_wp.c +++ b/bacnet-stack/demo/handler/s_wp.c @@ -155,9 +155,8 @@ uint8_t Send_Write_Property_Request( #if PRINT_ENABLED_DEBUG fprintf(stderr, "WriteProperty service: " "%s tag=%d\n", (object_value->context_specific ? "context" : "application"), - (int) (object_value-> - context_specific ? object_value->context_tag : object_value-> - tag)); + (int) (object_value->context_specific ? object_value-> + context_tag : object_value->tag)); #endif len = bacapp_encode_data(&application_data[apdu_len], object_value); if ((len + apdu_len) < MAX_APDU) { diff --git a/bacnet-stack/demo/iamrouter/main.c b/bacnet-stack/demo/iamrouter/main.c index 8c2f255a..ba6118d8 100644 --- a/bacnet-stack/demo/iamrouter/main.c +++ b/bacnet-stack/demo/iamrouter/main.c @@ -48,8 +48,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/initrouter/main.c b/bacnet-stack/demo/initrouter/main.c index bef6c353..48e459f5 100644 --- a/bacnet-stack/demo/initrouter/main.c +++ b/bacnet-stack/demo/initrouter/main.c @@ -50,8 +50,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ @@ -61,12 +61,12 @@ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; static BACNET_ADDRESS Target_Router_Address; /* static BACNET_ROUTER_PORT *Target_Router_Port_List; */ -#define VIRTUAL_DNET 2709 /* your choice of number here */ +#define VIRTUAL_DNET 2709 /* your choice of number here */ /** The list of DNETs that our router can reach. * Only one entry since we don't support downstream routers. */ int DNET_list[2] = { - VIRTUAL_DNET, -1 /* Need -1 terminator */ + VIRTUAL_DNET, -1 /* Need -1 terminator */ }; static bool Error_Detected = false; @@ -333,8 +333,7 @@ int main( last_seconds = time(NULL); timeout_seconds = apdu_timeout() / 1000; /* send the request */ - Send_Initialize_Routing_Table(&Target_Router_Address, - DNET_list); + Send_Initialize_Routing_Table(&Target_Router_Address, DNET_list); /* loop forever */ for (;;) { /* increment timer - exit if timed out */ diff --git a/bacnet-stack/demo/object/ai.c b/bacnet-stack/demo/object/ai.c index 8e5ec556..eda4ccd3 100644 --- a/bacnet-stack/demo/object/ai.c +++ b/bacnet-stack/demo/object/ai.c @@ -182,7 +182,7 @@ int Analog_Input_Read_Property( return 0; } apdu = rpdata->application_data; - switch ((int)rpdata->object_property) { + switch ((int) rpdata->object_property) { case PROP_OBJECT_IDENTIFIER: apdu_len = encode_application_object_id(&apdu[0], OBJECT_ANALOG_INPUT, diff --git a/bacnet-stack/demo/object/ao.c b/bacnet-stack/demo/object/ao.c index f9beadd0..831a5865 100644 --- a/bacnet-stack/demo/object/ao.c +++ b/bacnet-stack/demo/object/ao.c @@ -446,11 +446,11 @@ bool Analog_Output_Write_Property( if (status) { level = AO_LEVEL_NULL; object_index = - Analog_Output_Instance_To_Index - (wp_data->object_instance); + Analog_Output_Instance_To_Index(wp_data-> + object_instance); status = - Analog_Output_Present_Value_Relinquish - (wp_data->object_instance, wp_data->priority); + Analog_Output_Present_Value_Relinquish(wp_data-> + object_instance, wp_data->priority); if (!status) { wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; diff --git a/bacnet-stack/demo/object/av.c b/bacnet-stack/demo/object/av.c index bd18c0be..bc7b2a84 100644 --- a/bacnet-stack/demo/object/av.c +++ b/bacnet-stack/demo/object/av.c @@ -396,8 +396,8 @@ bool Analog_Value_Write_Property( if (status) { level = ANALOG_LEVEL_NULL; object_index = - Analog_Value_Instance_To_Index - (wp_data->object_instance); + Analog_Value_Instance_To_Index(wp_data-> + object_instance); priority = wp_data->priority; if (priority && (priority <= BACNET_MAX_PRIORITY)) { priority--; diff --git a/bacnet-stack/demo/object/bo.c b/bacnet-stack/demo/object/bo.c index 63b7ca59..eb21f8b0 100644 --- a/bacnet-stack/demo/object/bo.c +++ b/bacnet-stack/demo/object/bo.c @@ -375,8 +375,8 @@ bool Binary_Output_Write_Property( (value.type.Enumerated <= MAX_BINARY_PV)) { level = (BACNET_BINARY_PV) value.type.Enumerated; object_index = - Binary_Output_Instance_To_Index - (wp_data->object_instance); + Binary_Output_Instance_To_Index(wp_data-> + object_instance); priority--; Binary_Output_Level[object_index][priority] = level; /* Note: you could set the physical output here if we @@ -402,8 +402,8 @@ bool Binary_Output_Write_Property( if (status) { level = BINARY_NULL; object_index = - Binary_Output_Instance_To_Index - (wp_data->object_instance); + Binary_Output_Instance_To_Index(wp_data-> + object_instance); priority = wp_data->priority; if (priority && (priority <= BACNET_MAX_PRIORITY)) { priority--; diff --git a/bacnet-stack/demo/object/bv.c b/bacnet-stack/demo/object/bv.c index 1299126e..67643a96 100644 --- a/bacnet-stack/demo/object/bv.c +++ b/bacnet-stack/demo/object/bv.c @@ -358,8 +358,8 @@ bool Binary_Value_Write_Property( (value.type.Enumerated <= MAX_BINARY_PV)) { level = (BACNET_BINARY_PV) value.type.Enumerated; object_index = - Binary_Value_Instance_To_Index - (wp_data->object_instance); + Binary_Value_Instance_To_Index(wp_data-> + object_instance); priority--; Binary_Value_Level[object_index][priority] = level; /* Note: you could set the physical output here if we @@ -385,8 +385,8 @@ bool Binary_Value_Write_Property( if (status) { level = BINARY_NULL; object_index = - Binary_Value_Instance_To_Index - (wp_data->object_instance); + Binary_Value_Instance_To_Index(wp_data-> + object_instance); priority = wp_data->priority; if (priority && (priority <= BACNET_MAX_PRIORITY)) { priority--; diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c index f0708704..b192471c 100644 --- a/bacnet-stack/demo/object/device.c +++ b/bacnet-stack/demo/object/device.c @@ -354,7 +354,7 @@ uint32_t Device_Object_Instance_Number( void) { #ifdef BAC_ROUTING - return Routed_Device_Object_Instance_Number(); + return Routed_Device_Object_Instance_Number(); #else return Object_Instance_Number; #endif @@ -1141,8 +1141,8 @@ bool Device_Write_Property_Local( &wp_data->error_class, &wp_data->error_code); if (status) { if ((value.type.Object_Id.type == OBJECT_DEVICE) && - (Device_Set_Object_Instance_Number(value.type. - Object_Id.instance))) { + (Device_Set_Object_Instance_Number(value.type.Object_Id. + instance))) { /* FIXME: we could send an I-Am broadcast to let the world know */ } else { status = false; @@ -1175,8 +1175,8 @@ bool Device_Write_Property_Local( &wp_data->error_class, &wp_data->error_code); if (status) { /* FIXME: bounds check? */ - Device_Set_Vendor_Identifier((uint16_t) value. - type.Unsigned_Int); + Device_Set_Vendor_Identifier((uint16_t) value.type. + Unsigned_Int); } break; case PROP_SYSTEM_STATUS: @@ -1203,8 +1203,8 @@ bool Device_Write_Property_Local( WPValidateString(&value, MAX_DEV_NAME_LEN, false, &wp_data->error_class, &wp_data->error_code); if (status) { - Device_Set_Object_Name(characterstring_value(&value. - type.Character_String), + Device_Set_Object_Name(characterstring_value(&value.type. + Character_String), characterstring_length(&value.type.Character_String)); } break; @@ -1213,8 +1213,8 @@ bool Device_Write_Property_Local( WPValidateString(&value, MAX_DEV_LOC_LEN, true, &wp_data->error_class, &wp_data->error_code); if (status) { - Device_Set_Location(characterstring_value(&value. - type.Character_String), + Device_Set_Location(characterstring_value(&value.type. + Character_String), characterstring_length(&value.type.Character_String)); } break; @@ -1224,8 +1224,8 @@ bool Device_Write_Property_Local( WPValidateString(&value, MAX_DEV_DESC_LEN, true, &wp_data->error_class, &wp_data->error_code); if (status) { - Device_Set_Description(characterstring_value(&value. - type.Character_String), + Device_Set_Description(characterstring_value(&value.type. + Character_String), characterstring_length(&value.type.Character_String)); } break; @@ -1234,8 +1234,8 @@ bool Device_Write_Property_Local( WPValidateString(&value, MAX_DEV_MOD_LEN, true, &wp_data->error_class, &wp_data->error_code); if (status) { - Device_Set_Model_Name(characterstring_value(&value. - type.Character_String), + Device_Set_Model_Name(characterstring_value(&value.type. + Character_String), characterstring_length(&value.type.Character_String)); } break; @@ -1247,8 +1247,8 @@ bool Device_Write_Property_Local( &wp_data->error_class, &wp_data->error_code); if (status) { if (value.type.Unsigned_Int <= 255) { - dlmstp_set_max_info_frames((uint8_t) value. - type.Unsigned_Int); + dlmstp_set_max_info_frames((uint8_t) value.type. + Unsigned_Int); } else { status = false; wp_data->error_class = ERROR_CLASS_PROPERTY; @@ -1328,7 +1328,7 @@ bool Device_Write_Property( * functions in order to properly support the default handlers. */ void Device_Initialize_Object_Functions( - object_functions_t *object_table) + object_functions_t * object_table) { Object_Table = object_table; } @@ -1407,25 +1407,26 @@ bool DeviceGetRRInfo( instance number. */ void Routing_Device_Init( - uint32_t first_object_instance ) + uint32_t first_object_instance) { struct object_functions *pDevObject = NULL; /* First, do the usual Device_Init() functions: */ Device_Init(); /* Initialize with our preset strings */ - Add_Routed_Device( first_object_instance, My_Object_Name, Description ); + Add_Routed_Device(first_object_instance, My_Object_Name, Description); /* Now substitute our routed versions of the main object functions. */ pDevObject = &Object_Table[0]; pDevObject->Object_Index_To_Instance = Routed_Device_Index_To_Instance; - pDevObject->Object_Valid_Instance = Routed_Device_Valid_Object_Instance_Number; + pDevObject->Object_Valid_Instance = + Routed_Device_Valid_Object_Instance_Number; pDevObject->Object_Name = Routed_Device_Name; pDevObject->Object_Read_Property = Routed_Device_Read_Property_Local; pDevObject->Object_Write_Property = Routed_Device_Write_Property_Local; } -#endif /* BAC_ROUTING */ +#endif /* BAC_ROUTING */ #ifdef TEST diff --git a/bacnet-stack/demo/object/gw_device.c b/bacnet-stack/demo/object/gw_device.c index a8b1e7da..24fd1545 100644 --- a/bacnet-stack/demo/object/gw_device.c +++ b/bacnet-stack/demo/object/gw_device.c @@ -114,32 +114,30 @@ uint16_t iCurrent_Device_Idx = 0; * @return The index of this instance in the Devices[] array, * or -1 if there isn't enough room to add this Device. */ -uint16_t Add_Routed_Device( - uint32_t Object_Instance, - const char * sObject_Name, - const char * sDescription ) +uint16_t Add_Routed_Device( + uint32_t Object_Instance, + const char *sObject_Name, + const char *sDescription) { - int i = Num_Managed_Devices; - if ( i < MAX_NUM_DEVICES ) - { - DEVICE_OBJECT_DATA *pDev = &Devices[i]; - Num_Managed_Devices++; - iCurrent_Device_Idx = i; - pDev->bacObj.mObject_Type = OBJECT_DEVICE; - pDev->bacObj.Object_Instance_Number = Object_Instance; - if ( sObject_Name != NULL ) - Routed_Device_Set_Object_Name( sObject_Name, strlen( sObject_Name )); - else - Routed_Device_Set_Object_Name( "No Name", strlen( "No Name" )); - if ( sDescription != NULL ) - Routed_Device_Set_Description( sDescription, strlen( sDescription )); - else - Routed_Device_Set_Description( "No Descr", strlen( "No Descr" )); - pDev->Database_Revision = 0; /* Reset/Initialize now */ - return i; - } - else - return -1; + int i = Num_Managed_Devices; + if (i < MAX_NUM_DEVICES) { + DEVICE_OBJECT_DATA *pDev = &Devices[i]; + Num_Managed_Devices++; + iCurrent_Device_Idx = i; + pDev->bacObj.mObject_Type = OBJECT_DEVICE; + pDev->bacObj.Object_Instance_Number = Object_Instance; + if (sObject_Name != NULL) + Routed_Device_Set_Object_Name(sObject_Name, strlen(sObject_Name)); + else + Routed_Device_Set_Object_Name("No Name", strlen("No Name")); + if (sDescription != NULL) + Routed_Device_Set_Description(sDescription, strlen(sDescription)); + else + Routed_Device_Set_Description("No Descr", strlen("No Descr")); + pDev->Database_Revision = 0; /* Reset/Initialize now */ + return i; + } else + return -1; } @@ -152,17 +150,16 @@ uint16_t Add_Routed_Device( * @return Pointer to the requested Device Object data, or NULL if the idx * is for an invalid row entry (eg, after the last good Device). */ -DEVICE_OBJECT_DATA * Get_Routed_Device_Object( - int idx ) +DEVICE_OBJECT_DATA *Get_Routed_Device_Object( + int idx) { - if ( idx == -1 ) - return &Devices[iCurrent_Device_Idx]; - else if ( (idx >= 0) && (idx < MAX_NUM_DEVICES) ) { - iCurrent_Device_Idx = idx; - return &Devices[idx]; - } - else - return NULL; + if (idx == -1) + return &Devices[iCurrent_Device_Idx]; + else if ((idx >= 0) && (idx < MAX_NUM_DEVICES)) { + iCurrent_Device_Idx = idx; + return &Devices[idx]; + } else + return NULL; } /** Return the BACnet address for the indicated entry. @@ -174,17 +171,16 @@ DEVICE_OBJECT_DATA * Get_Routed_Device_Object( * @return Pointer to the requested Device Object BACnet address, or NULL if the idx * is for an invalid row entry (eg, after the last good Device). */ -BACNET_ADDRESS * Get_Routed_Device_Address( - int idx ) +BACNET_ADDRESS *Get_Routed_Device_Address( + int idx) { - if ( idx == -1 ) - return &Devices[iCurrent_Device_Idx].bacDevAddr; - else if ( (idx >= 0) && (idx < MAX_NUM_DEVICES) ) { - iCurrent_Device_Idx = idx; - return &Devices[idx].bacDevAddr; - } - else - return NULL; + if (idx == -1) + return &Devices[iCurrent_Device_Idx].bacDevAddr; + else if ((idx >= 0) && (idx < MAX_NUM_DEVICES)) { + iCurrent_Device_Idx = idx; + return &Devices[idx].bacDevAddr; + } else + return NULL; } @@ -198,11 +194,10 @@ BACNET_ADDRESS * Get_Routed_Device_Address( */ void routed_get_my_address( BACNET_ADDRESS * my_address) - { if (my_address) { - memcpy(my_address, &Devices[iCurrent_Device_Idx].bacDevAddr, - sizeof( BACNET_ADDRESS )); + memcpy(my_address, &Devices[iCurrent_Device_Idx].bacDevAddr, + sizeof(BACNET_ADDRESS)); } } @@ -224,32 +219,32 @@ void routed_get_my_address( * meaning MAC broadcast, so it's an automatic match). * Else False if no match or invalid idx is given. */ -bool Routed_Device_Address_Lookup( - int idx, - uint8_t address_len, - uint8_t * mac_adress ) +bool Routed_Device_Address_Lookup( + int idx, + uint8_t address_len, + uint8_t * mac_adress) { - bool result = false; - DEVICE_OBJECT_DATA *pDev = &Devices[idx]; - int i; + bool result = false; + DEVICE_OBJECT_DATA *pDev = &Devices[idx]; + int i; - if ( (idx >= 0) && (idx < MAX_NUM_DEVICES) ) { - if ( address_len == 0 ) { - /* Automatic match */ - iCurrent_Device_Idx = idx; - result = true; - } else if ( mac_adress != NULL ) { - for (i = 0; i < address_len; i++) { - if (pDev->bacDevAddr.mac[i] != mac_adress[i]) - break; - } - if ( i == address_len ) { /* Success! */ - iCurrent_Device_Idx = idx; - result = true; - } - } - } - return result; + if ((idx >= 0) && (idx < MAX_NUM_DEVICES)) { + if (address_len == 0) { + /* Automatic match */ + iCurrent_Device_Idx = idx; + result = true; + } else if (mac_adress != NULL) { + for (i = 0; i < address_len; i++) { + if (pDev->bacDevAddr.mac[i] != mac_adress[i]) + break; + } + if (i == address_len) { /* Success! */ + iCurrent_Device_Idx = idx; + result = true; + } + } + } + return result; } @@ -279,63 +274,61 @@ bool Routed_Device_Address_Lookup( * Else False if no match or invalid idx is given; the cursor will * be returned as -1 in these cases. */ -bool Routed_Device_GetNext( - BACNET_ADDRESS * dest, - int * DNET_list, - int * cursor ) +bool Routed_Device_GetNext( + BACNET_ADDRESS * dest, + int *DNET_list, + int *cursor) { - int dnet = DNET_list[0]; /* Get the DNET of our virtual network */ + int dnet = DNET_list[0]; /* Get the DNET of our virtual network */ int idx = *cursor; bool bSuccess = false; - + /* First, see if the index is out of range. * Eg, last call to GetNext may have been the last successful one. */ - if ( (idx < 0) || (idx >= MAX_NUM_DEVICES) ) - idx = -1; - + if ((idx < 0) || (idx >= MAX_NUM_DEVICES)) + idx = -1; + /* Next, see if it's a BACnet broadcast. * For broadcasts, all Devices get a chance at it. */ else if (dest->net == BACNET_BROADCAST_NETWORK) { - /* Just take the entry indexed by the cursor */ - bSuccess = Routed_Device_Address_Lookup( idx++, - dest->len, dest->adr ); + /* Just take the entry indexed by the cursor */ + bSuccess = Routed_Device_Address_Lookup(idx++, dest->len, dest->adr); } /* Or see if it's for the main Gateway Device, because * there's no routing info. */ - else if (dest->net == 0) { + else if (dest->net == 0) { /* Handle like a normal, non-routed access of the Gateway Device. * But first, make sure our internal access is pointing at * that Device in our table by telling it "no routing info" : */ - bSuccess = Routed_Device_Address_Lookup( 0, - dest->len, dest->adr ); - /* Next step: no more matches: */ - idx = -1; + bSuccess = Routed_Device_Address_Lookup(0, dest->len, dest->adr); + /* Next step: no more matches: */ + idx = -1; } /* Or if is our virtual DNET, check * against each of our virtually routed Devices. * If we get a match, have it handle the APDU. * For broadcasts, all Devices get a chance at it. */ - else if (dest->net == dnet) { - if ( idx == 0 ) /* Step over this case (starting point) */ - idx = 1; - while (idx < MAX_NUM_DEVICES) { - bSuccess = Routed_Device_Address_Lookup( idx++, - dest->len, dest->adr ); - if ( bSuccess ) - break; /* We don't need to keep looking */ - } - } + else if (dest->net == dnet) { + if (idx == 0) /* Step over this case (starting point) */ + idx = 1; + while (idx < MAX_NUM_DEVICES) { + bSuccess = + Routed_Device_Address_Lookup(idx++, dest->len, dest->adr); + if (bSuccess) + break; /* We don't need to keep looking */ + } + } - if ( !bSuccess ) - *cursor = -1; - else if ( idx == MAX_NUM_DEVICES ) /* No more to GetNext */ - *cursor = -1; + if (!bSuccess) + *cursor = -1; + else if (idx == MAX_NUM_DEVICES) /* No more to GetNext */ + *cursor = -1; else - *cursor = idx; + *cursor = idx; return bSuccess; } @@ -353,24 +346,24 @@ bool Routed_Device_GetNext( * an automatic match. * Else False if not a reachable network. */ -bool Routed_Device_Is_Valid_Network( - uint16_t dest_net, - int * DNET_list ) +bool Routed_Device_Is_Valid_Network( + uint16_t dest_net, + int *DNET_list) { - int dnet = DNET_list[0]; /* Get the DNET of our virtual network */ + int dnet = DNET_list[0]; /* Get the DNET of our virtual network */ bool bSuccess = false; - + /* First, see if it's a BACnet broadcast (automatic pass). */ - if ( dest_net == BACNET_BROADCAST_NETWORK) - bSuccess = true; + if (dest_net == BACNET_BROADCAST_NETWORK) + bSuccess = true; /* Or see if it's for the main Gateway Device, because * there's no routing info. */ - else if (dest_net == 0) - bSuccess = true; + else if (dest_net == 0) + bSuccess = true; /* Or see if matches our virtual DNET */ - else if (dest_net == dnet) - bSuccess = true; + else if (dest_net == dnet) + bSuccess = true; return bSuccess; } @@ -396,20 +389,20 @@ uint32_t Routed_Device_Index_To_Instance( bool Routed_Device_Valid_Object_Instance_Number( uint32_t object_id) { - bool bResult = false; - DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; + bool bResult = false; + DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; /* BACnet allows for a wildcard instance number */ - if (object_id == BACNET_MAX_INSTANCE) - bResult = true; - if ( pDev->bacObj.Object_Instance_Number == object_id ) - bResult = true; - return bResult; + if (object_id == BACNET_MAX_INSTANCE) + bResult = true; + if (pDev->bacObj.Object_Instance_Number == object_id) + bResult = true; + return bResult; } char *Routed_Device_Name( uint32_t object_instance) { - DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; + DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; if (object_instance == pDev->bacObj.Object_Instance_Number) { return pDev->bacObj.Object_Name; } @@ -429,7 +422,7 @@ int Routed_Device_Read_Property_Local( int apdu_len = 0; /* return value */ BACNET_CHARACTER_STRING char_string; uint8_t *apdu = NULL; - DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; + DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; if ((rpdata == NULL) || (rpdata->application_data == NULL) || (rpdata->application_data_len == 0)) { @@ -440,7 +433,7 @@ int Routed_Device_Read_Property_Local( case PROP_OBJECT_IDENTIFIER: apdu_len = encode_application_object_id(&apdu[0], OBJECT_DEVICE, - pDev->bacObj.Object_Instance_Number); + pDev->bacObj.Object_Instance_Number); break; case PROP_OBJECT_NAME: characterstring_init_ansi(&char_string, pDev->bacObj.Object_Name); @@ -457,11 +450,11 @@ int Routed_Device_Read_Property_Local( encode_application_unsigned(&apdu[0], pDev->Database_Revision); break; default: - apdu_len = Device_Read_Property_Local( rpdata); + apdu_len = Device_Read_Property_Local(rpdata); break; } - return ( apdu_len ); + return (apdu_len); } bool Routed_Device_Write_Property_Local( @@ -489,8 +482,8 @@ bool Routed_Device_Write_Property_Local( &wp_data->error_class, &wp_data->error_code); if (status) { if ((value.type.Object_Id.type == OBJECT_DEVICE) && - (Routed_Device_Set_Object_Instance_Number(value.type. - Object_Id.instance))) { + (Routed_Device_Set_Object_Instance_Number(value. + type.Object_Id.instance))) { /* FIXME: we could send an I-Am broadcast to let the world know */ } else { status = false; @@ -504,13 +497,13 @@ bool Routed_Device_Write_Property_Local( WPValidateString(&value, MAX_DEV_NAME_LEN, false, &wp_data->error_class, &wp_data->error_code); if (status) { - Routed_Device_Set_Object_Name(characterstring_value(&value. - type.Character_String), + Routed_Device_Set_Object_Name(characterstring_value + (&value.type.Character_String), characterstring_length(&value.type.Character_String)); } break; default: - status = Device_Write_Property_Local( wp_data); + status = Device_Write_Property_Local(wp_data); break; } return status; @@ -537,7 +530,7 @@ bool Routed_Device_Set_Object_Instance_Number( if (object_id <= BACNET_MAX_INSTANCE) { /* Make the change and update the database revision */ - Devices[iCurrent_Device_Idx].bacObj.Object_Instance_Number = object_id; + Devices[iCurrent_Device_Idx].bacObj.Object_Instance_Number = object_id; Routed_Device_Inc_Database_Revision(); } else status = false; @@ -558,7 +551,7 @@ bool Routed_Device_Set_Object_Name( size_t length) { bool status = false; /*return value */ - DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; + DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; if (length < MAX_DEV_NAME_LEN) { /* Make the change and update the database revision */ @@ -576,7 +569,7 @@ bool Routed_Device_Set_Description( size_t length) { bool status = false; /*return value */ - DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; + DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; if (length < MAX_DEV_DESC_LEN) { memmove(pDev->Description, name, length); @@ -596,8 +589,6 @@ bool Routed_Device_Set_Description( void Routed_Device_Inc_Database_Revision( void) { - DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; - pDev->Database_Revision++; + DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx]; + pDev->Database_Revision++; } - - diff --git a/bacnet-stack/demo/object/lo.c b/bacnet-stack/demo/object/lo.c index 69f4ed7f..d3f344b6 100644 --- a/bacnet-stack/demo/object/lo.c +++ b/bacnet-stack/demo/object/lo.c @@ -469,8 +469,8 @@ int Lighting_Output_Read_Property( object_index = Lighting_Output_Instance_To_Index(rpdata->object_instance); if (rpdata->array_index <= BACNET_MAX_PRIORITY) { - if (Lighting_Output_Level[object_index][rpdata->array_index - - 1] == LIGHTING_LEVEL_NULL) + if (Lighting_Output_Level[object_index][rpdata-> + array_index - 1] == LIGHTING_LEVEL_NULL) apdu_len = encode_application_null(&apdu[0]); else { real_value = Lighting_Output_Level[object_index] @@ -554,11 +554,11 @@ bool Lighting_Output_Write_Property( if (status) { level = LIGHTING_LEVEL_NULL; object_index = - Lighting_Output_Instance_To_Index - (wp_data->object_instance); + Lighting_Output_Instance_To_Index(wp_data-> + object_instance); status = - Lighting_Output_Present_Value_Relinquish - (wp_data->object_instance, wp_data->priority); + Lighting_Output_Present_Value_Relinquish(wp_data-> + object_instance, wp_data->priority); if (wp_data->priority == 6) { /* Command priority 6 is reserved for use by Minimum On/Off algorithm and may not be used for other purposes in any @@ -585,8 +585,8 @@ bool Lighting_Output_Write_Property( &wp_data->error_class, &wp_data->error_code); if (status) { object_index = - Lighting_Output_Instance_To_Index - (wp_data->object_instance); + Lighting_Output_Instance_To_Index(wp_data-> + object_instance); Lighting_Output_Out_Of_Service[object_index] = value.type.Boolean; } diff --git a/bacnet-stack/demo/object/lsp.c b/bacnet-stack/demo/object/lsp.c index d8d29a72..4842cf08 100644 --- a/bacnet-stack/demo/object/lsp.c +++ b/bacnet-stack/demo/object/lsp.c @@ -323,8 +323,8 @@ bool Life_Safety_Point_Write_Property( if (status) { if (value.type.Enumerated <= MAX_LIFE_SAFETY_MODE) { object_index = - Life_Safety_Point_Instance_To_Index - (wp_data->object_instance); + Life_Safety_Point_Instance_To_Index(wp_data-> + object_instance); Life_Safety_Point_Mode[object_index] = value.type.Enumerated; } else { @@ -340,8 +340,8 @@ bool Life_Safety_Point_Write_Property( &wp_data->error_class, &wp_data->error_code); if (status) { object_index = - Life_Safety_Point_Instance_To_Index - (wp_data->object_instance); + Life_Safety_Point_Instance_To_Index(wp_data-> + object_instance); Life_Safety_Point_Out_Of_Service[object_index] = value.type.Boolean; } diff --git a/bacnet-stack/demo/object/ms-input.c b/bacnet-stack/demo/object/ms-input.c index 3bf88fb7..6d910649 100644 --- a/bacnet-stack/demo/object/ms-input.c +++ b/bacnet-stack/demo/object/ms-input.c @@ -277,8 +277,7 @@ static char *Multistate_Input_State_Text( char *pName = NULL; /* return value */ index = Multistate_Input_Instance_To_Index(object_instance); - if ((index < MAX_MULTISTATE_INPUTS) && - (state_index > 0) && + if ((index < MAX_MULTISTATE_INPUTS) && (state_index > 0) && (state_index <= MULTISTATE_NUMBER_OF_STATES)) { state_index--; pName = State_Text[index][state_index]; @@ -298,8 +297,7 @@ bool Multistate_Input_State_Text_Set( bool status = false; /* return value */ index = Multistate_Input_Instance_To_Index(object_instance); - if ((index < MAX_MULTISTATE_INPUTS) && - (state_index > 0) && + if ((index < MAX_MULTISTATE_INPUTS) && (state_index > 0) && (state_index <= MULTISTATE_NUMBER_OF_STATES)) { state_index--; status = true; @@ -405,8 +403,8 @@ int Multistate_Input_Read_Property( /* if no index was specified, then try to encode the entire list */ /* into one packet. */ object_index = - Multistate_Input_Instance_To_Index - (rpdata->object_instance); + Multistate_Input_Instance_To_Index(rpdata-> + object_instance); for (i = 1; i <= MULTISTATE_NUMBER_OF_STATES; i++) { characterstring_init_ansi(&char_string, Multistate_Input_State_Text(rpdata->object_instance, @@ -427,8 +425,8 @@ int Multistate_Input_Read_Property( } } else { object_index = - Multistate_Input_Instance_To_Index - (rpdata->object_instance); + Multistate_Input_Instance_To_Index(rpdata-> + object_instance); if (rpdata->array_index <= MULTISTATE_NUMBER_OF_STATES) { characterstring_init_ansi(&char_string, Multistate_Input_State_Text(rpdata->object_instance, @@ -488,8 +486,8 @@ bool Multistate_Input_Write_Property( if (status) { if (Out_Of_Service[object_index]) { status = - Multistate_Input_Present_Value_Set - (wp_data->object_instance, value.type.Unsigned_Int); + Multistate_Input_Present_Value_Set(wp_data-> + object_instance, value.type.Unsigned_Int); if (!status) { wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; @@ -507,8 +505,8 @@ bool Multistate_Input_Write_Property( &wp_data->error_class, &wp_data->error_code); if (status) { object_index = - Multistate_Input_Instance_To_Index - (wp_data->object_instance); + Multistate_Input_Instance_To_Index(wp_data-> + object_instance); Out_Of_Service[object_index] = value.type.Boolean; } break; diff --git a/bacnet-stack/demo/object/mso.c b/bacnet-stack/demo/object/mso.c index 5260b73b..394ca10b 100644 --- a/bacnet-stack/demo/object/mso.c +++ b/bacnet-stack/demo/object/mso.c @@ -266,8 +266,8 @@ int Multistate_Output_Read_Property( /* into one packet. */ else if (rpdata->array_index == BACNET_ARRAY_ALL) { object_index = - Multistate_Output_Instance_To_Index - (rpdata->object_instance); + Multistate_Output_Instance_To_Index(rpdata-> + object_instance); for (i = 0; i < BACNET_MAX_PRIORITY; i++) { /* FIXME: check if we have room before adding it to APDU */ if (Multistate_Output_Level[object_index][i] == @@ -292,8 +292,8 @@ int Multistate_Output_Read_Property( } } else { object_index = - Multistate_Output_Instance_To_Index - (rpdata->object_instance); + Multistate_Output_Instance_To_Index(rpdata-> + object_instance); if (rpdata->array_index <= BACNET_MAX_PRIORITY) { if (Multistate_Output_Level[object_index] [rpdata->array_index - 1] == MULTISTATE_NULL) @@ -375,8 +375,8 @@ bool Multistate_Output_Write_Property( (value.type.Unsigned_Int <= MULTISTATE_NUMBER_OF_STATES)) { level = value.type.Unsigned_Int; object_index = - Multistate_Output_Instance_To_Index - (wp_data->object_instance); + Multistate_Output_Instance_To_Index(wp_data-> + object_instance); priority--; Multistate_Output_Level[object_index][priority] = (uint8_t) level; @@ -403,8 +403,8 @@ bool Multistate_Output_Write_Property( if (status) { level = MULTISTATE_NULL; object_index = - Multistate_Output_Instance_To_Index - (wp_data->object_instance); + Multistate_Output_Instance_To_Index(wp_data-> + object_instance); priority = wp_data->priority; if (priority && (priority <= BACNET_MAX_PRIORITY)) { priority--; @@ -430,8 +430,8 @@ bool Multistate_Output_Write_Property( &wp_data->error_class, &wp_data->error_code); if (status) { object_index = - Multistate_Output_Instance_To_Index - (wp_data->object_instance); + Multistate_Output_Instance_To_Index(wp_data-> + object_instance); Multistate_Output_Out_Of_Service[object_index] = value.type.Boolean; } diff --git a/bacnet-stack/demo/object/trendlog.c b/bacnet-stack/demo/object/trendlog.c index 3459bae3..b10ff0b3 100644 --- a/bacnet-stack/demo/object/trendlog.c +++ b/bacnet-stack/demo/object/trendlog.c @@ -735,9 +735,9 @@ bool Trend_Log_Write_Property( if (wp_data->application_data_len != 0) { iOffset += len; len = - bacapp_decode_context_data(&wp_data->application_data - [iOffset], wp_data->application_data_len, &value, - PROP_LOG_DEVICE_OBJECT_PROPERTY); + bacapp_decode_context_data(&wp_data-> + application_data[iOffset], wp_data->application_data_len, + &value, PROP_LOG_DEVICE_OBJECT_PROPERTY); if ((len == 0) || ((value.context_tag != 2) && (value.context_tag != 3))) { /* Bad decode or wrong tag */ @@ -754,8 +754,8 @@ bool Trend_Log_Write_Property( if (wp_data->application_data_len != 0) { iOffset += len; len = - bacapp_decode_context_data - (&wp_data->application_data[iOffset], + bacapp_decode_context_data(&wp_data-> + application_data[iOffset], wp_data->application_data_len, &value, PROP_LOG_DEVICE_OBJECT_PROPERTY); if ((len == 0) || (value.context_tag != 3)) { @@ -1097,8 +1097,8 @@ int rr_trend_log_encode( pRequest->ItemCount = 0; /* Start out with nothing */ /* Bail out now if nowt - should never happen for a Trend Log but ... */ - if (LogInfo[Trend_Log_Instance_To_Index(pRequest-> - object_instance)].ulRecordCount == 0) + if (LogInfo[Trend_Log_Instance_To_Index(pRequest->object_instance)]. + ulRecordCount == 0) return (0); if ((pRequest->RequestType == RR_BY_POSITION) || diff --git a/bacnet-stack/demo/readfile/main.c b/bacnet-stack/demo/readfile/main.c index 3d5f6847..0a468f9f 100644 --- a/bacnet-stack/demo/readfile/main.c +++ b/bacnet-stack/demo/readfile/main.c @@ -52,8 +52,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/readprop/main.c b/bacnet-stack/demo/readprop/main.c index 1afe5a8c..16ce33c6 100644 --- a/bacnet-stack/demo/readprop/main.c +++ b/bacnet-stack/demo/readprop/main.c @@ -55,8 +55,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/readpropm/main.c b/bacnet-stack/demo/readpropm/main.c index b93db3c2..3988ca12 100644 --- a/bacnet-stack/demo/readpropm/main.c +++ b/bacnet-stack/demo/readpropm/main.c @@ -56,8 +56,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/reinit/main.c b/bacnet-stack/demo/reinit/main.c index 563c98f4..e1467422 100644 --- a/bacnet-stack/demo/reinit/main.c +++ b/bacnet-stack/demo/reinit/main.c @@ -53,8 +53,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/server/main.c b/bacnet-stack/demo/server/main.c index d2812fae..b6952a7b 100644 --- a/bacnet-stack/demo/server/main.c +++ b/bacnet-stack/demo/server/main.c @@ -82,7 +82,7 @@ static object_functions_t Object_Table[] = { #if defined(BACFILE) {FILE_OBJ_FUNCTIONS}, #endif - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /** @file server/main.c Example server application using the BACnet Stack. */ diff --git a/bacnet-stack/demo/timesync/main.c b/bacnet-stack/demo/timesync/main.c index aba81f80..25305147 100644 --- a/bacnet-stack/demo/timesync/main.c +++ b/bacnet-stack/demo/timesync/main.c @@ -48,8 +48,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/ucov/main.c b/bacnet-stack/demo/ucov/main.c index 2568eb15..09cdb33d 100644 --- a/bacnet-stack/demo/ucov/main.c +++ b/bacnet-stack/demo/ucov/main.c @@ -52,8 +52,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; static void Init_Service_Handlers( diff --git a/bacnet-stack/demo/whohas/main.c b/bacnet-stack/demo/whohas/main.c index c4b9e8f8..7018bee1 100644 --- a/bacnet-stack/demo/whohas/main.c +++ b/bacnet-stack/demo/whohas/main.c @@ -52,8 +52,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/whois/main.c b/bacnet-stack/demo/whois/main.c index e3e19029..8f15022d 100644 --- a/bacnet-stack/demo/whois/main.c +++ b/bacnet-stack/demo/whois/main.c @@ -51,8 +51,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/whoisrouter/main.c b/bacnet-stack/demo/whoisrouter/main.c index c387a752..65df6865 100644 --- a/bacnet-stack/demo/whoisrouter/main.c +++ b/bacnet-stack/demo/whoisrouter/main.c @@ -53,8 +53,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/writefile/main.c b/bacnet-stack/demo/writefile/main.c index 7255cf7b..b10b9b05 100644 --- a/bacnet-stack/demo/writefile/main.c +++ b/bacnet-stack/demo/writefile/main.c @@ -52,8 +52,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/demo/writeprop/main.c b/bacnet-stack/demo/writeprop/main.c index bc4bdd29..a3364991 100644 --- a/bacnet-stack/demo/writeprop/main.c +++ b/bacnet-stack/demo/writeprop/main.c @@ -58,8 +58,8 @@ /* All included BACnet objects */ static object_functions_t Object_Table[] = { - {DEVICE_OBJ_FUNCTIONS}, - {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {DEVICE_OBJ_FUNCTIONS}, + {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, }; /* buffer used for receive */ diff --git a/bacnet-stack/include/ai.h b/bacnet-stack/include/ai.h index 855e4bc2..fec425f2 100644 --- a/bacnet-stack/include/ai.h +++ b/bacnet-stack/include/ai.h @@ -91,11 +91,9 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define ANALOG_INPUT_OBJ_FUNCTIONS \ OBJECT_ANALOG_INPUT, Analog_Input_Init, Analog_Input_Count, \ Analog_Input_Index_To_Instance, Analog_Input_Valid_Instance, \ Analog_Input_Name, Analog_Input_Read_Property, NULL, \ Analog_Input_Property_Lists, NULL, NULL - #endif diff --git a/bacnet-stack/include/ao.h b/bacnet-stack/include/ao.h index 6213cb10..7c46ff2d 100644 --- a/bacnet-stack/include/ao.h +++ b/bacnet-stack/include/ao.h @@ -99,12 +99,10 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define ANALOG_OUTPUT_OBJ_FUNCTIONS \ OBJECT_ANALOG_OUTPUT, Analog_Output_Init, Analog_Output_Count, \ Analog_Output_Index_To_Instance, Analog_Output_Valid_Instance, \ Analog_Output_Name, Analog_Output_Read_Property, \ Analog_Output_Write_Property, Analog_Output_Property_Lists, \ NULL, NULL - #endif diff --git a/bacnet-stack/include/av.h b/bacnet-stack/include/av.h index 63b1aae7..4b24a68f 100644 --- a/bacnet-stack/include/av.h +++ b/bacnet-stack/include/av.h @@ -75,12 +75,10 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define ANALOG_VALUE_OBJ_FUNCTIONS \ OBJECT_ANALOG_VALUE, Analog_Value_Init, Analog_Value_Count, \ Analog_Value_Index_To_Instance, Analog_Value_Valid_Instance, \ Analog_Value_Name, Analog_Value_Read_Property, \ Analog_Value_Write_Property, Analog_Value_Property_Lists, NULL, \ NULL - #endif diff --git a/bacnet-stack/include/bacapp.h b/bacnet-stack/include/bacapp.h index 8fdfea56..32de710e 100644 --- a/bacnet-stack/include/bacapp.h +++ b/bacnet-stack/include/bacapp.h @@ -197,7 +197,7 @@ extern "C" { unsigned max_apdu_len, BACNET_PROPERTY_ID property); -#ifndef BACAPP_PRINT_ENABLED +#ifndef BACAPP_PRINT_ENABLED #if PRINT_ENABLED || defined TEST #define BACAPP_PRINT_ENABLED #endif diff --git a/bacnet-stack/include/bacfile.h b/bacnet-stack/include/bacfile.h index c36d83d5..63292fa3 100644 --- a/bacnet-stack/include/bacfile.h +++ b/bacnet-stack/include/bacfile.h @@ -94,10 +94,8 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define FILE_OBJ_FUNCTIONS \ OBJECT_FILE, bacfile_init, bacfile_count, bacfile_index_to_instance, \ bacfile_valid_instance, bacfile_name, bacfile_read_property, \ bacfile_write_property, BACfile_Property_Lists, NULL - #endif diff --git a/bacnet-stack/include/bactext.h b/bacnet-stack/include/bactext.h index 498c0829..7518824b 100644 --- a/bacnet-stack/include/bactext.h +++ b/bacnet-stack/include/bactext.h @@ -122,7 +122,7 @@ extern "C" { const char *bactext_network_layer_msg_name( unsigned index); - + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/bacnet-stack/include/bi.h b/bacnet-stack/include/bi.h index 1654c19e..217f1f35 100644 --- a/bacnet-stack/include/bi.h +++ b/bacnet-stack/include/bi.h @@ -113,11 +113,9 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define BINARY_INPUT_OBJ_FUNCTIONS \ OBJECT_BINARY_INPUT, Binary_Input_Init, Binary_Input_Count, \ Binary_Input_Index_To_Instance, Binary_Input_Valid_Instance, \ Binary_Input_Name, Binary_Input_Read_Property, NULL, \ Binary_Input_Property_Lists, NULL, NULL - #endif diff --git a/bacnet-stack/include/bo.h b/bacnet-stack/include/bo.h index ffbc1dbf..666b3a08 100644 --- a/bacnet-stack/include/bo.h +++ b/bacnet-stack/include/bo.h @@ -108,12 +108,10 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define BINARY_OUTPUT_OBJ_FUNCTIONS \ OBJECT_BINARY_OUTPUT, Binary_Output_Init, Binary_Output_Count, \ Binary_Output_Index_To_Instance, Binary_Output_Valid_Instance, \ Binary_Output_Name, Binary_Output_Read_Property, \ Binary_Output_Write_Property, Binary_Output_Property_Lists, \ NULL, NULL - #endif diff --git a/bacnet-stack/include/bv.h b/bacnet-stack/include/bv.h index 96ddc99b..0eeeed11 100644 --- a/bacnet-stack/include/bv.h +++ b/bacnet-stack/include/bv.h @@ -69,12 +69,10 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define BINARY_VALUE_OBJ_FUNCTIONS \ OBJECT_BINARY_VALUE, Binary_Value_Init, Binary_Value_Count, \ Binary_Value_Index_To_Instance, Binary_Value_Valid_Instance, \ Binary_Value_Name, Binary_Value_Read_Property, \ Binary_Value_Write_Property, Binary_Value_Property_Lists, NULL, \ NULL - #endif diff --git a/bacnet-stack/include/bvlc.h b/bacnet-stack/include/bvlc.h index cda2ee1b..9962f4e5 100644 --- a/bacnet-stack/include/bvlc.h +++ b/bacnet-stack/include/bvlc.h @@ -80,8 +80,8 @@ extern "C" { uint8_t * pdu); int bvlc_encode_delete_fdt_entry( uint8_t * pdu, - uint32_t address, /* in network byte order */ - uint16_t port); /* in network byte order */ + uint32_t address, /* in network byte order */ + uint16_t port); /* in network byte order */ int bvlc_encode_original_unicast_npdu( uint8_t * pdu, uint8_t * npdu, diff --git a/bacnet-stack/include/client.h b/bacnet-stack/include/client.h index 39b2fdfa..1c50fcce 100644 --- a/bacnet-stack/include/client.h +++ b/bacnet-stack/include/client.h @@ -185,10 +185,10 @@ extern "C" { uint32_t device_id, BACNET_EVENT_NOTIFICATION_DATA * data); - int Send_Network_Layer_Message( - BACNET_NETWORK_MESSAGE_TYPE network_message_type, - BACNET_ADDRESS * dst, - int * iArgs ); + int Send_Network_Layer_Message( + BACNET_NETWORK_MESSAGE_TYPE network_message_type, + BACNET_ADDRESS * dst, + int *iArgs); void Send_Who_Is_Router_To_Network( BACNET_ADDRESS * dst, int dnet); @@ -203,7 +203,7 @@ extern "C" { const int DNET_list[]); void Send_Initialize_Routing_Table_Ack( BACNET_ADDRESS * dst, - const int DNET_list[]); + const int DNET_list[]); uint8_t Send_Life_Safety_Operation_Data( uint32_t device_id, diff --git a/bacnet-stack/include/config.h b/bacnet-stack/include/config.h index 90c47b1a..6157e6e6 100644 --- a/bacnet-stack/include/config.h +++ b/bacnet-stack/include/config.h @@ -48,9 +48,9 @@ /* Enable the Gateway (Routing) functionality here, if desired. */ #if !defined(MAX_NUM_DEVICES) #ifdef BAC_ROUTING -#define MAX_NUM_DEVICES 3 /* Eg, Gateway + two remote devices */ +#define MAX_NUM_DEVICES 3 /* Eg, Gateway + two remote devices */ #else -#define MAX_NUM_DEVICES 1 /* Just the one normal BACnet Device Object */ +#define MAX_NUM_DEVICES 1 /* Just the one normal BACnet Device Object */ #endif #endif diff --git a/bacnet-stack/include/datalink.h b/bacnet-stack/include/datalink.h index 82fee9d7..f8311f38 100644 --- a/bacnet-stack/include/datalink.h +++ b/bacnet-stack/include/datalink.h @@ -143,7 +143,7 @@ extern "C" { * chosen at runtime from among these choices. * - Clause 10 POINT-TO-POINT (PTP) and Clause 11 EIA/CEA-709.1 ("LonTalk") LAN * are not currently supported by this project. - *//** @defgroup DLTemplates DataLink Template Functions + *//** @defgroup DLTemplates DataLink Template Functions * @ingroup DataLink * Most of the functions in this group are function templates which are assigned * to a specific DataLink network layer implementation either at compile time or diff --git a/bacnet-stack/include/dcc.h b/bacnet-stack/include/dcc.h index 113b412c..fbc5fd0c 100644 --- a/bacnet-stack/include/dcc.h +++ b/bacnet-stack/include/dcc.h @@ -104,9 +104,7 @@ extern "C" { * * The network management BIBBs prescribe the BACnet capabilities required to * interoperably perform network management functions. - */ - -/** @defgroup DMDCC Device Management-Device Communication Control (DM-DCC) + *//** @defgroup DMDCC Device Management-Device Communication Control (DM-DCC) * @ingroup RDMS * 16.1 DeviceCommunicationControl Service
* The DeviceCommunicationControl service is used by a client BACnet-user to @@ -119,9 +117,7 @@ extern "C" { * "indefinite," meaning communication must be re-enabled by a * DeviceCommunicationControl or, if supported, ReinitializeDevice service, * not by time. - */ - -/** @defgroup NMRC Network Management-Router Configuration (NM-RC) + *//** @defgroup NMRC Network Management-Router Configuration (NM-RC) * @ingroup RDMS * The A device may query and change the configuration of routers and * half-routers. @@ -134,6 +130,4 @@ extern "C" { * auto-configuration, router table maintenance, and network layer congestion * control. */ - - #endif diff --git a/bacnet-stack/include/debug.h b/bacnet-stack/include/debug.h index 1f268119..b85a76fa 100644 --- a/bacnet-stack/include/debug.h +++ b/bacnet-stack/include/debug.h @@ -50,12 +50,12 @@ extern "C" { /* Nothing more here */ #else /* If your compiler supports it, this is more compact: - inline void debug_printf( - const char *format, - ...) { - format = format; - } - */ + inline void debug_printf( + const char *format, + ...) { + format = format; + } + */ #endif #ifdef __cplusplus } diff --git a/bacnet-stack/include/device.h b/bacnet-stack/include/device.h index 375d7e9d..ea968903 100644 --- a/bacnet-stack/include/device.h +++ b/bacnet-stack/include/device.h @@ -131,8 +131,7 @@ typedef struct object_functions { #define MAX_DEV_DESC_LEN 64 /** Structure to define the Object Properties common to all Objects. */ -typedef struct commonBacObj_s -{ +typedef struct commonBacObj_s { /** The BACnet type of this object (ie, what class is this object from?). * This property, of type BACnetObjectType, indicates membership in a @@ -160,13 +159,12 @@ typedef struct commonBacObj_s * This may be useful for implementations which manage multiple Devices, * eg, a Gateway. */ -typedef struct devObj_s -{ +typedef struct devObj_s { /** The BACnet Device Address for this device; ->len depends on DLL type. */ - BACNET_ADDRESS bacDevAddr; + BACNET_ADDRESS bacDevAddr; /** Structure for the Object Properties common to all Objects. */ - COMMON_BAC_OBJECT bacObj; + COMMON_BAC_OBJECT bacObj; /** Device Description. */ char Description[MAX_DEV_DESC_LEN]; @@ -183,7 +181,7 @@ extern "C" { void Device_Init( void); void Device_Initialize_Object_Functions( - object_functions_t *object_table); + object_functions_t * object_table); bool Device_Reinitialize( BACNET_REINITIALIZE_DEVICE_DATA * rd_data); @@ -311,31 +309,31 @@ extern "C" { * in the build (lib/Makefile). */ void Routing_Device_Init( - uint32_t first_object_instance ); + uint32_t first_object_instance); uint16_t Add_Routed_Device( uint32_t Object_Instance, - const char * Object_Name, - const char * Description ); - DEVICE_OBJECT_DATA * Get_Routed_Device_Object( - int idx ); - BACNET_ADDRESS * Get_Routed_Device_Address( - int idx ); + const char *Object_Name, + const char *Description); + DEVICE_OBJECT_DATA *Get_Routed_Device_Object( + int idx); + BACNET_ADDRESS *Get_Routed_Device_Address( + int idx); void routed_get_my_address( BACNET_ADDRESS * my_address); bool Routed_Device_Address_Lookup( - int idx, - uint8_t address_len, - uint8_t * mac_adress ); + int idx, + uint8_t address_len, + uint8_t * mac_adress); bool Routed_Device_GetNext( - BACNET_ADDRESS * dest, - int * DNET_list, - int * cursor ); + BACNET_ADDRESS * dest, + int *DNET_list, + int *cursor); bool Routed_Device_Is_Valid_Network( - uint16_t dest_net, - int * DNET_list ); + uint16_t dest_net, + int *DNET_list); uint32_t Routed_Device_Index_To_Instance( unsigned index); @@ -362,13 +360,11 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define DEVICE_OBJ_FUNCTIONS \ OBJECT_DEVICE, NULL, Device_Count, Device_Index_To_Instance, \ Device_Valid_Object_Instance_Number, Device_Name, \ Device_Read_Property_Local, Device_Write_Property_Local, \ Device_Property_Lists, DeviceGetRRInfo, NULL - /** @defgroup ObjFrmwk Object Framework * The modules in this section describe the BACnet-stack's framework for * BACnet-defined Objects (Device, Analog Input, etc). There are two submodules @@ -378,11 +374,11 @@ extern "C" { * - The interface between the implemented Objects and the BAC-stack services, * specifically the handlers, which are mediated through function calls to * the Device object. - *//** @defgroup ObjHelpers Object Helper Functions + *//** @defgroup ObjHelpers Object Helper Functions * @ingroup ObjFrmwk * This section describes the function templates for the helper functions that * provide common object support. - *//** @defgroup ObjIntf Handler-to-Object Interface Functions + *//** @defgroup ObjIntf Handler-to-Object Interface Functions * @ingroup ObjFrmwk * This section describes the fairly limited set of functions that link the * BAC-stack handlers to the BACnet Object instances. All of these calls are diff --git a/bacnet-stack/include/event.h b/bacnet-stack/include/event.h index d3757c31..6c819803 100644 --- a/bacnet-stack/include/event.h +++ b/bacnet-stack/include/event.h @@ -213,7 +213,7 @@ extern "C" { * These BIBBs prescribe the BACnet capabilities required to interoperably * perform the alarm and event management functions enumerated in 22.2.1.2 * for the BACnet devices defined therein. - *//** @defgroup EVNOTFCN Alarm and Event-Notification (AE-N) + *//** @defgroup EVNOTFCN Alarm and Event-Notification (AE-N) * @ingroup ALMEVNT * 13.6 ConfirmedCOVNotification Service
* The ConfirmedCOVNotification service is used to notify subscribers about @@ -230,7 +230,7 @@ extern "C" { * For unsubscribed notifications, the algorithm for determining when to issue * this service is a local matter and may be based on a change of value, * periodic updating, or some other criteria. - *//** @defgroup ALMACK Alarm and Event-ACK (AE-ACK) + *//** @defgroup ALMACK Alarm and Event-ACK (AE-ACK) * @ingroup ALMEVNT * 13.5 AcknowledgeAlarm Service
* In some systems a device may need to know that an operator has seen the alarm diff --git a/bacnet-stack/include/handlers.h b/bacnet-stack/include/handlers.h index 17d595cb..2eb6c852 100644 --- a/bacnet-stack/include/handlers.h +++ b/bacnet-stack/include/handlers.h @@ -56,8 +56,8 @@ extern "C" { void routing_npdu_handler( BACNET_ADDRESS * src, - int * DNET_list, - uint8_t * pdu, + int *DNET_list, + uint8_t * pdu, uint16_t pdu_len); void handler_who_is( diff --git a/bacnet-stack/include/lc.h b/bacnet-stack/include/lc.h index f69d6573..40b764c2 100644 --- a/bacnet-stack/include/lc.h +++ b/bacnet-stack/include/lc.h @@ -74,12 +74,10 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define LOAD_CONTROL_OBJ_FUNCTIONS \ OBJECT_LOAD_CONTROL, Load_Control_Init, Load_Control_Count, \ Load_Control_Index_To_Instance, Load_Control_Valid_Instance, \ Load_Control_Name, Load_Control_Read_Property, \ Load_Control_Write_Property, Load_Control_Property_Lists, NULL, \ NULL - #endif diff --git a/bacnet-stack/include/lsp.h b/bacnet-stack/include/lsp.h index 349e6eba..37d51018 100644 --- a/bacnet-stack/include/lsp.h +++ b/bacnet-stack/include/lsp.h @@ -68,7 +68,6 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define LIFE_SAFETY_POINT_OBJ_FUNCTIONS \ OBJECT_LIFE_SAFETY_POINT, Life_Safety_Point_Init, \ Life_Safety_Point_Count, Life_Safety_Point_Index_To_Instance, \ @@ -76,5 +75,4 @@ extern "C" { Life_Safety_Point_Read_Property, \ Life_Safety_Point_Write_Property, \ Life_Safety_Point_Property_Lists, NULL, NULL - #endif diff --git a/bacnet-stack/include/ms-input.h b/bacnet-stack/include/ms-input.h index ee973cb9b..6ed1f609 100644 --- a/bacnet-stack/include/ms-input.h +++ b/bacnet-stack/include/ms-input.h @@ -93,7 +93,6 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define MULTI_STATE_INPUT_OBJ_FUNCTIONS \ OBJECT_MULTI_STATE_INPUT, Multistate_Input_Init, \ Multistate_Input_Count, Multistate_Input_Index_To_Instance, \ @@ -101,5 +100,4 @@ extern "C" { Multistate_Input_Read_Property, \ Multistate_Input_Write_Property, \ Multistate_Input_Property_Lists, NULL, NULL - #endif diff --git a/bacnet-stack/include/mso.h b/bacnet-stack/include/mso.h index d06e879d..c602ddd2 100644 --- a/bacnet-stack/include/mso.h +++ b/bacnet-stack/include/mso.h @@ -69,7 +69,6 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define MULTI_STATE_OUTPUT_OBJ_FUNCTIONS \ OBJECT_MULTI_STATE_OUTPUT, Multistate_Output_Init, \ Multistate_Output_Count, Multistate_Output_Index_To_Instance, \ @@ -77,5 +76,4 @@ extern "C" { Multistate_Output_Read_Property, \ Multistate_Output_Write_Property, \ Multistate_Output_Property_Lists, NULL, NULL - #endif diff --git a/bacnet-stack/include/npdu.h b/bacnet-stack/include/npdu.h index c588d486..d5ac29bd 100644 --- a/bacnet-stack/include/npdu.h +++ b/bacnet-stack/include/npdu.h @@ -61,11 +61,11 @@ struct router_port_t; #define ROUTER_PORT_INFO_LEN 2 /** Port Info structure used by Routers for their routing table. */ typedef struct router_port_t { - uint16_t dnet; /**< The DNET number that identifies this port. */ - uint8_t id; /**< Either 0 or some ill-defined, meaningless value. */ + uint16_t dnet; /**< The DNET number that identifies this port. */ + uint8_t id; /**< Either 0 or some ill-defined, meaningless value. */ uint8_t info[ROUTER_PORT_INFO_LEN]; /**< Info like 'modem dialing string' */ - uint8_t info_len; /**< Length of info[]. */ - struct router_port_t *next; /**< Point to next in linked list */ + uint8_t info_len; /**< Length of info[]. */ + struct router_port_t *next; /**< Point to next in linked list */ } BACNET_ROUTER_PORT; #ifdef __cplusplus diff --git a/bacnet-stack/include/readrange.h b/bacnet-stack/include/readrange.h index b3c5259e..795ddd5c 100644 --- a/bacnet-stack/include/readrange.h +++ b/bacnet-stack/include/readrange.h @@ -41,28 +41,28 @@ extern "C" { #endif /* __cplusplus */ -struct BACnet_Read_Range_Data; -typedef struct BACnet_Read_Range_Data { - BACNET_OBJECT_TYPE object_type; - uint32_t object_instance; - BACNET_PROPERTY_ID object_property; - uint32_t array_index; - uint8_t *application_data; - int application_data_len; - BACNET_BIT_STRING ResultFlags; /**< FIRST_ITEM, LAST_ITEM, MORE_ITEMS. */ - int RequestType; /**< Index, sequence or time based request. */ - int Overhead; /**< How much space the baggage takes in the response. */ - uint32_t ItemCount; - uint32_t FirstSequence; - union { /**< Pick the appropriate data type. */ - uint32_t RefIndex; - uint32_t RefSeqNum; - BACNET_DATE_TIME RefTime; - } Range; - int32_t Count; /**< SIGNED value as +ve vs -ve is important. */ - BACNET_ERROR_CLASS error_class; - BACNET_ERROR_CODE error_code; -} BACNET_READ_RANGE_DATA; + struct BACnet_Read_Range_Data; + typedef struct BACnet_Read_Range_Data { + BACNET_OBJECT_TYPE object_type; + uint32_t object_instance; + BACNET_PROPERTY_ID object_property; + uint32_t array_index; + uint8_t *application_data; + int application_data_len; + BACNET_BIT_STRING ResultFlags; /**< FIRST_ITEM, LAST_ITEM, MORE_ITEMS. */ + int RequestType;/**< Index, sequence or time based request. */ + int Overhead; /**< How much space the baggage takes in the response. */ + uint32_t ItemCount; + uint32_t FirstSequence; + union { /**< Pick the appropriate data type. */ + uint32_t RefIndex; + uint32_t RefSeqNum; + BACNET_DATE_TIME RefTime; + } Range; + int32_t Count; /**< SIGNED value as +ve vs -ve is important. */ + BACNET_ERROR_CLASS error_class; + BACNET_ERROR_CODE error_code; + } BACNET_READ_RANGE_DATA; /** Defines to indicate which type of read range request it is. Not really a bit map but we do it like this to allow quick @@ -75,11 +75,11 @@ typedef struct BACnet_Read_Range_Data { #define RR_ARRAY_OF_LISTS 16 /**< For info functionality indicates array of lists if set */ /** Bit String Enumerations */ -typedef enum { - RESULT_FLAG_FIRST_ITEM = 0, - RESULT_FLAG_LAST_ITEM = 1, - RESULT_FLAG_MORE_ITEMS = 2 -} BACNET_RESULT_FLAGS; + typedef enum { + RESULT_FLAG_FIRST_ITEM = 0, + RESULT_FLAG_LAST_ITEM = 1, + RESULT_FLAG_MORE_ITEMS = 2 + } BACNET_RESULT_FLAGS; /** Defines for ReadRange packet overheads to allow us to determine how * much space is left for actual payload: @@ -116,18 +116,18 @@ typedef enum { information in it. The function is responsible for applying the request to the property in question and returning the response. */ -typedef int ( - *rr_handler_function) ( - uint8_t * apdu, - BACNET_READ_RANGE_DATA * pRequest); + typedef int ( + *rr_handler_function) ( + uint8_t * apdu, + BACNET_READ_RANGE_DATA * pRequest); /** Structure to return the type of requests a given object property can * accept and the address of the function to handle the request */ -typedef struct rrpropertyinfo { - int RequestTypes; - rr_handler_function Handler; -} RR_PROP_INFO; + typedef struct rrpropertyinfo { + int RequestTypes; + rr_handler_function Handler; + } RR_PROP_INFO; /** Function template for ReadRange information retrieval function. * A function template; @see device.c for assignment to object types. @@ -136,46 +136,43 @@ typedef struct rrpropertyinfo { * @param pInfo [out] Where to write the response to. * @return True on success, False on error or failure. */ -typedef bool( - *rr_info_function) ( - BACNET_READ_RANGE_DATA * pRequest, /* Info on the request */ - RR_PROP_INFO * pInfo); /* Where to write the response to */ + typedef bool( + *rr_info_function) ( + BACNET_READ_RANGE_DATA * pRequest, /* Info on the request */ + RR_PROP_INFO * pInfo); /* Where to write the response to */ -int rr_encode_apdu( - uint8_t * apdu, - uint8_t invoke_id, - BACNET_READ_RANGE_DATA * rrdata); + int rr_encode_apdu( + uint8_t * apdu, + uint8_t invoke_id, + BACNET_READ_RANGE_DATA * rrdata); -int rr_decode_service_request( - uint8_t * apdu, - unsigned apdu_len, - BACNET_READ_RANGE_DATA * rrdata); + int rr_decode_service_request( + uint8_t * apdu, + unsigned apdu_len, + BACNET_READ_RANGE_DATA * rrdata); -int rr_ack_encode_apdu( - uint8_t * apdu, - uint8_t invoke_id, - BACNET_READ_RANGE_DATA * rrdata); + int rr_ack_encode_apdu( + uint8_t * apdu, + uint8_t invoke_id, + BACNET_READ_RANGE_DATA * rrdata); -int rr_ack_decode_service_request( - uint8_t * apdu, - int apdu_len, /* total length of the apdu */ - BACNET_READ_RANGE_DATA * rrdata); + int rr_ack_decode_service_request( + uint8_t * apdu, + int apdu_len, /* total length of the apdu */ + BACNET_READ_RANGE_DATA * rrdata); -uint8_t Send_ReadRange_Request( - uint32_t device_id, /* destination device */ - BACNET_READ_RANGE_DATA * read_access_data); + uint8_t Send_ReadRange_Request( + uint32_t device_id, /* destination device */ + BACNET_READ_RANGE_DATA * read_access_data); #ifdef __cplusplus } #endif /* __cplusplus */ - /** @defgroup Trend Trending BIBBs * These BIBBs prescribe the BACnet capabilities required to interoperably * perform the trending functions enumerated in clause 22.2.1.4 for the * BACnet devices defined therein. - */ - -/** @defgroup TrendReadRange Trending -Read Range Service (eg, in T-VMT) + *//** @defgroup TrendReadRange Trending -Read Range Service (eg, in T-VMT) * @ingroup Trend * 15.8 ReadRange Service
* The ReadRange service is used by a client BACnet-user to read a specific @@ -183,5 +180,4 @@ uint8_t Send_ReadRange_Request( * specified object property. * The service may be used with any list or array of lists property. */ - #endif diff --git a/bacnet-stack/include/rp.h b/bacnet-stack/include/rp.h index 65eadd88..52333aff 100644 --- a/bacnet-stack/include/rp.h +++ b/bacnet-stack/include/rp.h @@ -135,7 +135,7 @@ extern "C" { * These BIBBs prescribe the BACnet capabilities required to interoperably * perform the data sharing functions enumerated in 22.2.1.1 for the BACnet * devices defined therein. - *//** @defgroup DSRP Data Sharing -Read Property Service (DS-RP) + *//** @defgroup DSRP Data Sharing -Read Property Service (DS-RP) * @ingroup DataShare * 15.5 ReadProperty Service
* The ReadProperty service is used by a client BACnet-user to request the diff --git a/bacnet-stack/include/trendlog.h b/bacnet-stack/include/trendlog.h index 9fbd7782..55512b57 100644 --- a/bacnet-stack/include/trendlog.h +++ b/bacnet-stack/include/trendlog.h @@ -196,12 +196,10 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ - #define TRENDLOG_OBJ_FUNCTIONS \ OBJECT_TRENDLOG, Trend_Log_Init, Trend_Log_Count, \ Trend_Log_Index_To_Instance, Trend_Log_Valid_Instance, \ Trend_Log_Name, Trend_Log_Read_Property, \ Trend_Log_Write_Property, Trend_Log_Property_Lists, \ TrendLogGetRRInfo, NULL - #endif diff --git a/bacnet-stack/ports/at91sam7s/av.c b/bacnet-stack/ports/at91sam7s/av.c index a50e5061..68f78efe 100644 --- a/bacnet-stack/ports/at91sam7s/av.c +++ b/bacnet-stack/ports/at91sam7s/av.c @@ -360,8 +360,8 @@ bool Analog_Value_Write_Property( (value.type.Real >= 0.0) && (value.type.Real <= 100.0)) { level = (uint8_t) value.type.Real; object_index = - Analog_Value_Instance_To_Index - (wp_data->object_instance); + Analog_Value_Instance_To_Index(wp_data-> + object_instance); priority--; Present_Value[object_index] = level; /* Note: you could set the physical output here if we diff --git a/bacnet-stack/ports/at91sam7s/bv.c b/bacnet-stack/ports/at91sam7s/bv.c index bb233c2f..fcdccd70 100644 --- a/bacnet-stack/ports/at91sam7s/bv.c +++ b/bacnet-stack/ports/at91sam7s/bv.c @@ -270,8 +270,8 @@ bool Binary_Value_Write_Property( (value.type.Enumerated <= MAX_BINARY_PV)) { level = value.type.Enumerated; object_index = - Binary_Value_Instance_To_Index - (wp_data->object_instance); + Binary_Value_Instance_To_Index(wp_data-> + object_instance); priority--; /* NOTE: this Binary value has no priority array */ Present_Value[object_index] = level; diff --git a/bacnet-stack/ports/at91sam7s/device.c b/bacnet-stack/ports/at91sam7s/device.c index 9111318b..d3ee2140 100644 --- a/bacnet-stack/ports/at91sam7s/device.c +++ b/bacnet-stack/ports/at91sam7s/device.c @@ -829,8 +829,8 @@ bool Device_Write_Property_Local( case PROP_OBJECT_IDENTIFIER: if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { if ((value.type.Object_Id.type == OBJECT_DEVICE) && - (Device_Set_Object_Instance_Number(value.type. - Object_Id.instance))) { + (Device_Set_Object_Instance_Number(value.type.Object_Id. + instance))) { /* we could send an I-Am broadcast to let the world know */ status = true; } else { diff --git a/bacnet-stack/ports/at91sam7s/dlmstp.c b/bacnet-stack/ports/at91sam7s/dlmstp.c index e2bfbf5e..0449d7d3 100644 --- a/bacnet-stack/ports/at91sam7s/dlmstp.c +++ b/bacnet-stack/ports/at91sam7s/dlmstp.c @@ -870,10 +870,9 @@ static bool MSTP_Master_Node_FSM( (Next_Station == This_Station)) { /* NextStationUnknown - added in Addendum 135-2008v-1 */ /* then the next station to which the token - should be sent is unknown - so PollForMaster */ + should be sent is unknown - so PollForMaster */ Poll_Station = next_this_station; - MSTP_Send_Frame( - FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, + MSTP_Send_Frame(FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, This_Station, NULL, 0); RetryCount = 0; Master_State = MSTP_MASTER_STATE_POLL_FOR_MASTER; diff --git a/bacnet-stack/ports/atmega168/bv.c b/bacnet-stack/ports/atmega168/bv.c index 67b8abf7..86d74cb3 100644 --- a/bacnet-stack/ports/atmega168/bv.c +++ b/bacnet-stack/ports/atmega168/bv.c @@ -211,8 +211,8 @@ bool Binary_Value_Write_Property( if ((value.type.Enumerated == BINARY_ACTIVE) || (value.type.Enumerated == BINARY_INACTIVE)) { object_index = - Binary_Value_Instance_To_Index - (wp_data->object_instance); + Binary_Value_Instance_To_Index(wp_data-> + object_instance); /* NOTE: this Binary value has no priority array */ Present_Value[object_index] = (BACNET_BINARY_PV) value.type.Enumerated; diff --git a/bacnet-stack/ports/atmega168/device.c b/bacnet-stack/ports/atmega168/device.c index d7eede8b..b97f71ae 100644 --- a/bacnet-stack/ports/atmega168/device.c +++ b/bacnet-stack/ports/atmega168/device.c @@ -380,8 +380,8 @@ bool Device_Write_Property( case PROP_OBJECT_IDENTIFIER: if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { if ((value.type.Object_Id.type == OBJECT_DEVICE) && - (Device_Set_Object_Instance_Number(value.type. - Object_Id.instance))) { + (Device_Set_Object_Instance_Number(value.type.Object_Id. + instance))) { /* we could send an I-Am broadcast to let the world know */ status = true; } else { diff --git a/bacnet-stack/ports/atmega168/dlmstp.c b/bacnet-stack/ports/atmega168/dlmstp.c index b16e4142..47cc5e68 100644 --- a/bacnet-stack/ports/atmega168/dlmstp.c +++ b/bacnet-stack/ports/atmega168/dlmstp.c @@ -787,10 +787,9 @@ static bool MSTP_Master_Node_FSM( (Next_Station == This_Station)) { /* NextStationUnknown - added in Addendum 135-2008v-1 */ /* then the next station to which the token - should be sent is unknown - so PollForMaster */ + should be sent is unknown - so PollForMaster */ Poll_Station = next_this_station; - MSTP_Send_Frame( - FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, + MSTP_Send_Frame(FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, This_Station, NULL, 0); RetryCount = 0; Master_State = MSTP_MASTER_STATE_POLL_FOR_MASTER; diff --git a/bacnet-stack/ports/atmega8/bv.c b/bacnet-stack/ports/atmega8/bv.c index 67b8abf7..86d74cb3 100644 --- a/bacnet-stack/ports/atmega8/bv.c +++ b/bacnet-stack/ports/atmega8/bv.c @@ -211,8 +211,8 @@ bool Binary_Value_Write_Property( if ((value.type.Enumerated == BINARY_ACTIVE) || (value.type.Enumerated == BINARY_INACTIVE)) { object_index = - Binary_Value_Instance_To_Index - (wp_data->object_instance); + Binary_Value_Instance_To_Index(wp_data-> + object_instance); /* NOTE: this Binary value has no priority array */ Present_Value[object_index] = (BACNET_BINARY_PV) value.type.Enumerated; diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/adc.c b/bacnet-stack/ports/bdk-atxx4-mstp/adc.c index abee1df0..494e90e0 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/adc.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/adc.c @@ -61,30 +61,30 @@ ISR(ADC_vect) uint16_t value = 0; /* determine which conversion finished */ - index = BITMASK_CHECK(ADMUX,((1<>2); + result = (uint8_t) (Sample_Result[index] >> 2); SREG = sreg; } @@ -120,8 +120,8 @@ uint8_t adc_result_8bit( } uint16_t adc_result_10bit( - uint8_t index) /* 0..7 = ADC0..ADC7, respectively */ -{ + uint8_t index) +{ /* 0..7 = ADC0..ADC7, respectively */ uint16_t result = 0; uint8_t sreg; @@ -142,7 +142,7 @@ void adc_init( /* Initial channel selection */ /* ADLAR = Left Adjust Result REFSx = hardware setup: cap on AREF - */ + */ ADMUX = (0 << ADLAR) | (0 << REFS1) | (1 << REFS0); /* ADEN = Enable ADSC = Start conversion @@ -150,8 +150,8 @@ void adc_init( ADIE = Interrupt Enable ADATE = Auto Trigger Enable */ - ADCSRA = (1 << ADEN) | (1 << ADIE) | - (1 << ADIF) | (0 << ADATE) | ADPS_10BIT; + ADCSRA = + (1 << ADEN) | (1 << ADIE) | (1 << ADIF) | (0 << ADATE) | ADPS_10BIT; /* trigger selection bits 0 0 0 Free Running mode 0 0 1 Analog Comparator diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/adc.h b/bacnet-stack/ports/bdk-atxx4-mstp/adc.h index 804364b0..537dfbe8 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/adc.h +++ b/bacnet-stack/ports/bdk-atxx4-mstp/adc.h @@ -33,9 +33,9 @@ extern "C" { void adc_enable( uint8_t index); /* 0..7 = ADC0..ADC7, respectively */ uint8_t adc_result_8bit( - uint8_t index); /* 0..7 = ADC0..ADC7, respectively */ + uint8_t index); /* 0..7 = ADC0..ADC7, respectively */ uint16_t adc_result_10bit( - uint8_t index); /* 0..7 = ADC0..ADC7, respectively */ + uint8_t index); /* 0..7 = ADC0..ADC7, respectively */ void adc_init( void); diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/bo.c b/bacnet-stack/ports/bdk-atxx4-mstp/bo.c index 5f48cc45..a6c32465 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/bo.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/bo.c @@ -199,7 +199,7 @@ BACNET_POLARITY Binary_Output_Polarity( BACNET_POLARITY polarity = POLARITY_NORMAL; if (instance < MAX_BINARY_OUTPUTS) { - polarity = (BACNET_POLARITY)Polarity[instance]; + polarity = (BACNET_POLARITY) Polarity[instance]; } return polarity; @@ -437,8 +437,8 @@ bool Binary_Output_Write_Property( priority = wp_data->priority; if (priority && (priority <= BACNET_MAX_PRIORITY)) { priority--; - Binary_Output_Present_Value_Set - (wp_data->object_instance, level, priority); + Binary_Output_Present_Value_Set(wp_data-> + object_instance, level, priority); } else if (priority == 6) { status = false; /* Command priority 6 is reserved for use by Minimum On/Off diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c index f4b55df5..95d366d9 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c @@ -813,8 +813,8 @@ bool Device_Write_Property_Local( case PROP_OBJECT_IDENTIFIER: if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { if ((value.type.Object_Id.type == OBJECT_DEVICE) && - (Device_Set_Object_Instance_Number(value.type. - Object_Id.instance))) { + (Device_Set_Object_Instance_Number(value.type.Object_Id. + instance))) { /* we could send an I-Am broadcast to let the world know */ status = true; } else { @@ -874,8 +874,8 @@ bool Device_Write_Property_Local( eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_LENGTH, &small_length, 1); pCharString = - characterstring_value(&value. - type.Character_String); + characterstring_value(&value.type. + Character_String); eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_0, (uint8_t *) pCharString, length); status = true; diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c b/bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c index 01426088..eab83c03 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/dlmstp.c @@ -892,10 +892,9 @@ static bool MSTP_Master_Node_FSM( (Next_Station == This_Station)) { /* NextStationUnknown - added in Addendum 135-2008v-1 */ /* then the next station to which the token - should be sent is unknown - so PollForMaster */ + should be sent is unknown - so PollForMaster */ Poll_Station = next_this_station; - MSTP_Send_Frame( - FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, + MSTP_Send_Frame(FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, This_Station, NULL, 0); RetryCount = 0; Master_State = MSTP_MASTER_STATE_POLL_FOR_MASTER; diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/rs485.c b/bacnet-stack/ports/bdk-atxx4-mstp/rs485.c index 2aa574c7..f784a502 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/rs485.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/rs485.c @@ -98,7 +98,7 @@ void rs485_turnaround_delay( /* delay after reception before trasmitting - per MS/TP spec */ /* Transmit 4 dummy bytes with RS485 driver off. - This equals the 40 bit times (1 start, 8 data, 1 stop). */ + This equals the 40 bit times (1 start, 8 data, 1 stop). */ rs485_rts_enable(false); while (nbytes) { /* Send the data byte */ diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/test.c b/bacnet-stack/ports/bdk-atxx4-mstp/test.c index ae4ef9b1..09ea95bf 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/test.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/test.c @@ -58,7 +58,8 @@ void test_init( * Returns: none * Notes: none *************************************************************************/ -static inline void test_pin_on(void) +static inline void test_pin_on( + void) { BIT_SET(PORTB, PB0); } @@ -68,7 +69,8 @@ static inline void test_pin_on(void) * Returns: none * Notes: none *************************************************************************/ -static inline void test_pin_off(void) +static inline void test_pin_off( + void) { BIT_CLEAR(PORTB, PB0); } @@ -78,7 +80,8 @@ static inline void test_pin_off(void) * Returns: true if on, false if off. * Notes: none *************************************************************************/ -static inline bool test_pin_state(void) +static inline bool test_pin_state( + void) { return (BIT_CHECK(PINB, PB0)); } @@ -88,7 +91,8 @@ static inline bool test_pin_state(void) * Returns: none * Notes: none *************************************************************************/ -static inline void test_pin_toggle(void) +static inline void test_pin_toggle( + void) { if (test_pin_state()) { test_pin_off(); @@ -157,11 +161,11 @@ void test_task( break; case 'b': sprintf(Send_Buffer, "\r\n%lubps", - (unsigned long)rs485_baud_rate()); + (unsigned long) rs485_baud_rate()); break; case 'm': sprintf(Send_Buffer, "\r\nMax:%u", - (unsigned)dlmstp_max_master()); + (unsigned) dlmstp_max_master()); break; default: break; diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/timer.c b/bacnet-stack/ports/bdk-atxx4-mstp/timer.c index b38677cc..679529e0 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/timer.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/timer.c @@ -308,7 +308,8 @@ void timer_interval_restart( * Returns: number of milliseconds elapsed * Notes: only up to 255ms elapsed **************************************************************************/ -uint8_t timer_milliseconds_delta(uint8_t start) +uint8_t timer_milliseconds_delta( + uint8_t start) { return (timer_milliseconds_byte() - start); } @@ -318,7 +319,8 @@ uint8_t timer_milliseconds_delta(uint8_t start) * Returns: mark timer starting tick * Notes: only up to 255ms elapsed **************************************************************************/ -uint8_t timer_milliseconds_mark(void) +uint8_t timer_milliseconds_mark( + void) { return timer_milliseconds_byte(); } diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/timer.h b/bacnet-stack/ports/bdk-atxx4-mstp/timer.h index f5a9aeaf..dac54d47 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/timer.h +++ b/bacnet-stack/ports/bdk-atxx4-mstp/timer.h @@ -104,8 +104,10 @@ extern "C" { struct itimer *t); /* special for 8-bit microcontrollers - limited to 255ms */ - uint8_t timer_milliseconds_delta(uint8_t start); - uint8_t timer_milliseconds_mark(void); + uint8_t timer_milliseconds_delta( + uint8_t start); + uint8_t timer_milliseconds_mark( + void); #ifdef __cplusplus } diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/timer2.c b/bacnet-stack/ports/bdk-atxx4-mstp/timer2.c index d497ec1e..d477d544 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/timer2.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/timer2.c @@ -66,7 +66,8 @@ ISR(TIMER2_OVF_vect); * Returns: nothing * Notes: none *************************************************************************/ -static inline void timer_interrupt_handler(void) +static inline void timer_interrupt_handler( + void) { /* Set the counter for the next interrupt */ TCNT2 = TIMER2_COUNT; @@ -92,7 +93,7 @@ ISR(TIMER2_OVF_vect) uint32_t timer_milliseconds( void) { - uint32_t timer_value; /* return value */ + uint32_t timer_value; /* return value */ /* Disable the overflow interrupt. Prevents value corruption that would happen if interrupted */ diff --git a/bacnet-stack/ports/dos/dlmstp.c b/bacnet-stack/ports/dos/dlmstp.c index abca1148..7502dde3 100644 --- a/bacnet-stack/ports/dos/dlmstp.c +++ b/bacnet-stack/ports/dos/dlmstp.c @@ -888,10 +888,9 @@ static bool MSTP_Master_Node_FSM( (Next_Station == This_Station)) { /* NextStationUnknown - added in Addendum 135-2008v-1 */ /* then the next station to which the token - should be sent is unknown - so PollForMaster */ + should be sent is unknown - so PollForMaster */ Poll_Station = next_this_station; - MSTP_Send_Frame( - FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, + MSTP_Send_Frame(FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, This_Station, NULL, 0); RetryCount = 0; Master_State = MSTP_MASTER_STATE_POLL_FOR_MASTER; diff --git a/bacnet-stack/ports/pic18f6720/av.c b/bacnet-stack/ports/pic18f6720/av.c index b9f3b96d..1626523a 100644 --- a/bacnet-stack/ports/pic18f6720/av.c +++ b/bacnet-stack/ports/pic18f6720/av.c @@ -325,8 +325,8 @@ bool Analog_Value_Write_Property( (value.type.Real >= 0.0) && (value.type.Real <= 100.0)) { level = (uint8_t) value.type.Real; object_index = - Analog_Value_Instance_To_Index - (wp_data->object_instance); + Analog_Value_Instance_To_Index(wp_data-> + object_instance); priority--; Present_Value[object_index] = level; /* Note: you could set the physical output here if we diff --git a/bacnet-stack/ports/pic18f6720/bv.c b/bacnet-stack/ports/pic18f6720/bv.c index d79c192c..c559301f 100644 --- a/bacnet-stack/ports/pic18f6720/bv.c +++ b/bacnet-stack/ports/pic18f6720/bv.c @@ -237,8 +237,8 @@ bool Binary_Value_Write_Property( (value.type.Enumerated <= MAX_BINARY_PV)) { level = value.type.Enumerated; object_index = - Binary_Value_Instance_To_Index - (wp_data->object_instance); + Binary_Value_Instance_To_Index(wp_data-> + object_instance); priority--; /* NOTE: this Binary value has no priority array */ Present_Value[object_index] = level; diff --git a/bacnet-stack/ports/pic18f6720/device.c b/bacnet-stack/ports/pic18f6720/device.c index a37e2bf5..16bda6f7 100644 --- a/bacnet-stack/ports/pic18f6720/device.c +++ b/bacnet-stack/ports/pic18f6720/device.c @@ -510,8 +510,8 @@ bool Device_Write_Property( case PROP_OBJECT_IDENTIFIER: if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { if ((value.type.Object_Id.type == OBJECT_DEVICE) && - (Device_Set_Object_Instance_Number(value.type. - Object_Id.instance))) { + (Device_Set_Object_Instance_Number(value.type.Object_Id. + instance))) { /* we could send an I-Am broadcast to let the world know */ status = true; } else { diff --git a/bacnet-stack/ports/pic18f6720/mstp.c b/bacnet-stack/ports/pic18f6720/mstp.c index 877c275d..f9bf08af 100644 --- a/bacnet-stack/ports/pic18f6720/mstp.c +++ b/bacnet-stack/ports/pic18f6720/mstp.c @@ -803,10 +803,9 @@ bool MSTP_Master_Node_FSM( (Next_Station == This_Station)) { /* NextStationUnknown - added in Addendum 135-2008v-1 */ /* then the next station to which the token - should be sent is unknown - so PollForMaster */ + should be sent is unknown - so PollForMaster */ Poll_Station = next_this_station; - MSTP_Send_Frame( - FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, + MSTP_Send_Frame(FRAME_TYPE_POLL_FOR_MASTER, Poll_Station, This_Station, NULL, 0); RetryCount = 0; Master_State = MSTP_MASTER_STATE_POLL_FOR_MASTER; diff --git a/bacnet-stack/ports/rtos32/bip-init.c b/bacnet-stack/ports/rtos32/bip-init.c index 5fb84ea4..3357b518 100644 --- a/bacnet-stack/ports/rtos32/bip-init.c +++ b/bacnet-stack/ports/rtos32/bip-init.c @@ -259,25 +259,16 @@ bool bip_init( bip_set_addr(my_addr.s_addr); set_broadcast_address(my_addr.s_addr); bip_set_port(htons((0xBAC0)); - - /* assumes that the driver has already been initialized */ - sock_fd = socket(AF_INET, SOCK_DGRAM, IPROTO_UDP); - bip_set_socket(sock_fd); - if (sock_fd < 0) + /* assumes that the driver has already been initialized */ + sock_fd = socket(AF_INET, SOCK_DGRAM, IPROTO_UDP); + bip_set_socket(sock_fd); if (sock_fd < 0) return false; + /* bind the socket to the local port number and IP address */ + sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl(INADDR_ANY); + sin.sin_port = bip_get_port(); memset(&(sin.sin_zero), '\0', 8); + rv = + bind(sock_fd, (const struct sockaddr *) &sin, sizeof(struct sockaddr)); + if (rv < 0) { + close(sock_fd); bip_set_socket(-1); return false;} - /* bind the socket to the local port number and IP address */ - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_ANY); - sin.sin_port = bip_get_port(); - memset(&(sin.sin_zero), '\0', 8); - rv = bind(sock_fd, (const struct sockaddr *) &sin, - sizeof(struct sockaddr)); - if (rv < 0) { - close(sock_fd); - bip_set_socket(-1); - return false; - } - - return true; -} + return true;} diff --git a/bacnet-stack/ports/rtos32/mstp.c b/bacnet-stack/ports/rtos32/mstp.c index ee913825..8272bd8e 100644 --- a/bacnet-stack/ports/rtos32/mstp.c +++ b/bacnet-stack/ports/rtos32/mstp.c @@ -942,7 +942,7 @@ bool MSTP_Master_Node_FSM( (mstp_port->Next_Station == mstp_port->This_Station)) { /* NextStationUnknown - added in Addendum 135-2008v-1 */ /* then the next station to which the token - should be sent is unknown - so PollForMaster */ + should be sent is unknown - so PollForMaster */ mstp_port->Poll_Station = next_this_station; MSTP_Create_And_Send_Frame(mstp_port, FRAME_TYPE_POLL_FOR_MASTER, mstp_port->Poll_Station, diff --git a/bacnet-stack/src/address.c b/bacnet-stack/src/address.c index 745d652a..1cffa485 100644 --- a/bacnet-stack/src/address.c +++ b/bacnet-stack/src/address.c @@ -149,8 +149,7 @@ static struct Address_Cache_Entry *address_remove_oldest( pMatch = Address_Cache; while (pMatch <= &Address_Cache[MAX_ADDRESS_CACHE - 1]) { - if ((pMatch-> - Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ | + if ((pMatch->Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ | BAC_ADDR_STATIC)) == BAC_ADDR_IN_USE) { if (pMatch->TimeToLive <= ulTime) { /* Shorter lived entry found */ ulTime = pMatch->TimeToLive; @@ -169,8 +168,7 @@ static struct Address_Cache_Entry *address_remove_oldest( /* Second pass - try in use and un bound as last resort */ pMatch = Address_Cache; while (pMatch <= &Address_Cache[MAX_ADDRESS_CACHE - 1]) { - if ((pMatch-> - Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ | + if ((pMatch->Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ | BAC_ADDR_STATIC)) == ((uint8_t) (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ))) { if (pMatch->TimeToLive <= ulTime) { /* Shorter lived entry found */ diff --git a/bacnet-stack/src/bacapp.c b/bacnet-stack/src/bacapp.c index 42fbefd1..0afb661b 100644 --- a/bacnet-stack/src/bacapp.c +++ b/bacnet-stack/src/bacapp.c @@ -288,8 +288,9 @@ int bacapp_decode_application_data( if (tag_len) { len += tag_len; value->tag = tag_number; - decode_len = bacapp_decode_data(&apdu[len], tag_number, - len_value_type, value); + decode_len = + bacapp_decode_data(&apdu[len], tag_number, len_value_type, + value); if (value->tag != MAX_BACNET_APPLICATION_TAG) { len += decode_len; } else { @@ -394,7 +395,7 @@ int bacapp_decode_data_len( case BACNET_APPLICATION_TAG_DATE: case BACNET_APPLICATION_TAG_TIME: case BACNET_APPLICATION_TAG_OBJECT_ID: - len = (int)len_value_type; + len = (int) len_value_type; break; default: break; @@ -422,8 +423,8 @@ int bacapp_decode_application_data_len( &len_value_type); if (tag_len) { len += tag_len; - decode_len = bacapp_decode_data_len(&apdu[len], tag_number, - len_value_type); + decode_len = + bacapp_decode_data_len(&apdu[len], tag_number, len_value_type); len += decode_len; } } @@ -996,8 +997,8 @@ bool bacapp_print_value( case PROP_OBJECT_TYPE: if (value->type.Enumerated < MAX_ASHRAE_OBJECT_TYPE) { fprintf(stream, "%s", - bactext_object_type_name(value->type. - Enumerated)); + bactext_object_type_name(value-> + type.Enumerated)); } else if (value->type.Enumerated < 128) { fprintf(stream, "reserved %lu", (unsigned long) value->type.Enumerated); @@ -1013,8 +1014,8 @@ bool bacapp_print_value( case PROP_UNITS: if (value->type.Enumerated < 256) { fprintf(stream, "%s", - bactext_engineering_unit_name(value-> - type.Enumerated)); + bactext_engineering_unit_name(value->type. + Enumerated)); } else { fprintf(stream, "proprietary %lu", (unsigned long) value->type.Enumerated); @@ -1022,14 +1023,14 @@ bool bacapp_print_value( break; case PROP_POLARITY: fprintf(stream, "%s", - bactext_binary_polarity_name(value-> - type.Enumerated)); + bactext_binary_polarity_name(value->type. + Enumerated)); break; case PROP_PRESENT_VALUE: if (object_type < PROPRIETARY_BACNET_OBJECT_TYPE) { fprintf(stream, "%s", - bactext_binary_present_value_name(value->type. - Enumerated)); + bactext_binary_present_value_name(value-> + type.Enumerated)); } else { fprintf(stream, "%lu", (unsigned long) value->type.Enumerated); @@ -1041,8 +1042,8 @@ bool bacapp_print_value( break; case PROP_SYSTEM_STATUS: fprintf(stream, "%s", - bactext_device_status_name(value-> - type.Enumerated)); + bactext_device_status_name(value->type. + Enumerated)); break; case PROP_SEGMENTATION_SUPPORTED: fprintf(stream, "%s", @@ -1413,8 +1414,8 @@ void testBACnetApplicationData_Safe( break; case BACNET_APPLICATION_TAG_CHARACTER_STRING: - characterstring_init_ansi(&input_value[i].type. - Character_String, "Hello There!"); + characterstring_init_ansi(&input_value[i]. + type.Character_String, "Hello There!"); break; case BACNET_APPLICATION_TAG_BIT_STRING: diff --git a/bacnet-stack/src/bacstr.c b/bacnet-stack/src/bacstr.c index a4473011..8988491c 100644 --- a/bacnet-stack/src/bacstr.c +++ b/bacnet-stack/src/bacstr.c @@ -468,7 +468,7 @@ X'20' - X'7E'.*/ bool characterstring_printable( BACNET_CHARACTER_STRING * char_string) { - bool status = false; /* return value */ + bool status = false; /* return value */ size_t i; /* counter */ if (char_string) { diff --git a/bacnet-stack/src/bactext.c b/bacnet-stack/src/bactext.c index 08d4494e..cebc5779 100644 --- a/bacnet-stack/src/bactext.c +++ b/bacnet-stack/src/bactext.c @@ -1995,7 +1995,8 @@ INDTEXT_DATA network_layer_msg_names[] = { , {NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK, "I-Am-Router-To-Network"} , - {NETWORK_MESSAGE_I_COULD_BE_ROUTER_TO_NETWORK, "I-Could-Be-Router-To-Network"} + {NETWORK_MESSAGE_I_COULD_BE_ROUTER_TO_NETWORK, + "I-Could-Be-Router-To-Network"} , {NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK, "Reject-Message-to-Network"} , @@ -2007,8 +2008,8 @@ INDTEXT_DATA network_layer_msg_names[] = { , {NETWORK_MESSAGE_INIT_RT_TABLE_ACK, "Initialize-Routing-Table-Ack"} , - {NETWORK_MESSAGE_ESTABLISH_CONNECTION_TO_NETWORK, "Est-Conn-Ntwk"} - , /* Terse since unused */ + {NETWORK_MESSAGE_ESTABLISH_CONNECTION_TO_NETWORK, "Est-Conn-Ntwk"} + , /* Terse since unused */ {NETWORK_MESSAGE_DISCONNECT_CONNECTION_TO_NETWORK, "Dsc-Conn-Ntwk"} , {0, NULL} @@ -2017,11 +2018,11 @@ INDTEXT_DATA network_layer_msg_names[] = { const char *bactext_network_layer_msg_name( unsigned index) { - if ( index <= 0x7F ) - return indtext_by_index_default(network_layer_msg_names, index, - ASHRAE_Reserved_String); - else if ( index < NETWORK_MESSAGE_INVALID ) - return Vendor_Proprietary_String; - else - return "Invalid Network Layer Message"; + if (index <= 0x7F) + return indtext_by_index_default(network_layer_msg_names, index, + ASHRAE_Reserved_String); + else if (index < NETWORK_MESSAGE_INVALID) + return Vendor_Proprietary_String; + else + return "Invalid Network Layer Message"; } diff --git a/bacnet-stack/src/bip.c b/bacnet-stack/src/bip.c index 0262043d..d4c40bc8 100644 --- a/bacnet-stack/src/bip.c +++ b/bacnet-stack/src/bip.c @@ -46,7 +46,7 @@ static int BIP_Socket = -1; /* port to use - stored in network byte order */ -static uint16_t BIP_Port = 0; /* this will force initialization in demos */ +static uint16_t BIP_Port = 0; /* this will force initialization in demos */ /* IP Address - stored in network byte order */ static struct in_addr BIP_Address; /* Broadcast Address - stored in network byte order */ @@ -92,8 +92,8 @@ void bip_cleanup( } void bip_set_addr( - uint32_t net_address) /* in network byte order */ -{ + uint32_t net_address) +{ /* in network byte order */ BIP_Address.s_addr = net_address; } @@ -105,8 +105,8 @@ uint32_t bip_get_addr( } void bip_set_broadcast_addr( - uint32_t net_address) /* in network byte order */ -{ + uint32_t net_address) +{ /* in network byte order */ BIP_Broadcast_Address.s_addr = net_address; } @@ -119,8 +119,8 @@ uint32_t bip_get_broadcast_addr( void bip_set_port( - uint16_t port) /* in network byte order */ -{ + uint16_t port) +{ /* in network byte order */ BIP_Port = port; } @@ -134,13 +134,13 @@ uint16_t bip_get_port( static int bip_decode_bip_address( BACNET_ADDRESS * bac_addr, struct in_addr *address, /* in network format */ - uint16_t * port) /* in network format */ -{ + uint16_t * port) +{ /* in network format */ int len = 0; if (bac_addr) { - memcpy (&address->s_addr, &bac_addr->mac[0], 4); - memcpy (port, &bac_addr->mac[4], 2); + memcpy(&address->s_addr, &bac_addr->mac[0], 4); + memcpy(port, &bac_addr->mac[4], 2); len = 6; } @@ -275,8 +275,8 @@ uint16_t bip_receive( } else { /* data in src->mac[] is in network format */ src->mac_len = 6; - memcpy (&src->mac[0], &sin.sin_addr.s_addr, 4); - memcpy (&src->mac[4], &sin.sin_port, 2); + memcpy(&src->mac[0], &sin.sin_addr.s_addr, 4); + memcpy(&src->mac[4], &sin.sin_port, 2); /* FIXME: check destination address */ /* see if it is broadcast or for us */ /* decode the length of the PDU - length is inclusive of BVLC */ @@ -308,8 +308,8 @@ uint16_t bip_receive( } } } else if (pdu[1] == BVLC_FORWARDED_NPDU) { - memcpy (&sin.sin_addr.s_addr, &pdu[4], 4); - memcpy (&sin.sin_port, &pdu[8], 2); + memcpy(&sin.sin_addr.s_addr, &pdu[4], 4); + memcpy(&sin.sin_port, &pdu[8], 2); if ((sin.sin_addr.s_addr == BIP_Address.s_addr) && (sin.sin_port == BIP_Port)) { /* ignore messages from me */ @@ -317,8 +317,8 @@ uint16_t bip_receive( } else { /* data in src->mac[] is in network format */ src->mac_len = 6; - memcpy (&src->mac[0], &sin.sin_addr.s_addr, 4); - memcpy (&src->mac[4], &sin.sin_port, 2); + memcpy(&src->mac[0], &sin.sin_addr.s_addr, 4); + memcpy(&src->mac[4], &sin.sin_port, 2); /* FIXME: check destination address */ /* see if it is broadcast or for us */ /* decode the length of the PDU - length is inclusive of BVLC */ @@ -351,11 +351,11 @@ void bip_get_my_address( int i = 0; if (my_address) { - my_address->mac_len = 6; - memcpy (&my_address->mac[0], &BIP_Address.s_addr, 4); - memcpy (&my_address->mac[4], &BIP_Port, 2); - my_address->net = 0; /* local only, no routing */ - my_address->len = 0; /* no SLEN */ + my_address->mac_len = 6; + memcpy(&my_address->mac[0], &BIP_Address.s_addr, 4); + memcpy(&my_address->mac[4], &BIP_Port, 2); + my_address->net = 0; /* local only, no routing */ + my_address->len = 0; /* no SLEN */ for (i = 0; i < MAX_MAC_LEN; i++) { /* no SADR */ my_address->adr[i] = 0; @@ -372,8 +372,8 @@ void bip_get_broadcast_address( if (dest) { dest->mac_len = 6; - memcpy (&dest->mac[0], &BIP_Broadcast_Address.s_addr, 4); - memcpy (&dest->mac[4], &BIP_Port, 2); + memcpy(&dest->mac[0], &BIP_Broadcast_Address.s_addr, 4); + memcpy(&dest->mac[4], &BIP_Port, 2); dest->net = BACNET_BROADCAST_NETWORK; dest->len = 0; /* no SLEN */ for (i = 0; i < MAX_MAC_LEN; i++) { diff --git a/bacnet-stack/src/bvlc.c b/bacnet-stack/src/bvlc.c index eae4f366..1d2352d1 100644 --- a/bacnet-stack/src/bvlc.c +++ b/bacnet-stack/src/bvlc.c @@ -55,11 +55,11 @@ typedef struct { /* true if valid entry - false if not */ bool valid; /* BACnet/IP address */ - struct in_addr dest_address; /* in network format */ + struct in_addr dest_address; /* in network format */ /* BACnet/IP port number - not always 47808=BAC0h */ - uint16_t dest_port; /* in network format */ + uint16_t dest_port; /* in network format */ /* Broadcast Distribution Mask */ - struct in_addr broadcast_mask; /* in tework format */ + struct in_addr broadcast_mask; /* in tework format */ } BBMD_TABLE_ENTRY; #define MAX_BBMD_ENTRIES 128 @@ -146,13 +146,13 @@ static void bvlc_internet_to_bacnet_address( static int bvlc_encode_bip_address( uint8_t * pdu, /* buffer to store encoding */ struct in_addr *address, /* in network format */ - uint16_t port) /* in network format */ -{ + uint16_t port) +{ /* in network format */ int len = 0; if (pdu) { - memcpy (&pdu[0], &address->s_addr, 4); - memcpy (&pdu[4], &port, 2); + memcpy(&pdu[0], &address->s_addr, 4); + memcpy(&pdu[4], &port, 2); len = 6; } @@ -162,8 +162,8 @@ static int bvlc_encode_bip_address( static int bvlc_decode_bip_address( uint8_t * pdu, /* buffer to extract encoded address */ struct in_addr *address, /* in network format */ - uint16_t * port) /* in network format */ -{ + uint16_t * port) +{ /* in network format */ int len = 0; if (pdu) { @@ -179,7 +179,7 @@ static int bvlc_decode_bip_address( static int bvlc_encode_address_entry( uint8_t * pdu, struct in_addr *address, - uint16_t port, /* in network byte order */ + uint16_t port, /* in network byte order */ struct in_addr *mask) { int len = 0; @@ -326,7 +326,8 @@ static int bvlc_encode_forwarded_npdu( length field itself, most significant octet first. */ encode_unsigned16(&pdu[2], (uint16_t) (4 + 6 + npdu_length)); len = 4; - len += bvlc_encode_bip_address(&pdu[len], &sin->sin_addr, sin->sin_port); + len += + bvlc_encode_bip_address(&pdu[len], &sin->sin_addr, sin->sin_port); for (i = 0; i < npdu_length; i++) { pdu[len] = npdu[i]; len++; @@ -440,8 +441,8 @@ static int bvlc_encode_read_fdt_ack( int bvlc_encode_delete_fdt_entry( uint8_t * pdu, uint32_t address, /* in network byte order */ - uint16_t port) /* in network byte order */ -{ + uint16_t port) +{ /* in network byte order */ int len = 0; if (pdu) { @@ -534,7 +535,7 @@ static bool bvlc_create_bdt( pdu_offset += 2; memcpy(&BBMD_Table[i].broadcast_mask.s_addr, &npdu[pdu_offset], 4); pdu_offset += 4; - npdu_length -= (4+2+4); + npdu_length -= (4 + 2 + 4); } else { BBMD_Table[i].valid = false; BBMD_Table[i].dest_address.s_addr = 0; @@ -655,8 +656,8 @@ static void bvlc_bdt_forward_npdu( mask in the BDT entry and logically ORing it with the BBMD address of the same entry. */ bip_dest.sin_addr.s_addr = - ((~BBMD_Table[i].broadcast_mask. - s_addr) | BBMD_Table[i].dest_address.s_addr); + ((~BBMD_Table[i].broadcast_mask.s_addr) | BBMD_Table[i]. + dest_address.s_addr); bip_dest.sin_port = BBMD_Table[i].dest_port; /* don't send to my broadcast address and same port */ if ((bip_dest.sin_addr.s_addr == bip_get_broadcast_addr()) @@ -733,8 +734,8 @@ static void bvlc_fdt_forward_npdu( } void bvlc_register_with_bbmd( - uint32_t bbmd_address, /* in network byte order */ - uint16_t bbmd_port, /* in network byte order */ + uint32_t bbmd_address, /* in network byte order */ + uint16_t bbmd_port, /* in network byte order */ uint16_t time_to_live_seconds) { uint8_t mtu[MAX_MPDU] = { 0 }; @@ -804,8 +805,7 @@ static bool bvlc_bdt_member_mask_is_unicast( for (i = 0; i < MAX_BBMD_ENTRIES; i++) { if (BBMD_Table[i].valid) { /* find the source address in the table */ - if ((BBMD_Table[i].dest_address.s_addr == - sin->sin_addr.s_addr) && + if ((BBMD_Table[i].dest_address.s_addr == sin->sin_addr.s_addr) && (BBMD_Table[i].dest_port == sin->sin_port)) { /* unicast mask? */ if (BBMD_Table[i].broadcast_mask.s_addr == 0xFFFFFFFFL) { diff --git a/bacnet-stack/src/debug.c b/bacnet-stack/src/debug.c index ab4fb642..430d7904 100644 --- a/bacnet-stack/src/debug.c +++ b/bacnet-stack/src/debug.c @@ -58,7 +58,8 @@ void debug_printf( #else void debug_printf( const char *format, - ...) { + ...) +{ format = format; } #endif diff --git a/bacnet-stack/src/event.c b/bacnet-stack/src/event.c index dee15389..b3556d8f 100644 --- a/bacnet-stack/src/event.c +++ b/bacnet-stack/src/event.c @@ -192,14 +192,14 @@ int event_notify_encode_service_request( len = encode_context_bitstring(&apdu[apdu_len], 0, - &data->notificationParams. - changeOfBitstring.referencedBitString); + &data->notificationParams.changeOfBitstring. + referencedBitString); apdu_len += len; len = encode_context_bitstring(&apdu[apdu_len], 1, - &data->notificationParams. - changeOfBitstring.statusFlags); + &data->notificationParams.changeOfBitstring. + statusFlags); apdu_len += len; len = encode_closing_tag(&apdu[apdu_len], 0); @@ -223,8 +223,8 @@ int event_notify_encode_service_request( len = encode_context_bitstring(&apdu[apdu_len], 1, - &data->notificationParams. - changeOfState.statusFlags); + &data->notificationParams.changeOfState. + statusFlags); apdu_len += len; len = encode_closing_tag(&apdu[apdu_len], 1); @@ -242,8 +242,8 @@ int event_notify_encode_service_request( case CHANGE_OF_VALUE_REAL: len = encode_context_real(&apdu[apdu_len], 1, - data->notificationParams. - changeOfValue.newValue.changeValue); + data->notificationParams.changeOfValue. + newValue.changeValue); apdu_len += len; break; @@ -251,8 +251,8 @@ int event_notify_encode_service_request( len = encode_context_bitstring(&apdu[apdu_len], 0, - &data->notificationParams. - changeOfValue.newValue.changedBits); + &data->notificationParams.changeOfValue. + newValue.changedBits); apdu_len += len; break; @@ -265,8 +265,8 @@ int event_notify_encode_service_request( len = encode_context_bitstring(&apdu[apdu_len], 1, - &data->notificationParams. - changeOfValue.statusFlags); + &data->notificationParams.changeOfValue. + statusFlags); apdu_len += len; len = encode_closing_tag(&apdu[apdu_len], 2); @@ -280,20 +280,20 @@ int event_notify_encode_service_request( len = encode_context_real(&apdu[apdu_len], 0, - data->notificationParams. - floatingLimit.referenceValue); + data->notificationParams.floatingLimit. + referenceValue); apdu_len += len; len = encode_context_bitstring(&apdu[apdu_len], 1, - &data->notificationParams. - floatingLimit.statusFlags); + &data->notificationParams.floatingLimit. + statusFlags); apdu_len += len; len = encode_context_real(&apdu[apdu_len], 2, - data->notificationParams. - floatingLimit.setPointValue); + data->notificationParams.floatingLimit. + setPointValue); apdu_len += len; len = @@ -312,8 +312,8 @@ int event_notify_encode_service_request( len = encode_context_real(&apdu[apdu_len], 0, - data->notificationParams. - outOfRange.exceedingValue); + data->notificationParams.outOfRange. + exceedingValue); apdu_len += len; len = @@ -341,26 +341,26 @@ int event_notify_encode_service_request( len = encode_context_enumerated(&apdu[apdu_len], 0, - data->notificationParams. - changeOfLifeSafety.newState); + data->notificationParams.changeOfLifeSafety. + newState); apdu_len += len; len = encode_context_enumerated(&apdu[apdu_len], 1, - data->notificationParams. - changeOfLifeSafety.newMode); + data->notificationParams.changeOfLifeSafety. + newMode); apdu_len += len; len = encode_context_bitstring(&apdu[apdu_len], 2, - &data->notificationParams. - changeOfLifeSafety.statusFlags); + &data->notificationParams.changeOfLifeSafety. + statusFlags); apdu_len += len; len = encode_context_enumerated(&apdu[apdu_len], 3, - data->notificationParams. - changeOfLifeSafety.operationExpected); + data->notificationParams.changeOfLifeSafety. + operationExpected); apdu_len += len; len = encode_closing_tag(&apdu[apdu_len], 8); @@ -374,20 +374,20 @@ int event_notify_encode_service_request( len = bacapp_encode_context_device_obj_property_ref(&apdu [apdu_len], 0, - &data->notificationParams. - bufferReady.bufferProperty); + &data->notificationParams.bufferReady. + bufferProperty); apdu_len += len; len = encode_context_unsigned(&apdu[apdu_len], 1, - data->notificationParams. - bufferReady.previousNotification); + data->notificationParams.bufferReady. + previousNotification); apdu_len += len; len = encode_context_unsigned(&apdu[apdu_len], 2, - data->notificationParams. - bufferReady.currentNotification); + data->notificationParams.bufferReady. + currentNotification); apdu_len += len; len = encode_closing_tag(&apdu[apdu_len], 10); @@ -399,20 +399,20 @@ int event_notify_encode_service_request( len = encode_context_unsigned(&apdu[apdu_len], 0, - data->notificationParams. - unsignedRange.exceedingValue); + data->notificationParams.unsignedRange. + exceedingValue); apdu_len += len; len = encode_context_bitstring(&apdu[apdu_len], 1, - &data->notificationParams. - unsignedRange.statusFlags); + &data->notificationParams.unsignedRange. + statusFlags); apdu_len += len; len = encode_context_unsigned(&apdu[apdu_len], 2, - data->notificationParams. - unsignedRange.exceededLimit); + data->notificationParams.unsignedRange. + exceededLimit); apdu_len += len; len = encode_closing_tag(&apdu[apdu_len], 11); @@ -595,18 +595,16 @@ int event_notify_decode_service_request( case EVENT_CHANGE_OF_BITSTRING: if (-1 == (section_length = decode_context_bitstring(&apdu[len], 0, - &data-> - notificationParams.changeOfBitstring. - referencedBitString))) { + &data->notificationParams. + changeOfBitstring.referencedBitString))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_bitstring(&apdu[len], 1, - &data-> - notificationParams.changeOfBitstring. - statusFlags))) { + &data->notificationParams. + changeOfBitstring.statusFlags))) { return -1; } len += section_length; @@ -617,16 +615,16 @@ int event_notify_decode_service_request( if (-1 == (section_length = bacapp_decode_context_property_state(&apdu [len], 0, - &data->notificationParams. - changeOfState.newState))) { + &data->notificationParams.changeOfState. + newState))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_bitstring(&apdu[len], 1, - &data->notificationParams. - changeOfState.statusFlags))) { + &data->notificationParams.changeOfState. + statusFlags))) { return -1; } len += section_length; @@ -644,9 +642,8 @@ int event_notify_decode_service_request( if (-1 == (section_length = decode_context_bitstring(&apdu[len], 0, - &data-> - notificationParams.changeOfValue. - newValue.changedBits))) { + &data->notificationParams. + changeOfValue.newValue.changedBits))) { return -1; } @@ -657,9 +654,8 @@ int event_notify_decode_service_request( CHANGE_OF_VALUE_REAL)) { if (-1 == (section_length = decode_context_real(&apdu[len], 1, - &data-> - notificationParams.changeOfValue. - newValue.changeValue))) { + &data->notificationParams. + changeOfValue.newValue.changeValue))) { return -1; } @@ -677,8 +673,8 @@ int event_notify_decode_service_request( if (-1 == (section_length = decode_context_bitstring(&apdu[len], 1, - &data->notificationParams. - changeOfValue.statusFlags))) { + &data->notificationParams.changeOfValue. + statusFlags))) { return -1; } len += section_length; @@ -687,31 +683,31 @@ int event_notify_decode_service_request( case EVENT_FLOATING_LIMIT: if (-1 == (section_length = decode_context_real(&apdu[len], 0, - &data->notificationParams. - floatingLimit.referenceValue))) { + &data->notificationParams.floatingLimit. + referenceValue))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_bitstring(&apdu[len], 1, - &data->notificationParams. - floatingLimit.statusFlags))) { + &data->notificationParams.floatingLimit. + statusFlags))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_real(&apdu[len], 2, - &data->notificationParams. - floatingLimit.setPointValue))) { + &data->notificationParams.floatingLimit. + setPointValue))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_real(&apdu[len], 3, - &data->notificationParams. - floatingLimit.errorLimit))) { + &data->notificationParams.floatingLimit. + errorLimit))) { return -1; } len += section_length; @@ -720,31 +716,31 @@ int event_notify_decode_service_request( case EVENT_OUT_OF_RANGE: if (-1 == (section_length = decode_context_real(&apdu[len], 0, - &data->notificationParams. - outOfRange.exceedingValue))) { + &data->notificationParams.outOfRange. + exceedingValue))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_bitstring(&apdu[len], 1, - &data->notificationParams. - outOfRange.statusFlags))) { + &data->notificationParams.outOfRange. + statusFlags))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_real(&apdu[len], 2, - &data->notificationParams. - outOfRange.deadband))) { + &data->notificationParams.outOfRange. + deadband))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_real(&apdu[len], 3, - &data->notificationParams. - outOfRange.exceededLimit))) { + &data->notificationParams.outOfRange. + exceededLimit))) { return -1; } len += section_length; @@ -772,9 +768,8 @@ int event_notify_decode_service_request( if (-1 == (section_length = decode_context_bitstring(&apdu[len], 2, - &data-> - notificationParams.changeOfLifeSafety. - statusFlags))) { + &data->notificationParams. + changeOfLifeSafety.statusFlags))) { return -1; } len += section_length; @@ -784,8 +779,8 @@ int event_notify_decode_service_request( &value))) { return -1; } - data->notificationParams. - changeOfLifeSafety.operationExpected = + data->notificationParams.changeOfLifeSafety. + operationExpected = (BACNET_LIFE_SAFETY_OPERATION) value; len += section_length; break; @@ -794,24 +789,24 @@ int event_notify_decode_service_request( if (-1 == (section_length = bacapp_decode_context_device_obj_property_ref (&apdu[len], 0, - &data->notificationParams. - bufferReady.bufferProperty))) { + &data->notificationParams.bufferReady. + bufferProperty))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_unsigned(&apdu[len], 1, - &data->notificationParams. - bufferReady.previousNotification))) { + &data->notificationParams.bufferReady. + previousNotification))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_unsigned(&apdu[len], 2, - &data->notificationParams. - bufferReady.currentNotification))) { + &data->notificationParams.bufferReady. + currentNotification))) { return -1; } len += section_length; @@ -820,24 +815,24 @@ int event_notify_decode_service_request( case EVENT_UNSIGNED_RANGE: if (-1 == (section_length = decode_context_unsigned(&apdu[len], 0, - &data->notificationParams. - unsignedRange.exceedingValue))) { + &data->notificationParams.unsignedRange. + exceedingValue))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_bitstring(&apdu[len], 1, - &data->notificationParams. - unsignedRange.statusFlags))) { + &data->notificationParams.unsignedRange. + statusFlags))) { return -1; } len += section_length; if (-1 == (section_length = decode_context_unsigned(&apdu[len], 2, - &data->notificationParams. - unsignedRange.exceededLimit))) { + &data->notificationParams.unsignedRange. + exceededLimit))) { return -1; } len += section_length; @@ -1096,16 +1091,16 @@ void testEventEventState( data.eventType = EVENT_CHANGE_OF_BITSTRING; - bitstring_init(&data.notificationParams. - changeOfBitstring.referencedBitString); - bitstring_set_bit(&data.notificationParams. - changeOfBitstring.referencedBitString, 0, true); - bitstring_set_bit(&data.notificationParams. - changeOfBitstring.referencedBitString, 1, false); - bitstring_set_bit(&data.notificationParams. - changeOfBitstring.referencedBitString, 2, true); - bitstring_set_bit(&data.notificationParams. - changeOfBitstring.referencedBitString, 2, false); + bitstring_init(&data.notificationParams.changeOfBitstring. + referencedBitString); + bitstring_set_bit(&data.notificationParams.changeOfBitstring. + referencedBitString, 0, true); + bitstring_set_bit(&data.notificationParams.changeOfBitstring. + referencedBitString, 1, false); + bitstring_set_bit(&data.notificationParams.changeOfBitstring. + referencedBitString, 2, true); + bitstring_set_bit(&data.notificationParams.changeOfBitstring. + referencedBitString, 2, false); bitstring_init(&data.notificationParams.changeOfBitstring.statusFlags); @@ -1191,16 +1186,16 @@ void testEventEventState( data.notificationParams.changeOfValue.tag = CHANGE_OF_VALUE_BITS; - bitstring_init(&data.notificationParams.changeOfValue. - newValue.changedBits); - bitstring_set_bit(&data.notificationParams.changeOfValue. - newValue.changedBits, 0, true); - bitstring_set_bit(&data.notificationParams.changeOfValue. - newValue.changedBits, 1, false); - bitstring_set_bit(&data.notificationParams.changeOfValue. - newValue.changedBits, 2, false); - bitstring_set_bit(&data.notificationParams.changeOfValue. - newValue.changedBits, 3, false); + bitstring_init(&data.notificationParams.changeOfValue.newValue. + changedBits); + bitstring_set_bit(&data.notificationParams.changeOfValue.newValue. + changedBits, 0, true); + bitstring_set_bit(&data.notificationParams.changeOfValue.newValue. + changedBits, 1, false); + bitstring_set_bit(&data.notificationParams.changeOfValue.newValue. + changedBits, 2, false); + bitstring_set_bit(&data.notificationParams.changeOfValue.newValue. + changedBits, 3, false); memset(buffer, 0, MAX_APDU); inLen = event_notify_encode_service_request(&buffer[0], &data); @@ -1440,12 +1435,12 @@ void testEventEventState( data.notificationParams.bufferReady.currentNotification = 2345; data.notificationParams.bufferReady.bufferProperty.deviceIndentifier.type = OBJECT_DEVICE; - data.notificationParams.bufferReady.bufferProperty. - deviceIndentifier.instance = 500; + data.notificationParams.bufferReady.bufferProperty.deviceIndentifier. + instance = 500; data.notificationParams.bufferReady.bufferProperty.objectIdentifier.type = OBJECT_ANALOG_INPUT; - data.notificationParams.bufferReady.bufferProperty. - objectIdentifier.instance = 100; + data.notificationParams.bufferReady.bufferProperty.objectIdentifier. + instance = 100; data.notificationParams.bufferReady.bufferProperty.propertyIdentifier = PROP_PRESENT_VALUE; data.notificationParams.bufferReady.bufferProperty.arrayIndex = 0; @@ -1470,34 +1465,34 @@ void testEventEventState( ct_test(pTest, - data.notificationParams.bufferReady.bufferProperty. - deviceIndentifier.type == - data2.notificationParams.bufferReady.bufferProperty. - deviceIndentifier.type); + data.notificationParams.bufferReady.bufferProperty.deviceIndentifier. + type == + data2.notificationParams.bufferReady.bufferProperty.deviceIndentifier. + type); + + ct_test(pTest, + data.notificationParams.bufferReady.bufferProperty.deviceIndentifier. + instance == + data2.notificationParams.bufferReady.bufferProperty.deviceIndentifier. + instance); + + ct_test(pTest, + data.notificationParams.bufferReady.bufferProperty.objectIdentifier. + instance == + data2.notificationParams.bufferReady.bufferProperty.objectIdentifier. + instance); + + ct_test(pTest, + data.notificationParams.bufferReady.bufferProperty.objectIdentifier. + type == + data2.notificationParams.bufferReady.bufferProperty.objectIdentifier. + type); ct_test(pTest, data.notificationParams.bufferReady.bufferProperty. - deviceIndentifier.instance == + propertyIdentifier == data2.notificationParams.bufferReady.bufferProperty. - deviceIndentifier.instance); - - ct_test(pTest, - data.notificationParams.bufferReady.bufferProperty. - objectIdentifier.instance == - data2.notificationParams.bufferReady.bufferProperty. - objectIdentifier.instance); - - ct_test(pTest, - data.notificationParams.bufferReady.bufferProperty. - objectIdentifier.type == - data2.notificationParams.bufferReady.bufferProperty. - objectIdentifier.type); - - ct_test(pTest, - data.notificationParams.bufferReady. - bufferProperty.propertyIdentifier == - data2.notificationParams.bufferReady. - bufferProperty.propertyIdentifier); + propertyIdentifier); ct_test(pTest, data.notificationParams.bufferReady.bufferProperty.arrayIndex == diff --git a/bacnet-stack/src/mstp.c b/bacnet-stack/src/mstp.c index e5187017..b30b25b2 100644 --- a/bacnet-stack/src/mstp.c +++ b/bacnet-stack/src/mstp.c @@ -799,7 +799,7 @@ bool MSTP_Master_Node_FSM( (mstp_port->Next_Station == mstp_port->This_Station)) { /* NextStationUnknown - added in Addendum 135-2008v-1 */ /* then the next station to which the token - should be sent is unknown - so PollForMaster */ + should be sent is unknown - so PollForMaster */ mstp_port->Poll_Station = next_this_station; MSTP_Create_And_Send_Frame(mstp_port, FRAME_TYPE_POLL_FOR_MASTER, mstp_port->Poll_Station, diff --git a/bacnet-stack/src/npdu.c b/bacnet-stack/src/npdu.c index a6395c61..15d0967e 100644 --- a/bacnet-stack/src/npdu.c +++ b/bacnet-stack/src/npdu.c @@ -194,7 +194,7 @@ int npdu_encode_pdu( } } } - if (src && src->net && src->len) { /* Only insert if valid */ + if (src && src->net && src->len) { /* Only insert if valid */ len += encode_unsigned16(&npdu[len], src->net); npdu[len++] = src->len; /* SLEN = 0 denotes broadcast MAC SADR and SADR field is absent */ @@ -209,7 +209,7 @@ int npdu_encode_pdu( /* destined for a remote network, i.e., if DNET is present. */ /* This is a one-octet field that is initialized to a value of 0xff. */ if (dest && dest->net) { - npdu[len] = npdu_data->hop_count -1; + npdu[len] = npdu_data->hop_count - 1; len++; } if (npdu_data->network_layer_message) {