Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DTR/RTS reset/isp signals for SYSFS_GPIO_SUPPORT #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix DTR/RTS reset/isp signals for SYSFS_GPIO_SUPPORT #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions lpc21isp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,6 +1653,41 @@ run mode.
*/
void ResetTarget(ISP_ENVIRONMENT *IspEnvironment, TARGET_MODE mode)
{
if (IspEnvironment->ControlLines)
{
switch (mode)
{
/* Reset and jump to boot loader. */
case PROGRAM_MODE:
ControlModemLines(IspEnvironment, 1, 1);
Sleep(100);
ClearSerialPortBuffers(IspEnvironment);
Sleep(100);
ControlModemLines(IspEnvironment, 0, 1);
//Longer delay is the Reset signal is conected to an external rest controller
Sleep(500);
// Clear the RTS line after having reset the micro
// Needed for the "GO <Address> <Mode>" ISP command to work */
if(!IspEnvironment->BootHold)
{
ControlModemLines(IspEnvironment, 0, 0);
}
break;

/* Reset and start uploaded program */
case RUN_MODE:
ControlModemLines(IspEnvironment, 1, 0);
Sleep(100);
ClearSerialPortBuffers(IspEnvironment);
Sleep(100);
ControlModemLines(IspEnvironment, 0, 0);
Sleep(100);
break;
}

return;
}

#if defined(__linux__) && ( defined(SYSFS_GPIO_SUPPORT) || ( defined(GPIO_RST) && defined(GPIO_ISP) ) )

// This code section allows using Linux GPIO pins to control the -RST and -ISP
Expand Down Expand Up @@ -1685,7 +1720,7 @@ void ResetTarget(ISP_ENVIRONMENT *IspEnvironment, TARGET_MODE mode)
// special permissions to access the GPIO signals.

#if defined(SYSFS_GPIO_SUPPORT)
if (!IspEnvironment->ControlLines && (IspEnvironment->GpioIsp == 0 || IspEnvironment->GpioRst == 0))
if (IspEnvironment->GpioIsp == 0 || IspEnvironment->GpioRst == 0)
{
return;
}
Expand Down Expand Up @@ -1748,42 +1783,7 @@ void ResetTarget(ISP_ENVIRONMENT *IspEnvironment, TARGET_MODE mode)

close(gpio_isp);
close(gpio_rst);

return;
#endif

if (IspEnvironment->ControlLines)
{
switch (mode)
{
/* Reset and jump to boot loader. */
case PROGRAM_MODE:
ControlModemLines(IspEnvironment, 1, 1);
Sleep(100);
ClearSerialPortBuffers(IspEnvironment);
Sleep(100);
ControlModemLines(IspEnvironment, 0, 1);
//Longer delay is the Reset signal is conected to an external rest controller
Sleep(500);
// Clear the RTS line after having reset the micro
// Needed for the "GO <Address> <Mode>" ISP command to work */
if(!IspEnvironment->BootHold)
{
ControlModemLines(IspEnvironment, 0, 0);
}
break;

/* Reset and start uploaded program */
case RUN_MODE:
ControlModemLines(IspEnvironment, 1, 0);
Sleep(100);
ClearSerialPortBuffers(IspEnvironment);
Sleep(100);
ControlModemLines(IspEnvironment, 0, 0);
Sleep(100);
break;
}
}
}


Expand Down