diff options
author | Dean Camera <[email protected]> | 2011-04-04 12:52:30 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2011-04-04 12:52:30 +0000 |
commit | 899df7d3318e478859d940ec8debe679888476a5 (patch) | |
tree | 79955f88fa3d6d47c4de00a0f83cdbd6a7809935 /Demos/Device/LowLevel/MassStorage | |
parent | 2efa79d3ec0630d6baf1cad13fc8f323d090da61 (diff) | |
download | qmk_firmware-899df7d3318e478859d940ec8debe679888476a5.tar.gz qmk_firmware-899df7d3318e478859d940ec8debe679888476a5.zip |
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.
Diffstat (limited to 'Demos/Device/LowLevel/MassStorage')
-rw-r--r-- | Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c | 64 | ||||
-rw-r--r-- | Demos/Device/LowLevel/MassStorage/Lib/SCSI.c | 12 | ||||
-rw-r--r-- | Demos/Device/LowLevel/MassStorage/MassStorage.c | 2 |
3 files changed, 39 insertions, 39 deletions
diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c index fdca8cbbc1..287676fd05 100644 --- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c +++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c @@ -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++; diff --git a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c index 56790dd8df..4326786129 100644 --- a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c +++ b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c @@ -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 */ diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.c b/Demos/Device/LowLevel/MassStorage/MassStorage.c index d6345e3860..7f2d866109 100644 --- a/Demos/Device/LowLevel/MassStorage/MassStorage.c +++ b/Demos/Device/LowLevel/MassStorage/MassStorage.c @@ -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(); |