From: Michel Pollet <buserror@gmail.com>
Date: Wed, 23 Mar 2011 14:38:04 +0000 (+0000)
Subject: examples: Fix firmware pathnames
X-Git-Tag: v1.0a8~3
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=dfca12c72062290d7a2b154e9e56eb8bd6e40f99;p=sx%2Fsimavr.git

examples: Fix firmware pathnames

Twas borken since I changed the build system. Now works

Signed-off-by: Michel Pollet <buserror@gmail.com>
---

diff --git a/examples/board_hd77480/charlcd.c b/examples/board_hd77480/charlcd.c
index a7c118d..0c1f382 100644
--- a/examples/board_hd77480/charlcd.c
+++ b/examples/board_hd77480/charlcd.c
@@ -146,10 +146,10 @@ main(
 {
 	elf_firmware_t f;
 	const char * fname = "atmega48_charlcd.axf";
-	char path[256];
-	sprintf(path, "%s/%s", dirname(argv[0]), fname);
-	printf("Firmware pathname is %s\n", path);
-	elf_read_firmware(path, &f);
+//	char path[256];
+//	sprintf(path, "%s/%s", dirname(argv[0]), fname);
+//	printf("Firmware pathname is %s\n", path);
+	elf_read_firmware(fname, &f);
 
 	printf("firmware %s f=%d mmcu=%s\n", fname, (int) f.frequency, f.mmcu);
 
diff --git a/examples/board_ledramp/ledramp.c b/examples/board_ledramp/ledramp.c
index e3d0b13..cab3c66 100644
--- a/examples/board_ledramp/ledramp.c
+++ b/examples/board_ledramp/ledramp.c
@@ -144,9 +144,9 @@ int main(int argc, char *argv[])
 	const char * fname =  "atmega48_ledramp.axf";
 	char path[256];
 
-	sprintf(path, "%s/%s", dirname(argv[0]), fname);
-	printf("Firmware pathname is %s\n", path);
-	elf_read_firmware(path, &f);
+//	sprintf(path, "%s/%s", dirname(argv[0]), fname);
+//	printf("Firmware pathname is %s\n", path);
+	elf_read_firmware(fname, &f);
 
 	printf("firmware %s f=%d mmcu=%s\n", fname, (int)f.frequency, f.mmcu);
 
diff --git a/examples/board_simduino/simduino.c b/examples/board_simduino/simduino.c
index 04a25be..87d063d 100644
--- a/examples/board_simduino/simduino.c
+++ b/examples/board_simduino/simduino.c
@@ -200,7 +200,8 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "%s: Error creating the AVR core\n", argv[0]);
 		exit(1);
 	}
-	snprintf(avr_flash_path, sizeof(avr_flash_path), "%s/%s", pwd, "simduino_flash.bin");
+//	snprintf(avr_flash_path, sizeof(avr_flash_path), "%s/%s", pwd, "simduino_flash.bin");
+	strcpy(avr_flash_path,  "simduino_flash.bin");
 	// register our own functions
 	avr->special_init = avr_special_init;
 	avr->special_deinit = avr_special_deinit;
@@ -215,7 +216,8 @@ int main(int argc, char *argv[])
 	{
 		char path[1024];
 		uint32_t base, size;
-		snprintf(path, sizeof(path), "%s/%s", pwd, "ATmegaBOOT_168_atmega328.ihex");
+//		snprintf(path, sizeof(path), "%s/%s", pwd, "ATmegaBOOT_168_atmega328.ihex");
+		strcpy(path, "ATmegaBOOT_168_atmega328.ihex");
 		uint8_t * boot = read_ihex_file(path, &size, &base);
 		if (!boot) {
 			fprintf(stderr, "%s: Unable to load %s\n", argv[0], path);
diff --git a/examples/board_timer_64led/timer_64led.c b/examples/board_timer_64led/timer_64led.c
index 0495a19..b5f83c1 100644
--- a/examples/board_timer_64led/timer_64led.c
+++ b/examples/board_timer_64led/timer_64led.c
@@ -212,9 +212,9 @@ int main(int argc, char *argv[])
 	const char * fname =  "atmega168_timer_64led.axf";
 	char path[256];
 
-	sprintf(path, "%s/%s", dirname(argv[0]), fname);
-	printf("Firmware pathname is %s\n", path);
-	elf_read_firmware(path, &f);
+//	sprintf(path, "%s/%s", dirname(argv[0]), fname);
+	//printf("Firmware pathname is %s\n", path);
+	elf_read_firmware(fname, &f);
 
 	printf("firmware %s f=%d mmcu=%s\n", fname, (int)f.frequency, f.mmcu);