git.droids-corp.org
/
protos
/
rc_servos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
25c9fe9
)
rc_servos: revert use of registers for global variables
author
Fabrice Desclaux
<serpilliere@droids-corp.org>
Sun, 26 Feb 2012 21:52:40 +0000
(22:52 +0100)
committer
Fabrice Desclaux
<serpilliere@droids-corp.org>
Sun, 26 Feb 2012 21:52:40 +0000
(22:52 +0100)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index
df8fb93
..
d390554
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-21,10
+21,11
@@
static struct servo servo_table[] = {
};
#define NB_SERVO (sizeof(servo_table)/sizeof(*servo_table))
};
#define NB_SERVO (sizeof(servo_table)/sizeof(*servo_table))
-register uint8_t bypass asm("r2");
-register uint8_t done asm("r3");
-register uint8_t portval asm("r4");
-register uint8_t rxidx asm("r5");
+static volatile uint8_t bypass;
+static volatile uint8_t done;
+static volatile uint8_t portval;
+static volatile uint8_t rxidx;
+
#define BYPASS_ENABLE 14
#define BYPASS_DISABLE 15
#define BYPASS_ENABLE 14
#define BYPASS_DISABLE 15
@@
-39,22
+40,22
@@
register uint8_t rxidx asm("r5");
* Command 14 is to enable bypass mode.
* Command 15 is to disable bypass mode.
*/
* Command 14 is to enable bypass mode.
* Command 15 is to disable bypass mode.
*/
-
register
union {
+
static volatile
union {
uint8_t u8;
struct {
uint8_t zero:1;
uint8_t cmd_num:4;
uint8_t val_msb:3;
};
uint8_t u8;
struct {
uint8_t zero:1;
uint8_t cmd_num:4;
uint8_t val_msb:3;
};
-} byte0
asm("r6")
;
+} byte0;
-
register
union {
+
static volatile
union {
uint8_t u8;
struct {
uint8_t one:1;
uint8_t val_lsb:7;
};
uint8_t u8;
struct {
uint8_t one:1;
uint8_t val_lsb:7;
};
-} byte1
asm("r7")
;
+} byte1;
SIGNAL(TIMER1_COMPA_vect)
{
SIGNAL(TIMER1_COMPA_vect)
{