diff options
author | Dean Camera <[email protected]> | 2010-11-14 06:44:57 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2010-11-14 06:44:57 +0000 |
commit | f2324fc2b4a926dc2db5d3e681a019949fe23342 (patch) | |
tree | c16061ed6c1a73174144789716220ec465c59e74 /Projects/AVRISP-MKII/Lib/ISP | |
parent | d41cd9a41aca81eaa21e65e6c53672fe604fa3d5 (diff) | |
download | qmk_firmware-f2324fc2b4a926dc2db5d3e681a019949fe23342.tar.gz qmk_firmware-f2324fc2b4a926dc2db5d3e681a019949fe23342.zip |
Second patch to fix incorrect PDI/TPI programming speed.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/ISP')
-rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c | 4 | ||||
-rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 4 | ||||
-rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c index 9056942d2a..97e0fb305a 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c @@ -66,7 +66,7 @@ void ISPProtocol_EnterISPMode(void) /* Perform execution delay, initialize SPI bus */ ISPProtocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS); - ISPTarget_Init(); + ISPTarget_EnableTargetISP(); /* Continuously attempt to synchronize with the target until either the number of attempts specified * by the host has exceeded, or the the device sends back the expected response values */ @@ -118,7 +118,7 @@ void ISPProtocol_LeaveISPMode(void) /* Perform pre-exit delay, release the target /RESET, disable the SPI bus and perform the post-exit delay */ ISPProtocol_DelayMS(Leave_ISP_Params.PreDelayMS); ISPTarget_ChangeTargetResetLine(false); - ISPTarget_ShutDown(); + ISPTarget_DisableTargetISP(); ISPProtocol_DelayMS(Leave_ISP_Params.PostDelayMS); Endpoint_Write_Byte(CMD_LEAVE_PROGMODE_ISP); diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index d315e9d1e0..66a1c25606 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -142,7 +142,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK) /** Initialises the appropriate SPI driver (hardware or software, depending on the selected ISP speed) ready for * communication with the attached target. */ -void ISPTarget_Init(void) +void ISPTarget_EnableTargetISP(void) { uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION); @@ -167,7 +167,7 @@ void ISPTarget_Init(void) /** Shuts down the current selected SPI driver (hardware or software, depending on the selected ISP speed) so that no * further communications can occur until the driver is re-initialized. */ -void ISPTarget_ShutDown(void) +void ISPTarget_DisableTargetISP(void) { if (HardwareSPIMode) { diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h index aae4c5b538..ba47fdde9c 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h @@ -69,8 +69,8 @@ extern bool HardwareSPIMode; /* Function Prototypes: */ - void ISPTarget_Init(void); - void ISPTarget_ShutDown(void); + void ISPTarget_EnableTargetISP(void); + void ISPTarget_DisableTargetISP(void); void ISPTarget_ConfigureRescueClock(void); void ISPTarget_ConfigureSoftwareISP(const uint8_t SCKDuration); uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte); |