Date:2010-11-03 14:21:22 (13 years 4 months ago)
Author:Werner Almesberger
Commit:188bdb892b29444982042a4944f697585864af20
Message:Support design version 2 in the boot loader.

- cntr/fw/common/io.h (LED): define version-specific LED pins
- cntr/fw/common/io.h (PROBE_TERM): describe how the role differs between
version 1 and 2
- cntr/fw/common/config.h (PLATFORM_ENTER, PLATFORM_EXIT): add the version
2 LED
Files: cntr/fw/common/config.h (1 diff)
cntr/fw/common/io.h (2 diffs)

Change Details

cntr/fw/common/config.h
3535 */
3636
3737#define PLATFORM_ENTER \
38    LED_MODE |= 1 << LED_BIT; \
39    XBR1 = XBARE;
38    LEDv1_MODE |= 1 << LEDv1_BIT; \
39    LEDv2_MODE |= 1 << LEDv2_BIT; \
40    XBR1 = XBARE
4041
4142
4243/*
4344 * Turn off the LED when we exit the boot loader.
4445 */
4546
46#define PLATFORM_EXIT \
47    LED = 0
47#define PLATFORM_EXIT \
48    LEDv1 = 0; \
49    LEDv2 = 0
4850
4951
5052/* ----- Application configuration ----------------------------------------- */
cntr/fw/common/io.h
1616
1717/* Diagnostic LED */
1818
19#define LED P1_3
19#define LEDv1 P1_3
20#define LEDv2 P2_2
2021
2122/* Probe input */
2223
...... 
2425#define PROBE_ECI P1_1
2526#define PROBE_INT0 P0_7
2627
27/* Probe termination */
28/*
29 * Probe termination
30 *
31 * - v1: 100 kOhm termination (not very useful)
32 * - v2: pull-up for input amplifier
33 */
2834
2935#define PROBE_TERM P1_2
3036

Archive Download the corresponding diff file



interactive