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/autotest-m1
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 65f51ae
Choose a base ref
...
head repository: m-labs/autotest-m1
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41bafe1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 2, 2011

  1. build depends libs

    Xiangfu Liu committed Sep 2, 2011
    Copy the full SHA
    1e5752a View commit details
  2. tests_videoin: stretch to fullscreen

    Xiangfu Liu committed Sep 2, 2011
    Copy the full SHA
    41bafe1 View commit details
Showing with 7 additions and 3 deletions.
  1. +5 −1 src/Makefile
  2. +2 −2 src/tests_videoin.c
6 changes: 5 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ SEGMENTS= -j .text -j .data -j .rodata

LDFLAGS+= -T linker.ld -N
LDFLAGS+= -L$(MMDIR)/software/libbase -L$(MMDIR)/software/libmath -L$(MMDIR)/software/libnet -L$(MMDIR)/software/libhal
LIBS = -lbase -lmath -lnet -lhal -lbase
LIBS = -lbase -lmath -lnet -lhal

all: boot.bin

@@ -19,6 +19,10 @@ all: boot.bin
$(MMDIR)/tools/mkmmimg $@

boot.elf: linker.ld $(OBJECTS)
make -C ${MMDIR}/software/libbase
make -C ${MMDIR}/software/libmath
make -C ${MMDIR}/software/libnet
make -C ${MMDIR}/software/libhal
$(LD) $(LDFLAGS) $(OBJECTS) -o $@ $(LIBS)
chmod -x $@

4 changes: 2 additions & 2 deletions src/tests_videoin.c
Original file line number Diff line number Diff line change
@@ -91,9 +91,9 @@ static int capture()
}
}
flush_bridge_cache();
for(y=0;y<288;y++)
for(y=0;y<480;y++)
for(x=0;x<640;x++)
fb[640*y+x] = vbuffer[720*y+x];
fb[640*y+x] = vbuffer[720*((int)y/2)+x];
flush_bridge_cache();

status = vin_read_reg(0x10);