}\r
 \r
                        /* Write one 16-byte chunk of data to the Dataflash */\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
+                       Dataflash_SendByte(Endpoint_Read_8());\r
 \r
                        /* Increment the Dataflash page 16 byte block counter */\r
                        CurrDFPageByteDiv16++;\r
                          return;\r
                }\r
 \r
-               /* Decrement the blocks remaining counter and reset the sub block counter */\r
+               /* Decrement the blocks remaining counter */\r
                TotalBlocks--;\r
        }\r
 \r
                        }\r
 \r
                        /* Read one 16-byte chunk of data from the Dataflash */\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
+                       Endpoint_Write_8(Dataflash_ReceiveByte());\r
 \r
                        /* Increment the Dataflash page 16 byte block counter */\r
                        CurrDFPageByteDiv16++;\r
                        BytesInBlockDiv16++;\r
                }\r
 \r
-               /* Decrement the blocks remaining counter and reset the sub block counter */\r
+               /* Decrement the blocks remaining counter */\r
                TotalBlocks--;\r
        }\r
 \r