projects
/
sx
/
simavr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
regExp
home
|
summary
|
tags
|
heads
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
raw
|
patch
| inline |
side by side
(parent:
98fd52f
)
Commit
dfca12c72062290d7a2b154e9e56eb8bd6e40f99
author
Michel Pollet
<buserror@gmail.com>
Wed, 23 Mar 2011 14:38:04 +0000
(14:38 +0000)
committer
Michel Pollet
<buserror@gmail.com>
Wed, 23 Mar 2011 14:38:04 +0000
(14:38 +0000)
Twas borken since I changed the build system. Now works
Signed-off-by: Michel Pollet <buserror@gmail.com>
4 files changed:
examples/board_hd77480/charlcd.c
patch
|
blob
|
history
|
download
examples/board_ledramp/ledramp.c
patch
|
blob
|
history
|
download
examples/board_simduino/simduino.c
patch
|
blob
|
history
|
download
examples/board_timer_64led/timer_64led.c
patch
|
blob
|
history
|
download
diff --git
a/examples/board_hd77480/charlcd.c
b/examples/board_hd77480/charlcd.c
index a7c118d231780dffbcfe5041d95f3f1b3470b621..0c1f3820a5485ac54e2afd4292a884b09045ada7 100644
(file)
--- 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 e3d0b139930e6137f068b43f86729f0af90b660f..cab3c66960dc3041ac3329cb54c976f4c4b59f24 100644
(file)
--- 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 04a25be54e11c4bfafd821088ece57aa70396f8b..87d063d68b7a65497d5bb2192b1c4e94d1d6945a 100644
(file)
--- 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 0495a19d312b2b25805cf0d4134dfac986f22899..b5f83c1513e64a415881ac9936e8ba2538f8907f 100644
(file)
--- 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);