diff options
author | Dean Camera <[email protected]> | 2009-07-11 15:05:56 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2009-07-11 15:05:56 +0000 |
commit | e0af6014a746b1ef0707d388a58bcf77b9ea47f1 (patch) | |
tree | 7c12ca6cbb651560a90c5a625228c65b3c1efcb9 /Demos/Device/ClassDriver | |
parent | b462f2d457ec2f0cfa22a1c3db198cb22f6809a1 (diff) | |
download | qmk_firmware-e0af6014a746b1ef0707d388a58bcf77b9ea47f1.tar.gz qmk_firmware-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')
-rw-r--r-- | Demos/Device/ClassDriver/AudioInput/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/CDC/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/DualCDC/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/GenericHID/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/Joystick/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/Keyboard/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/KeyboardMouse/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/MIDI/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c | 6 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/MassStorage/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/Mouse/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/RNDISEthernet/makefile | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/USBtoSerial/makefile | 2 |
14 files changed, 16 insertions, 16 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile index c4b0b4b1c6..a2be87c53f 100644 --- a/Demos/Device/ClassDriver/AudioInput/makefile +++ b/Demos/Device/ClassDriver/AudioInput/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)
diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile index 2bdb37a45b..bdc4dad086 100644 --- a/Demos/Device/ClassDriver/AudioOutput/makefile +++ b/Demos/Device/ClassDriver/AudioOutput/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)
diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile index 85e51e5ef4..8389b73b35 100644 --- a/Demos/Device/ClassDriver/CDC/makefile +++ b/Demos/Device/ClassDriver/CDC/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)
diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile index fcaeab77f8..f6d96037a5 100644 --- a/Demos/Device/ClassDriver/DualCDC/makefile +++ b/Demos/Device/ClassDriver/DualCDC/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)
diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile index 79416c5362..653884ce2e 100644 --- a/Demos/Device/ClassDriver/GenericHID/makefile +++ b/Demos/Device/ClassDriver/GenericHID/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)
diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile index cc5a070547..ab59ed7d1b 100644 --- a/Demos/Device/ClassDriver/Joystick/makefile +++ b/Demos/Device/ClassDriver/Joystick/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)
diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile index 30add8a9a1..ab68f3782e 100644 --- a/Demos/Device/ClassDriver/Keyboard/makefile +++ b/Demos/Device/ClassDriver/Keyboard/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)
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile index aec7852933..dea49a342e 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/makefile +++ b/Demos/Device/ClassDriver/KeyboardMouse/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)
diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile index a9e1497018..575e99b223 100644 --- a/Demos/Device/ClassDriver/MIDI/makefile +++ b/Demos/Device/ClassDriver/MIDI/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)
diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c index 08f11b7d67..f400e20e37 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 962cc008e5..a99903d983 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)
diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile index 271f174c53..d8c86153eb 100644 --- a/Demos/Device/ClassDriver/Mouse/makefile +++ b/Demos/Device/ClassDriver/Mouse/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)
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile index b2328b9bd0..4070ff609f 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/makefile +++ b/Demos/Device/ClassDriver/RNDISEthernet/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)
diff --git a/Demos/Device/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile index 3c202104a9..05a4cddd2f 100644 --- a/Demos/Device/ClassDriver/USBtoSerial/makefile +++ b/Demos/Device/ClassDriver/USBtoSerial/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)
|