Rename reserved members of all structs so that they are uniformly named across all...

[pub/USBasp.git] / Demos / Device / Incomplete / TestAndMeasurement / TestAndMeasurement.h

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
index 53f65a1..2d5f82f 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
@@ -65,18 +65,23 @@
                #define Req_GetCapabilities                   0x07\r
                #define Req_IndicatorPulse                    0x40\r
                \r
                #define Req_GetCapabilities                   0x07\r
                #define Req_IndicatorPulse                    0x40\r
                \r

-               #define TMC_REQUEST_STATUS_SUCCESS                   0x01\r
-               #define TMC_REQUEST_STATUS_PENDING                   0x02\r
-               #define TMC_REQUEST_STATUS_FAILED                    0x80\r
-               #define TMC_REQUEST_STATUS_TRANSFER_NOT_IN_PROGRESS  0x81\r
-               #define TMC_REQUEST_STATUS_SPLIT_NOT_IN_PROGRESS     0x82\r
-               #define TMC_REQUEST_STATUS_SPLIT_IN_PROGRESS         0x83\r
+               #define TMC_STATUS_SUCCESS                    0x01\r
+               #define TMC_STATUS_PENDING                    0x02\r
+               #define TMC_STATUS_FAILED                     0x80\r
+               #define TMC_STATUS_TRANSFER_NOT_IN_PROGRESS   0x81\r
+               #define TMC_STATUS_SPLIT_NOT_IN_PROGRESS      0x82\r
+               #define TMC_STATUS_SPLIT_IN_PROGRESS          0x83\r
+               \r
+               #define TMC_MESSAGEID_DEV_DEP_MSG_OUT         0x01\r
+               #define TMC_MESSAGEID_DEV_DEP_MSG_IN          0x02\r
+               #define TMC_MESSAGEID_DEV_VENDOR_OUT          0x7E\r
+               #define TMC_MESSAGEID_DEV_VENDOR_IN           0x7F\r

 \r
        /* Type Defines */\r
                typedef struct\r
                {\r
                        uint8_t  Status;\r
 \r
        /* Type Defines */\r
                typedef struct\r
                {\r
                        uint8_t  Status;\r

-                       uint8_t  _RESERVED1;\r
+                       uint8_t  Reserved;\r

 \r
                        uint16_t TMCVersion;\r
                        \r
 \r
                        uint16_t TMCVersion;\r
                        \r


@@ -85,18 +90,26 @@
                                unsigned char ListenOnly             : 1;\r
                                unsigned char TalkOnly               : 1;\r
                                unsigned char PulseIndicateSupported : 1;\r
                                unsigned char ListenOnly             : 1;\r
                                unsigned char TalkOnly               : 1;\r
                                unsigned char PulseIndicateSupported : 1;\r

-                               unsigned char _RESERVED              : 5;\r
+                               unsigned char Reserved               : 5;\r

                        } Interface;\r
                        \r
                        struct\r
                        {\r
                                unsigned char SupportsAbortINOnMatch : 1;\r
                        } Interface;\r
                        \r
                        struct\r
                        {\r
                                unsigned char SupportsAbortINOnMatch : 1;\r

-                               unsigned char _RESERVED              : 7;\r
+                               unsigned char Reserved               : 7;\r

                        } Device;\r
                        \r
                        } Device;\r
                        \r

-                       uint8_t _RESERVED2[6];\r
-                       uint8_t _RESERVED3[12];                 \r
+                       uint8_t Reserved2[6];\r
+                       uint8_t Reserved3[12];                  \r

                } TMC_Capabilities_t;\r
                } TMC_Capabilities_t;\r

+\r
+               typedef struct\r
+               {\r
+                       uint8_t MessageID;\r
+                       uint8_t Tag;\r
+                       uint8_t InverseTag;\r
+                       uint8_t Reserved;\r
+               } TMC_MessageHeader_t;\r

                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r