Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a16f552
Choose a base ref
...
head repository: m-labs/misp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3f1fd02
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on May 31, 2012

  1. Makefile: remove bogus phony target

    Sebastien Bourdeauducq committed May 31, 2012
    Copy the full SHA
    0979fee View commit details
  2. Makefile: abort on lib compilation error

    Sebastien Bourdeauducq committed May 31, 2012
    Copy the full SHA
    e9d4a14 View commit details
  3. Complete YAFFS2 lib

    Sebastien Bourdeauducq committed May 31, 2012
    Copy the full SHA
    3f1fd02 View commit details
Showing with 47 additions and 3 deletions.
  1. +2 −1 Makefile
  2. +1 −0 libglue/Makefile
  3. +42 −0 libglue/file.c
  4. +2 −2 libyaffs2/Makefile
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ misp.elf: linker.ld $(OBJECTS) libs
$(compile-dep)

libs:
set -e; \
for lib in $(OURLIBS); do \
make -C $(MISPDIR)/lib$$lib; \
done
@@ -39,4 +40,4 @@ clean:
make -C $(MISPDIR)/lib$$lib clean; \
done

.PHONY: clean libs flash
.PHONY: clean libs
1 change: 1 addition & 0 deletions libglue/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MISPDIR=..
include $(MISPDIR)/common.mak

CFLAGS+=-I$(YAFFSDIR)/direct -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_DEFINES_TYPES -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
OBJECTS=file.o getenv.o

all: libglue.a
42 changes: 42 additions & 0 deletions libglue/file.c
Original file line number Diff line number Diff line change
@@ -1,9 +1,51 @@
#include <stdio.h>
#include <errno.h>
#include <stdarg.h>
#include <console.h>

#include <yaffs_osglue.h>

/* TODO */

unsigned int yaffs_trace_mask;

void yaffsfs_Lock(void)
{
}

void yaffsfs_Unlock(void)
{
}

u32 yaffsfs_CurrentTime(void)
{
return 0;
}

void yaffsfs_SetError(int err)
{
errno = err;
}

int yaffsfs_GetLastError(void)
{
return errno;
}

void *yaffsfs_malloc(size_t size)
{
return NULL;
}

void yaffsfs_free(void *ptr)
{
}

void yaffs_bug_fn(const char *file_name, int line_no)
{
}


FILE *stdin;
FILE *stdout;
FILE *stderr;
4 changes: 2 additions & 2 deletions libyaffs2/Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
MISPDIR=..
include $(MISPDIR)/common.mak

CFLAGS+=-include $(YAFFSDIR)/direct/yportenv.h -I$(YAFFSDIR)/direct -I$(YAFFSDIR)
CFLAGS+=-include $(M2DIR)/software/include/base/errno.h -include $(YAFFSDIR)/direct/yportenv.h -I$(YAFFSDIR)/direct -I$(YAFFSDIR)
CFLAGS+=-DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_DEFINES_TYPES -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES

OBJECTS=yaffs_ecc.o yaffs_guts.o yaffs_packedtags1.o yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o yaffs_checkptrw.o yaffs_nameval.o yaffs_attribs.o yaffs_allocator.o yaffs_bitmap.o yaffs_yaffs1.o yaffs_yaffs2.o yaffs_verify.o yaffs_summary.o
OBJECTS+=yaffs_hweight.o yaffs_qsort.o
OBJECTS+=yaffs_hweight.o yaffs_qsort.o yaffsfs.o

all: libyaffs2.a