X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f555ad7ced743a19eb1eefaf5eaf536fcbe58d80..2e76ad721e494f3a14ece73100ea9a2144c6fe8e:/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
index 3c5cf47d5..0767127f2 100644
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
@@ -53,19 +53,19 @@ TMC_Capabilities_t Capabilities =
 	};
 
 /** Current TMC control request that is being processed */
-uint8_t RequestInProgress = 0;
+static uint8_t RequestInProgress = 0;
 
 /** Stream callback abort flag for bulk IN data */
-bool IsTMCBulkINReset = false;
+static bool IsTMCBulkINReset = false;
 
 /** Stream callback abort flag for bulk OUT data */
-bool IsTMCBulkOUTReset = false;
+static bool IsTMCBulkOUTReset = false;
 
 /** Last used tag value for data transfers */
-uint8_t CurrentTransferTag = 0;
+static uint8_t CurrentTransferTag = 0;
 
-/** Length of last data transfer, for reporting to the host in case an in-progress tranfer is aborted */
-uint32_t LastTransferLength = 0;
+/** Length of last data transfer, for reporting to the host in case an in-progress transfer is aborted */
+static uint32_t LastTransferLength = 0;
 
 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
@@ -169,7 +169,7 @@ void EVENT_USB_Device_ControlRequest(void)
 				Endpoint_ClearSETUP();
 				
 				/* Write the request response byte */
-				Endpoint_Write_Byte(TMCRequestStatus);
+				Endpoint_Write_8(TMCRequestStatus);
 
 				Endpoint_ClearIN();
 				Endpoint_ClearStatusStage();
@@ -190,9 +190,9 @@ void EVENT_USB_Device_ControlRequest(void)
 				Endpoint_ClearSETUP();
 								
 				/* Write the request response bytes */
-				Endpoint_Write_Byte(TMCRequestStatus);
-				Endpoint_Write_Word_LE(0);
-				Endpoint_Write_DWord_LE(LastTransferLength);
+				Endpoint_Write_8(TMCRequestStatus);
+				Endpoint_Write_16_LE(0);
+				Endpoint_Write_32_LE(LastTransferLength);
 
 				Endpoint_ClearIN();
 				Endpoint_ClearStatusStage();				
@@ -223,8 +223,8 @@ void EVENT_USB_Device_ControlRequest(void)
 				Endpoint_ClearSETUP();
 				
 				/* Write the request response bytes */
-				Endpoint_Write_Byte(TMCRequestStatus);
-				Endpoint_Write_Byte(CurrentTransferTag);
+				Endpoint_Write_8(TMCRequestStatus);
+				Endpoint_Write_8(CurrentTransferTag);
 
 				Endpoint_ClearIN();
 				Endpoint_ClearStatusStage();
@@ -245,9 +245,9 @@ void EVENT_USB_Device_ControlRequest(void)
 				Endpoint_ClearSETUP();
 								
 				/* Write the request response bytes */
-				Endpoint_Write_Byte(TMCRequestStatus);
-				Endpoint_Write_Word_LE(0);
-				Endpoint_Write_DWord_LE(LastTransferLength);
+				Endpoint_Write_8(TMCRequestStatus);
+				Endpoint_Write_16_LE(0);
+				Endpoint_Write_32_LE(LastTransferLength);
 
 				Endpoint_ClearIN();
 				Endpoint_ClearStatusStage();
@@ -260,7 +260,7 @@ void EVENT_USB_Device_ControlRequest(void)
 				/* Check that no split transaction is already in progress */
 				if (RequestInProgress != 0)
 				{
-					Endpoint_Write_Byte(TMC_STATUS_SPLIT_IN_PROGRESS);				
+					Endpoint_Write_8(TMC_STATUS_SPLIT_IN_PROGRESS);				
 				}
 				else
 				{
@@ -275,7 +275,7 @@ void EVENT_USB_Device_ControlRequest(void)
 				Endpoint_ClearSETUP();
 				
 				/* Write the request response byte */
-				Endpoint_Write_Byte(TMCRequestStatus);
+				Endpoint_Write_8(TMCRequestStatus);
 
 				Endpoint_ClearIN();
 				Endpoint_ClearStatusStage();
@@ -296,8 +296,8 @@ void EVENT_USB_Device_ControlRequest(void)
 				Endpoint_ClearSETUP();
 
 				/* Write the request response bytes */
-				Endpoint_Write_Byte(TMCRequestStatus);
-				Endpoint_Write_Byte(0);
+				Endpoint_Write_8(TMCRequestStatus);
+				Endpoint_Write_8(0);
 				
 				Endpoint_ClearIN();
 				Endpoint_ClearStatusStage();