summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/src/os/main.c4
-rw-r--r--firmware/src/os/wdt.c9
-rw-r--r--firmware/src/start/Cstartup_SAM7.c9
3 files changed, 12 insertions, 10 deletions
diff --git a/firmware/src/os/main.c b/firmware/src/os/main.c
index 0cc9d99..968f6ad 100644
--- a/firmware/src/os/main.c
+++ b/firmware/src/os/main.c
@@ -78,7 +78,9 @@ int main(void)
/* Call application specific main idle function */
_main_func();
dbgu_rb_flush();
- //wdt_restart();
+
+ /* restart watchdog timer */
+ wdt_restart();
#ifdef CONFIG_IDLE
//cpu_idle();
#endif
diff --git a/firmware/src/os/wdt.c b/firmware/src/os/wdt.c
index 55a0e70..5f2aa50 100644
--- a/firmware/src/os/wdt.c
+++ b/firmware/src/os/wdt.c
@@ -23,7 +23,7 @@
#include <os/dbgu.h>
#include <os/system_irq.h>
-#define WDT_DEBUG
+/*#define WDT_DEBUG*/
static void wdt_irq(u_int32_t sr)
{
@@ -39,12 +39,11 @@ void wdt_init(void)
{
sysirq_register(AT91SAM7_SYSIRQ_WDT, &wdt_irq);
#ifdef WDT_DEBUG
- AT91F_WDTSetMode(AT91C_BASE_WDTC, (0xfff << 16) |
+ AT91F_WDTSetMode(AT91C_BASE_WDTC, (0xff << 16) |
AT91C_WDTC_WDDBGHLT | AT91C_WDTC_WDIDLEHLT |
AT91C_WDTC_WDFIEN);
#else
- AT91F_WDTSetMode(AT91C_BASE_WDTC, (0xfff << 16) |
- AT91C_WDTC_WDDBGHLT | AT91C_WDTC_WDIDLEHLT |
- AT91C_WDTC_WDRSTEN);
+ AT91F_WDTSetMode(AT91C_BASE_WDTC, (0x80 << 16) |
+ AT91C_WDTC_WDRSTEN | 0x80);
#endif
}
diff --git a/firmware/src/start/Cstartup_SAM7.c b/firmware/src/start/Cstartup_SAM7.c
index 66dbe20..4ab263f 100644
--- a/firmware/src/start/Cstartup_SAM7.c
+++ b/firmware/src/start/Cstartup_SAM7.c
@@ -32,16 +32,17 @@ extern void AT91F_Default_FIQ_handler (void);
void
AT91F_LowLevelInit (void)
{
- int i;
+ volatile int i;
+
+ //* Debounce power supply
+ for(i=0;i<1024;i++);
+
AT91PS_PMC pPMC = AT91C_BASE_PMC;
//* Set Flash Waite sate
// Single Cycle Access at Up to 30 MHz, or 40
// if MCK = 47923200 I have 50 Cycle for 1 usecond ( flied MC_FMR->FMCN
AT91C_BASE_MC->MC_FMR = ((AT91C_MC_FMCN) & (48 << 16)) | AT91C_MC_FWS_1FWS;
- //* Watchdog Disable
- AT91C_BASE_WDTC->WDTC_WDMR = AT91C_WDTC_WDDIS;
-
//* Set MCK at 47 923 200
// 1 Enabling the Main Oscillator:
// SCK = 1/32768 = 30.51 uSecond
personal git repositories of Harald Welte. Your mileage may vary