X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/a1595a8e7fe2148c818aef75d454e9f5e0696f78..8315e7f4ea0204718e520e48a48739fd0371bd28:/avr/main.c

diff --git a/avr/main.c b/avr/main.c
index 2199454..450e2ba 100644
--- a/avr/main.c
+++ b/avr/main.c
@@ -24,6 +24,8 @@
 #include "time.h"
 #include "rtc.h"
 #include "debug.h"
+#include "cmd_fat.h"
+
 
 uint8_t mcusr __attribute__ ((section (".noinit")));
 
@@ -31,7 +33,7 @@ uint8_t mcusr __attribute__ ((section (".noinit")));
 __attribute__ ((naked)) __attribute__ ((section (".init3")))
 void preset_ram (void)
 {
-	for (uint8_t *p = RAMSTART; p <= (uint8_t *) RAMEND; p++)
+	for (uint8_t *p = (uint8_t *) RAMSTART; p <= (uint8_t *) RAMEND; p++)
 		*p = 0xdd;
 
 }
@@ -115,10 +117,10 @@ void setup_avr(void)
 	CLKPR = 0;
 
 	/* Timer */
-	PRR1 &= ~_BV(PRTIM3);
-	OCR3A = F_CPU / 1000 - 1;	/* Timer3: 1000Hz interval (OC3A) */
-	TCCR3B = (0b01<<WGM32)|(0b001<<CS30); /* CTC Mode, Prescaler 1 */
-	TIMSK3 = _BV(OCIE3A);		/* Enable TC2.oca interrupt */
+	PRR1 &= ~_BV(PRTIM4);
+	OCR4A = F_CPU / 1000 - 1;	/* Timer4: 1000Hz interval */
+	TCCR4B = (0b00<<WGM42)|(0b001<<CS40); /* Normal Mode, Prescaler 1 */
+	TIMSK4 = _BV(OCIE4A);		/* Enable Output Compare A interrupt */
 
 	/* INT5, INT6: falling edge */
 	EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
@@ -146,16 +148,6 @@ void setup_system_time(void)
 }
 
 
-
-static void setup_fatfs(void)
-{
-	static FATFS FatFs0;
-	static FATFS FatFs1;
-
-	f_mount(&FatFs0, "0:", 0);
-	f_mount(&FatFs1, "1:", 0);
-}
-
 /*--------------------------------------------------------------------------*/
 
 /* Stored value of bootdelay, used by autoboot_command() */
@@ -223,7 +215,7 @@ const char *bootdelay_process(void)
 	debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
 	_delay_ms(20);
 
-	s = getenv_char(PSTR(ENV_BOOTCMD));
+	s = getenv_str(PSTR(ENV_BOOTCMD));
 	stored_bootdelay = bootdelay;
 	return s;
 }
@@ -254,6 +246,7 @@ int main(void)
 {
 	extern void setup_mmc(void);
 
+	__malloc_margin = CONFIG_SYS_MALLOC_MARGIN;
 	setup_avr();
 	for (int i = 0; i < GPIO_MAX; i++)
 		gpio_config(i, INPUT_PULLUP);
@@ -276,7 +269,7 @@ int main(void)
 	setup_system_time();
 	setup_fatfs();
 
-	printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor\n\n"));
+	printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor - Version: " VERSION  " \n\n"));
 
 	setup_z180_serv();