Kaynağa Gözat

Merge pull request #81 from CapXilinx/master

Fixes #80 fixes const position in function arguments, renames parameter class to cip_class
Martin Melik-Merkumians 9 yıl önce
ebeveyn
işleme
2d4f3bbad2

+ 1 - 1
source/src/cip/cipcommon.h

@@ -31,7 +31,7 @@ extern EipUint8 g_message_data_reply_buffer[];
  *     - kEipStatusOk ... no reply to send back
  *     - kEipStatusError ... error
  */
-EipStatus NotifyClass(const CipClass *RESTRICT const class,
+EipStatus NotifyClass(const CipClass *RESTRICT const cip_class,
                       CipMessageRouterRequest *const message_router_request,
                       CipMessageRouterResponse *const message_router_response,
                       struct sockaddr *originator_address);

+ 3 - 3
source/src/cip/cipconnectionmanager.c

@@ -50,7 +50,7 @@ typedef struct {
 
 /* Connection Object functions */
 ProductionTrigger GetProductionTrigger(
-  const ConnectionObject const *connection_object) {
+  const ConnectionObject *const connection_object) {
   const unsigned int ProductionTriggerMask = 0x70;
 
   switch (connection_object->transport_type_class_trigger
@@ -86,7 +86,7 @@ void SetProductionTrigger(const enum ProductionTrigger production_trigger,
 }
 
 CipUint GetProductionInhibitTime(
-  const ConnectionObject const *connection_object) {
+  const ConnectionObject *const connection_object) {
   return connection_object->production_inhibit_time;
 }
 
@@ -96,7 +96,7 @@ void SetProductionInhibitTime(const EipUint16 production_inhibit_time,
 }
 
 CipUdint GetTargetToOriginatorRequestedPackedInterval(
-  const ConnectionObject const *connection_object) {
+  const ConnectionObject *const connection_object) {
   return connection_object->t_to_o_requested_packet_interval;
 }
 

+ 3 - 3
source/src/cip/cipconnectionmanager.h

@@ -150,18 +150,18 @@ typedef enum ProductionTrigger {
 } ProductionTrigger;
 
 ProductionTrigger GetProductionTrigger(
-  const ConnectionObject const *connection_object);
+  const ConnectionObject *const connection_object);
 
 void SetProductionTrigger(const ProductionTrigger production_trigger,
                           ConnectionObject *connection_object);
 
-CipUint GetProductionInhibitTime(const ConnectionObject const *connection_object);
+CipUint GetProductionInhibitTime(const ConnectionObject *const connection_object);
 
 void SetProductionInhibitTime(const EipUint16 production_inhibit_time,
                               ConnectionObject *const connection_object);
 
 CipUdint GetTargetToOriginatorRequestedPackedInterval(
-  const ConnectionObject const *connection_object);
+  const ConnectionObject *const connection_object);
 
 /** @brief macros for comparing sequence numbers according to CIP spec vol
  * 2 3-4.2 for int type variables