Renamed all low level Endpoint_Read_*, Endpoint_Write_* and Endpoint_Discard_* functions to use the number of bits instead of a symbolic size (Byte, Word, DWord) so that the function names are applicable and correct across all architectures.
Renamed all low level Pipe_Read_*, Pipe_Write_* and Pipe_Discard_* functions to use the number of bits instead of a symbolic size (Byte, Word, DWord) so that the function names are applicable and correct across all architectures.
This commit is contained in:
parent
2efa79d3ec
commit
899df7d331
46 changed files with 679 additions and 665 deletions
|
@ -127,22 +127,22 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress,
|
|||
}
|
||||
|
||||
/* Write one 16-byte chunk of data to the Dataflash */
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_Byte());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
Dataflash_SendByte(Endpoint_Read_8());
|
||||
|
||||
/* Increment the Dataflash page 16 byte block counter */
|
||||
CurrDFPageByteDiv16++;
|
||||
|
@ -240,22 +240,22 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress,
|
|||
}
|
||||
|
||||
/* Read one 16-byte chunk of data from the Dataflash */
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_Byte(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
Endpoint_Write_8(Dataflash_ReceiveByte());
|
||||
|
||||
/* Increment the Dataflash page 16 byte block counter */
|
||||
CurrDFPageByteDiv16++;
|
||||
|
|
|
@ -212,10 +212,10 @@ static bool SCSI_Command_Request_Sense(void)
|
|||
static bool SCSI_Command_Read_Capacity_10(void)
|
||||
{
|
||||
/* Send the total number of logical blocks in the current LUN */
|
||||
Endpoint_Write_DWord_BE(LUN_MEDIA_BLOCKS - 1);
|
||||
Endpoint_Write_32_BE(LUN_MEDIA_BLOCKS - 1);
|
||||
|
||||
/* Send the logical block size of the device (must be 512 bytes) */
|
||||
Endpoint_Write_DWord_BE(VIRTUAL_MEMORY_BLOCK_SIZE);
|
||||
Endpoint_Write_32_BE(VIRTUAL_MEMORY_BLOCK_SIZE);
|
||||
|
||||
/* Check if the current command is being aborted by the host */
|
||||
if (IsMassStoreReset)
|
||||
|
@ -329,10 +329,10 @@ static bool SCSI_Command_ReadWrite_10(const bool IsDataRead)
|
|||
static bool SCSI_Command_ModeSense_6(void)
|
||||
{
|
||||
/* Send an empty header response with the Write Protect flag status */
|
||||
Endpoint_Write_Byte(0x00);
|
||||
Endpoint_Write_Byte(0x00);
|
||||
Endpoint_Write_Byte(DISK_READ_ONLY ? 0x80 : 0x00);
|
||||
Endpoint_Write_Byte(0x00);
|
||||
Endpoint_Write_8(0x00);
|
||||
Endpoint_Write_8(0x00);
|
||||
Endpoint_Write_8(DISK_READ_ONLY ? 0x80 : 0x00);
|
||||
Endpoint_Write_8(0x00);
|
||||
Endpoint_ClearIN();
|
||||
|
||||
/* Update the bytes transferred counter and succeed the command */
|
||||
|
|
|
@ -146,7 +146,7 @@ void EVENT_USB_Device_ControlRequest(void)
|
|||
Endpoint_ClearSETUP();
|
||||
|
||||
/* Indicate to the host the number of supported LUNs (virtual disks) on the device */
|
||||
Endpoint_Write_Byte(TOTAL_LUNS - 1);
|
||||
Endpoint_Write_8(TOTAL_LUNS - 1);
|
||||
|
||||
Endpoint_ClearIN();
|
||||
Endpoint_ClearStatusStage();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue