qi-hardware/ben-wpan
1
0
Fork 0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-11-18 01:49:41 +02:00
Code

Firmware support for CNTR version 3.

Browse Source 
- common/io.h: describe the role of PROBE_TERM in version 3
- common/io.h (VERSION_ID): renamed to VERSION_ID1
- common/io.h (VERSION_ID2): added P2_0, and described version number
  encoding
- cntr/cntr.h (enum hw_type): added HW_TYPE_V3
- cntr/cntr.c (init_io): decode version 3, flash LED three times, and
  configure PROBE_TERM according to version
This commit is contained in:
Werner Almesberger 2010-11-06 17:03:33 -03:00
parent 10b4b51e4f
commit 190e8f0082
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cntr/fw/cntr/cntr.c
View File

@ -22,7 +22,7 @@
uint8_t cntr[4]; uint8_t cntr[4];
enum hw_type hw_type = HW_TYPE_V1; enum hw_type hw_type;
static void delay(unsigned ms) static void delay(unsigned ms)
@ -37,17 +37,22 @@ static void delay(unsigned ms)
static void init_io(void) static void init_io(void)
{ {
if (VERSION_ID) { int i;
/* flash LED a second time */
/* SDCC bug - needs parentheses here */
hw_type = VERSION_ID1 ?
(VERSION_ID2 ? HW_TYPE_V2 : HW_TYPE_V3) :
HW_TYPE_V1;
for (i = HW_TYPE_V1; i != hw_type; i++) {
/* flash LED a second or third time */
LEDv2 = 0; LEDv2 = 0;
delay(250); delay(250);
LEDv2 = 1; LEDv2 = 1;
delay(250); delay(250);
PROBE_TERM_MODE |= 1 << PROBE_TERM_BIT;
hw_type = HW_TYPE_V2;
} }
if (hw_type == HW_TYPE_V2)
PROBE_TERM_MODE |= 1 << PROBE_TERM_BIT;
/* /*
* Signal Mode Value * Signal Mode Value
@ -70,7 +75,7 @@ static void init_io(void)
P2 = 0; P2 = 0;
P3 = 0; P3 = 0;
if (hw_type == HW_TYPE_V2) if (hw_type == HW_TYPE_V2 || hw_type == HW_TYPE_V3)
PROBE_TERM = 1; PROBE_TERM = 1;
/* /*

1
cntr/fw/cntr/cntr.h
View File

@ -25,6 +25,7 @@ extern uint8_t cntr[4];
extern enum hw_type { extern enum hw_type {
HW_TYPE_V1 = 0, HW_TYPE_V1 = 0,
HW_TYPE_V2 = 1, HW_TYPE_V2 = 1,
HW_TYPE_V3 = 2,
} hw_type; } hw_type;
#endif /* !CNTR_H */ #endif /* !CNTR_H */

15
cntr/fw/common/io.h
View File

@ -30,6 +30,7 @@
* *
* - v1: 100 kOhm termination (not very useful) * - v1: 100 kOhm termination (not very useful)
* - v2: pull-up for input amplifier * - v2: pull-up for input amplifier
* - v3: 330 Ohm termination
*/ */
#define PROBE_TERM P1_2 #define PROBE_TERM P1_2
@ -40,8 +41,20 @@
* In version 1, P2_1 is used to provide ground to the input side. In version * In version 1, P2_1 is used to provide ground to the input side. In version
* 2, we use a ground place for this and P2_1 is unconnected. We can therefore * 2, we use a ground place for this and P2_1 is unconnected. We can therefore
* use it to identify the hardware version. * use it to identify the hardware version.
*
* In version 3, P2_0 is connected to ground. In all other versions, it is
* unconnected.
*
* Board VERSION_ID1
* | VERSION_ID2
* | |
* v1 0 Z
* v2 Z Z
* v3 Z 0
*
*/ */
#define VERSION_ID P2_1 #define VERSION_ID1 P2_1
#define VERSION_ID2 P2_0
#endif /* !IO_H */ #endif /* !IO_H */