aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device/ClassDriver/MassStorage
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-07-11 15:05:56 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-07-11 15:05:56 +0000
commite0af6014a746b1ef0707d388a58bcf77b9ea47f1 (patch)
tree7c12ca6cbb651560a90c5a625228c65b3c1efcb9 /Demos/Device/ClassDriver/MassStorage
parentb462f2d457ec2f0cfa22a1c3db198cb22f6809a1 (diff)
downloadlufa-e0af6014a746b1ef0707d388a58bcf77b9ea47f1.tar.gz
lufa-e0af6014a746b1ef0707d388a58bcf77b9ea47f1.tar.bz2
lufa-e0af6014a746b1ef0707d388a58bcf77b9ea47f1.zip
Added incomplete PrinterHost demo application.
Seperated out Lib components of the incomplete BluetoothHost demo application out into a seperate Lib subfolder. Changed F_CLOCK entries in project makefiles to alias to F_CPU by default, as this is the most common case.
Diffstat (limited to 'Demos/Device/ClassDriver/MassStorage')
-rw-r--r--Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c6
-rw-r--r--Demos/Device/ClassDriver/MassStorage/makefile2
2 files changed, 4 insertions, 4 deletions
diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
index 08f11b7d6..f400e20e3 100644
--- a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
@@ -214,10 +214,10 @@ static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInf
*/
static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)
{
- uint32_t TotalLUNs = (LUN_MEDIA_BLOCKS - 1);
- uint32_t MediaBlockSize = VIRTUAL_MEMORY_BLOCK_SIZE;
+ uint32_t LastBlockAddressInLUN = (LUN_MEDIA_BLOCKS - 1);
+ uint32_t MediaBlockSize = VIRTUAL_MEMORY_BLOCK_SIZE;
- Endpoint_Write_Stream_BE(&TotalLUNs, sizeof(TotalLUNs), NO_STREAM_CALLBACK);
+ Endpoint_Write_Stream_BE(&LastBlockAddressInLUN, sizeof(LastBlockAddressInLUN), NO_STREAM_CALLBACK);
Endpoint_Write_Stream_BE(&MediaBlockSize, sizeof(MediaBlockSize), NO_STREAM_CALLBACK);
Endpoint_ClearIN();
diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index 962cc008e..a99903d98 100644
--- a/Demos/Device/ClassDriver/MassStorage/makefile
+++ b/Demos/Device/ClassDriver/MassStorage/makefile
@@ -101,7 +101,7 @@ F_CPU = 8000000
#
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_CLOCK = 8000000
+F_CLOCK = $(F_CPU)
# Output format. (can be srec, ihex, binary)