Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[samo-lib] fix dependency on deprecated files

Signed-off-by: Christopher Hall <hsw@openmoko.com>
  • Loading branch information...
commit 7a3eb1b30ea78b0d8b9963a53d1c965e8d87a95f 1 parent 33975f9
@hxw hxw authored
Showing with 6 additions and 9 deletions.
  1. +0 −3  samo-lib/flash/Makefile
  2. +6 −6 samo-lib/flash/flash.c
View
3  samo-lib/flash/Makefile
@@ -57,9 +57,6 @@ vpath %.c $(WIKI_APP_SRC):$(INDEXING_SRC):$(MINILZO_SRC)
OBJECTS = flash.o
-OBJECTS += misc.o
-OBJECTS += $(GUILIB_COBJS) $(WIKIAPP_COBJS) $(MINILZO_COBJS) $(PERF_COBJ)
-
BUILD_OBJECTS = $(addprefix ${BUILD_PREFIX},${OBJECTS})
View
12 samo-lib/flash/flash.c
@@ -24,7 +24,7 @@
#include <tff.h>
#include <diskio.h>
#include <delay.h>
-#include <misc.h>
+#include <print.h>
#include <lcd.h>
#include <FLASH.h>
@@ -74,7 +74,7 @@ int flash(int arg)
bool flag = false;
for (i = 0; i < ProgramRetries; ++i) {
print("Begin Pass: ");
- print_dec32(i);
+ print_int(i);
print_char('\n');
LCD_DisplayImage(LCD_PositionTop, true, &program_image);
if (process(filename)) {
@@ -115,7 +115,7 @@ static bool process(const char *filename)
rc = f_open(&file, filename, FA_READ);
if (FR_OK != rc) {
print("open error = ");
- print_dec32(rc);
+ print_int(rc);
print_char('\n');
return false;
}
@@ -124,16 +124,16 @@ static bool process(const char *filename)
rc = f_read(&file, ROMBuffer, sizeof(ROMBuffer), &length);
if (FR_OK != rc) {
print("read error = ");
- print_dec32(rc);
+ print_int(rc);
print_char('\n');
f_close(&file);
return false;
}
if (sizeof(ROMBuffer) != length) {
print("only read: ");
- print_dec32(length);
+ print_int(length);
print(" required ");
- print_dec32(sizeof(ROMBuffer));
+ print_int(sizeof(ROMBuffer));
print_char('\n');
f_close(&file);
return false;
Please sign in to comment.
Something went wrong with that request. Please try again.