forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions

Browse Source
pull/1469/head
Dean Camera 16 years ago
parent ddd223fa35 b0d9f961ac
commit 4a09da2098
66 changed files with 98 additions and 84 deletions
Show Stats Download Patch File Download Diff File

4
Bootloaders/CDC/BootloaderCDC.c
Unescape View File

@ -71,8 +71,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Relocate the interrupt vector table to the bootloader section */
MCUCR = (1 << IVCE);

1
Bootloaders/CDC/BootloaderCDC.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/boot.h>
#include <avr/eeprom.h>
#include <avr/power.h>
#include <stdbool.h>
#include "Descriptors.h"

4
Bootloaders/DFU/BootloaderDFU.c
Unescape View File

@ -109,8 +109,8 @@ int main (void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Relocate the interrupt vector table to the bootloader section */
MCUCR = (1 << IVCE);

1
Bootloaders/DFU/BootloaderDFU.h
Unescape View File

@ -42,6 +42,7 @@
#include <avr/boot.h>
#include <avr/pgmspace.h>
#include <avr/eeprom.h>
#include <avr/power.h>
#include <stdbool.h>
#include "Descriptors.h"

4
Bootloaders/TeensyHID/TeensyHID.c
Unescape View File

@ -53,8 +53,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Relocate the interrupt vector table to the bootloader section */
MCUCR = (1 << IVCE);

1
Bootloaders/TeensyHID/TeensyHID.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/boot.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <util/delay.h>
#include <stdbool.h>

4
Demos/AudioInput/AudioInput.c
Unescape View File

@ -63,8 +63,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
LEDs_Init();

1
Demos/AudioInput/AudioInput.h
Unescape View File

@ -39,6 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include "Descriptors.h"

4
Demos/AudioOutput/AudioOutput.c
Unescape View File

@ -66,8 +66,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
LEDs_Init();

1
Demos/AudioOutput/AudioOutput.h
Unescape View File

@ -39,6 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include "Descriptors.h"

4
Demos/BluetoothHost/BluetoothHost.c
Unescape View File

@ -74,8 +74,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/BluetoothHost/BluetoothHost.h
Unescape View File

@ -35,6 +35,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <stdio.h>
#include "BluetoothStack.h"

4
Demos/CDC/CDC.c
Unescape View File

@ -87,8 +87,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/CDC/CDC.h
Unescape View File

@ -39,6 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <string.h>
#include "Descriptors.h"

4
Demos/CDCHost/CDCHost.c
Unescape View File

@ -59,8 +59,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/CDCHost/CDCHost.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <stdio.h>
#include <LUFA/Version.h> // Library Version Information

4
Demos/DualCDC/DualCDC.c
Unescape View File

@ -101,8 +101,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/DualCDC/DualCDC.h
Unescape View File

@ -39,6 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <string.h>
#include "Descriptors.h"

4
Demos/Joystick/Joystick.c
Unescape View File

@ -58,8 +58,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/Joystick/Joystick.h
Unescape View File

@ -39,6 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <string.h>
#include "Descriptors.h"

4
Demos/Keyboard/Keyboard.c
Unescape View File

@ -77,8 +77,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/Keyboard/Keyboard.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <stdbool.h>
#include <string.h>

4
Demos/KeyboardFullInt/KeyboardFullInt.c
Unescape View File

@ -70,8 +70,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/KeyboardFullInt/KeyboardFullInt.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <stdbool.h>
#include <string.h>

4
Demos/KeyboardHost/KeyboardHost.c
Unescape View File

@ -59,8 +59,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/KeyboardHost/KeyboardHost.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <stdio.h>
#include <LUFA/Version.h> // Library Version Information

4
Demos/KeyboardHostViaInt/KeyboardHostViaInt.c
Unescape View File

@ -59,8 +59,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/KeyboardHostViaInt/KeyboardHostViaInt.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <stdio.h>
#include <LUFA/Version.h> // Library Version Information

4
Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
Unescape View File

@ -59,8 +59,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
Unescape View File

@ -35,6 +35,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <stdio.h>
#include <LUFA/Version.h> // Library Version Information

4
Demos/KeyboardMouse/KeyboardMouse.c
Unescape View File

@ -67,8 +67,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/KeyboardMouse/KeyboardMouse.h
Unescape View File

@ -35,6 +35,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <stdbool.h>
#include <string.h>

4
Demos/KeyboardViaInt/KeyboardViaInt.c
Unescape View File

@ -76,8 +76,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/KeyboardViaInt/KeyboardViaInt.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <stdbool.h>
#include <string.h>

4
Demos/MIDI/MIDI.c
Unescape View File

@ -58,8 +58,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/MIDI/MIDI.h
Unescape View File

@ -39,6 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <stdbool.h>
#include "Descriptors.h"

4
Demos/MassStorage/MassStorage.c
Unescape View File

@ -68,8 +68,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
LEDs_Init();

1
Demos/MassStorage/MassStorage.h
Unescape View File

@ -39,6 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include "Descriptors.h"
#include "SCSI.h"

4
Demos/MassStorageHost/MassStorageHost.c
Unescape View File

@ -63,8 +63,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/MassStorageHost/MassStorageHost.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <stdio.h>
#include <ctype.h>

4
Demos/Mouse/Mouse.c
Unescape View File

@ -76,8 +76,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/Mouse/Mouse.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <stdbool.h>
#include <string.h>

4
Demos/MouseFullInt/MouseFullInt.c
Unescape View File

@ -69,8 +69,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/MouseFullInt/MouseFullInt.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <stdbool.h>
#include <string.h>

4
Demos/MouseHost/MouseHost.c
Unescape View File

@ -59,8 +59,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/MouseHost/MouseHost.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <stdio.h>
#include <LUFA/Version.h> // Library Version Information

4
Demos/MouseHostViaInt/MouseHostViaInt.c
Unescape View File

@ -59,8 +59,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/MouseHostViaInt/MouseHostViaInt.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <stdio.h>
#include <LUFA/Version.h> // Library Version Information

4
Demos/MouseHostWithParser/MouseHostWithParser.c
Unescape View File

@ -59,8 +59,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
SerialStream_Init(9600, false);

1
Demos/MouseHostWithParser/MouseHostWithParser.h
Unescape View File

@ -35,6 +35,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <stdio.h>
#include <LUFA/Version.h> // Library Version Information

4
Demos/MouseViaInt/MouseViaInt.c
Unescape View File

@ -74,8 +74,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Joystick_Init();

1
Demos/MouseViaInt/MouseViaInt.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <stdbool.h>
#include <string.h>

4
Demos/RNDISEthernet/RNDISEthernet.c
Unescape View File

@ -60,8 +60,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
LEDs_Init();

3
Demos/RNDISEthernet/RNDISEthernet.h
Unescape View File

@ -39,9 +39,10 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <string.h>
#include <stdio.h>
#include <avr/pgmspace.h>
#include "Descriptors.h"
#include "RNDIS.h"

1
Demos/StillImageHost/StillImageHost.h
Unescape View File

@ -39,6 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <stdio.h>
#include "ConfigDescriptor.h"

2
Demos/TestApp/TestApp.c
Unescape View File

@ -61,7 +61,7 @@ int main(void)
wdt_disable();
/* Disable clock division */
SetSystemClockPrescaler(0);
clock_prescale_set(clock_div_1);
/* Hardware initialization */
SerialStream_Init(9600, false);

1
Demos/TestApp/TestApp.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/USB/USB.h> // USB Functionality

4
Demos/USBtoSerial/USBtoSerial.c
Unescape View File

@ -72,8 +72,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
LEDs_Init();

1
Demos/USBtoSerial/USBtoSerial.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include "Descriptors.h"
#include "RingBuff.h"

1
LUFA/ChangeLog.txt
Unescape View File

@ -28,6 +28,7 @@
* - Mass Storage Host demo now uses a USB_STREAM_TIMEOUT_MS of two seconds to maintain compatibility with poorly designed devices
* - Function attribute ATTR_ALWAYSINLINE renamed to ATTR_ALWAYS_INLINE to match other function attribute macro naming conventions
* - Added ATTR_ALWAYS_INLINE attribute to several key inlined library components, to ensure they are inlined in all circumstances
* - Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions
*
* \section Sec_ChangeLog090209 Version 090209
*

21
LUFA/Common/Common.h
Unescape View File

@ -88,27 +88,6 @@
} }MACROE
/* Inline Functions: */
/** Function for reliably setting the AVR's system clock prescaler, using inline assembly. This function
* is guaranteed to operate reliably regardless of optimization setting or other compile time options.
*
* \param PrescalerMask The mask of the new prescaler setting for CLKPR
*/
static inline void SetSystemClockPrescaler(uint8_t PrescalerMask)
{
uint8_t tmp = (1 << CLKPCE);
__asm__ __volatile__ (
"in __tmp_reg__,__SREG__" "\n\t"
"cli" "\n\t"
"sts %1, %0" "\n\t"
"sts %1, %2" "\n\t"
"out __SREG__, __tmp_reg__"
: /* no outputs */
: "d" (tmp),
"M" (_SFR_MEM_ADDR(CLKPR)),
"d" (PrescalerMask)
: "r0");
}
/** Function to reverse the individual bits in a byte - i.e. bit 7 is moved to bit 0, bit 6 to bit 1,
* etc.
*

2
LUFA/MigrationInformation.txt
Unescape View File

@ -17,6 +17,8 @@
* defined in the project makefile and passed to the compiler via the -D switch.
* - The makefile EEPROM programming targets for FLIP and dfu-programmer no longer program in the FLASH data in addition to the
* EEPROM data into the device. If both are to be programmed, both the EEPROM and FLASH programming targets must be called.
* - As the avr-libc macro has been corrected in recent avr-libc distributions, the SetSystemClockPrescaler() macro has been removed.
* Include <avr/power.h> and call clock_prescale_set(clock_div_1); instead on recent avr-libc distributions.
*
* <b>Library Demos</b>
* - The USBtoSerial demo now discards all data when not connected to a host, rather than buffering it for later transmission.

4
Projects/AVRISP_Programmer/AVRISP_Programmer.c
Unescape View File

@ -167,8 +167,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
LEDs_Init();

3
Projects/AVRISP_Programmer/AVRISP_Programmer.h
Unescape View File

@ -37,10 +37,11 @@
#define _AVRISP_PROGRAMMER_H_
/* Includes: */
#include <util/delay.h>
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <util/delay.h>
#include "Descriptors.h"
#include "RingBuff.h"

4
Projects/Magstripe/Magstripe.c
Unescape View File

@ -93,8 +93,8 @@ int main(void)
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable Clock Division */
SetSystemClockPrescaler(0);
/* Disable clock division */
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
Magstripe_Init();

1
Projects/Magstripe/Magstripe.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <stdbool.h>
#include <string.h>

Write Preview
Loading…
Cancel
Save