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: 8239be0
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: 36be79a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 1, 2011

  1. videoin: also accept chip ID 0x19 (7181C)

    Sebastien Bourdeauducq committed Dec 1, 2011
    Copy the full SHA
    d9bee5b View commit details
  2. Merge branch 'master' of github.com:milkymist/autotest-m1

    Sebastien Bourdeauducq committed Dec 1, 2011
    Copy the full SHA
    36be79a View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/tests_videoin.c
4 changes: 2 additions & 2 deletions src/tests_videoin.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Milkymist One automated testing program
* Copyright (C) 2010 Sebastien Bourdeauducq
* Copyright (C) 2010, 2011 Sebastien Bourdeauducq
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ static int decoder_probe()

vin_init();
reg = vin_read_reg(0x11);
if((reg == 0x11) || (reg == 0x13))
if((reg == 0x11) || (reg == 0x13) || (reg == 0x19))
return TEST_STATUS_PASSED;
else {
printf("Unexpected register value: 0x%02x\n", reg);