Small change to test commit name

diff --git a/include/rm_pvt.h b/include/rm_pvt.h
index 996a5ef006a1da92b1a36eae3a82ecfb5ee94344..3b2ef1fb5778ec97d9ae27d7a7292deb239172c9 100644 (file)
--- a/include/rm_pvt.h
+++ b/include/rm_pvt.h
@@ -145,25 +145,6 @@ typedef struct {
     Rm_TransRouteMapNode *nextNode;
 } Rm_TransRouteMapNode;
 
-/**
- * @brief RM transaction queue linked list node
- */
-typedef struct {
-    /** The transaction ID for the transaction awaiting a response */
-    uint32_t transactionId;
-    /** The originating transaction ID.  Maps a transaction created in 
-     *  response to a request received.  */
-    uint32_t originatingTransactionId;
-    /** The transport handle that the transaction was received on.  Used 
-     *  to provide a RM response to the right requesting RM instance */
-    Rm_TransportHandle transportHandle;
-    /** The callback function associated with the transaction ID.  Will
-     *  be called when a response is received matching the transaction ID. */
-    void *transactionCallback;
-    /** Link to the next transaction queue entry */
-    Rm_TransactionQueueEntry *nextEntry;
-} Rm_TransactionQueueEntry;
-
 /**
  * @brief RM protocol commands.  The first N commands should be synchronized with
  *        the Rm_ServiceType enum in rm_service.h
@@ -226,15 +207,17 @@ typedef struct {
 } Rm_ResourceInfo;
 
 /**
- * @brief RM transaction is the internalized version of service requests received 
+ * @brief RM transactions are the internalized version of service requests received 
  *        from components and RM commands received from other RM instances.
+ *        Transactions that cannot immediately be serviced are placed in the RM
+ *        instance's transaction queue.
  */
 typedef struct {
     /** Transaction type */
     Rm_Command command;
     /** ID of transaction.  Maps to the RM protocol packet ID when forwarding
      *  RM requests or received RM responses. */
-    uint32_t pktId;
+    uint32_t transactionId;
     /** Transaction's associated callback function is the transaction originated
      *  from a registered component */
     void *callback;
@@ -243,7 +226,7 @@ typedef struct {
     uint32_t details;
     /** Transport the transaction was received on.  Stored in order to provide
      *  responses to received RM packets */
-    Rm_TransportHandle receivedTransport;
+    Rm_TransportHandle transportReceivedOn;
     /** Transaction details */
     union {
         /** If the command has to do with resources these fields
@@ -252,6 +235,8 @@ typedef struct {
         /** Pointer to policy data if the command has to do with policies */
         char *policyData;
     } u;
+    /** Link to the next transaction in the queue */
+    Rm_Transaction *nextTransaction;    
 } Rm_Transaction;
 
 /**