aboutsummaryrefslogtreecommitdiff
path: root/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2010-07-27 11:26:47 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2010-07-27 11:26:47 +0000
commit822207a6d10c1583f2ef544a28805dac3c220639 (patch)
tree51785a3fbce297964c4268080e09b237098d2a79 /Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
parent2af8c71abc9f656a23dd2326321868223ab2cc5e (diff)
Move over message ID specific header data to unions inside the standard TMC header structure, so that all header data is read in one chunk in the incomplete TMC demo.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1412 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h')
-rw-r--r--Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h35
1 files changed, 30 insertions, 5 deletions
diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
index 2d5f82f4..191eb40a 100644
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
@@ -102,15 +102,40 @@
uint8_t Reserved2[6];
uint8_t Reserved3[12];
} TMC_Capabilities_t;
+
+ typedef struct
+ {
+ unsigned char LastMessageTransaction : 1;
+ unsigned char Reserved : 7;
+
+ uint8_t Reserved2[3];
+ } TMC_DevOUTMessageHeader_t;
typedef struct
{
- uint8_t MessageID;
- uint8_t Tag;
- uint8_t InverseTag;
- uint8_t Reserved;
+ unsigned char TermCharEnabled : 1;
+ unsigned char Reserved : 7;
+
+ uint8_t TermChar;
+ uint8_t Reserved2[2];
+ } TMC_DevINMessageHeader_t;
+
+ typedef struct
+ {
+ uint8_t MessageID;
+ uint8_t Tag;
+ uint8_t InverseTag;
+ uint8_t Reserved;
+ uint32_t TransferSize;
+
+ union
+ {
+ TMC_DevOUTMessageHeader_t DeviceOUT;
+ TMC_DevINMessageHeader_t DeviceIN;
+ uint32_t VendorSpecific;
+ } MessageIDSpecific;
} TMC_MessageHeader_t;
-
+
/* Function Prototypes: */
void SetupHardware(void);
void TMC_Task(void);