diff options
| author | henryk <henryk@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2008-03-18 18:40:55 +0000 |
|---|---|---|
| committer | henryk <henryk@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2008-03-18 18:40:55 +0000 |
| commit | 8134c3aa7503615bc142ec177ec175952376a5e0 (patch) | |
| tree | 4bce0ba16d4d9ec912ca05bed6f6135bfc51378a | |
| parent | 68e2814776615ac8b24be5b342016363040fc4e1 (diff) | |
Add new hardware revision, make it the default
git-svn-id: https://svn.openpcd.org:2342/trunk@471 6dc7ffe9-61d6-0310-9af1-9938baff3ed1
| -rw-r--r-- | openpicc/application/main.c | 4 | ||||
| -rw-r--r-- | openpicc/config/board.c | 9 | ||||
| -rw-r--r-- | openpicc/config/board.h | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/openpicc/application/main.c b/openpicc/application/main.c index d9b0ad5..f4ae800 100644 --- a/openpicc/application/main.c +++ b/openpicc/application/main.c @@ -84,7 +84,7 @@ static inline int detect_board(void) if(!pa18 && !pa31) { //vLedInit(); //vLedHaltBlinking(1); - result = OPENPICC_v0_4_p2; + result = OPENPICC_v0_4_karsten; } else if(!pa18 && pa31) { vLedInit(); vLedHaltBlinking(2); @@ -95,7 +95,7 @@ static inline int detect_board(void) pio->PIO_CODR = AT91C_PIO_PA31; pa18 = AT91F_PIO_IsInputSet(pio, AT91C_PIO_PA18); if(!pa18) { - result = OPENPICC_v0_4_p2; + result = OPENPICC_v0_4_karsten; } else { vLedInit(); vLedHaltBlinking(3); diff --git a/openpicc/config/board.c b/openpicc/config/board.c index b730809..48423b9 100644 --- a/openpicc/config/board.c +++ b/openpicc/config/board.c @@ -48,6 +48,15 @@ const struct openpicc_hardware OPENPICC_HARDWARE[] = { AT91C_PIO_PA31, AT91C_PIO_PA30, }, + [OPENPICC_v0_4_karsten] = {OPENPICC_v0_4_karsten, + "OpenPICC v0.4 (Karsten's edition)", + {1, 1, 0,}, + CLOCK_SELECT_CARRIER, + AT91C_PIO_PA5, + AT91C_PIO_PA4, + AT91C_PIO_PA31, + -1, + }, }; const struct openpicc_hardware *OPENPICC; diff --git a/openpicc/config/board.h b/openpicc/config/board.h index 55a965b..0fa6858 100644 --- a/openpicc/config/board.h +++ b/openpicc/config/board.h @@ -59,10 +59,13 @@ enum openpicc_release { * + PLL_LOCK relocated from PA4 to PA5 * + Copy of FRAME routed to PA4 * + Connection between R18 and 3V3 removed, instead R18 is now connected to PA31*/ - OPENPICC_v0_4_p2, /* Enhancement of v0.1p1, Add: + OPENPICC_v0_4_p2, /* Enhancement of v0.4p1, Add: * + CARRIER can be switched from PLL output to original carrier * using PA30 */ + OPENPICC_v0_4_karsten, /* Combination of p1 and p2: + * + Has everything v0.4p1 has + * + CARRIER is fixed to original carrier, PLL ist completely out of the loop*/ }; enum clock_source { CLOCK_SELECT_PLL, |