diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-07-03 07:54:39 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-07-03 07:54:49 -0700 |
| commit | 110622eaa2787cc54818083d4243653b088e5b5a (patch) | |
| tree | b1637e4dc8d8aa13e9face4998cf25ae620361e5 /Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h | |
| parent | d0fd80affba97b37eb00c650e87cb5982a4f260e (diff) | |
| parent | 5ba628d10b54d58d445896290ba9799bd76a73b3 (diff) | |
| download | lufa-110622eaa2787cc54818083d4243653b088e5b5a.tar.gz lufa-110622eaa2787cc54818083d4243653b088e5b5a.tar.bz2 lufa-110622eaa2787cc54818083d4243653b088e5b5a.zip | |
Merge remote-tracking branch 'abcminiuser/master'
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h')
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h index 5f32f5194..16fd330fa 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2017. + Copyright (C) Dean Camera, 2019. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2017 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2019 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -62,13 +62,13 @@ #define LOAD_EXTENDED_ADDRESS_CMD 0x4D /** Macro to convert an ISP frequency to a number of timer clock cycles for the software SPI driver. */ - #define TIMER_COMP(freq) (((F_CPU / 8) / 2 / freq) - 1) + #define ISP_TIMER_COMP(freq) (((F_CPU / 8) / 2 / freq) - 1) /** ISP rescue clock speed in Hz, for clocking targets with incorrectly set fuses. */ #define ISP_RESCUE_CLOCK_SPEED 4000000 /* External Variables: */ - extern bool HardwareSPIMode; + extern bool ISPTarget_HardwareSPIMode; /* Function Prototypes: */ void ISPTarget_EnableTargetISP(void); @@ -93,7 +93,7 @@ */ static inline void ISPTarget_SendByte(const uint8_t Byte) { - if (HardwareSPIMode) + if (ISPTarget_HardwareSPIMode) SPI_SendByte(Byte); else ISPTarget_TransferSoftSPIByte(Byte); @@ -108,7 +108,7 @@ { uint8_t ReceivedByte; - if (HardwareSPIMode) + if (ISPTarget_HardwareSPIMode) ReceivedByte = SPI_ReceiveByte(); else ReceivedByte = ISPTarget_TransferSoftSPIByte(0x00); @@ -131,7 +131,7 @@ { uint8_t ReceivedByte; - if (HardwareSPIMode) + if (ISPTarget_HardwareSPIMode) ReceivedByte = SPI_TransferByte(Byte); else ReceivedByte = ISPTarget_TransferSoftSPIByte(Byte); |