diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-01 16:12:09 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-01 16:12:09 +0000 |
commit | 4915733091314a804c5d8884f04905a3dcc80c2d (patch) | |
tree | 82bf0badcb885c32b66b08b0e9f0462e4b87b150 /nuttx/configs | |
parent | 8e38ca30376833c609d8364e3db8e4d607b36422 (diff) | |
download | px4-nuttx-4915733091314a804c5d8884f04905a3dcc80c2d.tar.gz px4-nuttx-4915733091314a804c5d8884f04905a3dcc80c2d.tar.bz2 px4-nuttx-4915733091314a804c5d8884f04905a3dcc80c2d.zip |
Added ST71x system timer logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1115 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/olimex-strp711/ostest/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/olimex-strp711/src/up_buttons.c | 6 | ||||
-rw-r--r-- | nuttx/configs/olimex-strp711/src/up_leds.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig index e310f54fe..1ff1ad1c0 100644 --- a/nuttx/configs/olimex-strp711/ostest/defconfig +++ b/nuttx/configs/olimex-strp711/ostest/defconfig @@ -108,7 +108,7 @@ CONFIG_STR71X_BSPI1=n CONFIG_STR71X_HDLC=n CONFIG_STR71X_XTI=n CONFIG_STR71X_GPIO0=y -CONFIG_STR71X_GPIO1=n +CONFIG_STR71X_GPIO1=y CONFIG_STR71X_GPIO2=n CONFIG_STR71X_ADC12=n CONFIG_STR71X_CKOUT=n diff --git a/nuttx/configs/olimex-strp711/src/up_buttons.c b/nuttx/configs/olimex-strp711/src/up_buttons.c index 2ee386daa..108a5831c 100644 --- a/nuttx/configs/olimex-strp711/src/up_buttons.c +++ b/nuttx/configs/olimex-strp711/src/up_buttons.c @@ -82,15 +82,15 @@ void up_buttoninit(void) /* Configure the GPIO pins as inputs */ reg16 = getreg16(STR71X_GPIO1_PC0); - reg16 |= STR71X_BOTHBUTTONS_GPIO1 + reg16 |= STR71X_BOTHBUTTONS_GPIO1; putreg16(reg16, STR71X_GPIO1_PC0); reg16 = getreg16(STR71X_GPIO1_PC1); - reg16 &= ~STR71X_BOTHBUTTONS_GPIO1 + reg16 &= ~STR71X_BOTHBUTTONS_GPIO1; putreg16(reg16, STR71X_GPIO1_PC1); reg16 = getreg16(STR71X_GPIO1_PC2); - reg16 &= ~STR71X_BOTHBUTTONS_GPIO1 + reg16 &= ~STR71X_BOTHBUTTONS_GPIO1; putreg16(reg16, STR71X_GPIO1_PC2); } diff --git a/nuttx/configs/olimex-strp711/src/up_leds.c b/nuttx/configs/olimex-strp711/src/up_leds.c index 873994c68..a5719d5f9 100644 --- a/nuttx/configs/olimex-strp711/src/up_leds.c +++ b/nuttx/configs/olimex-strp711/src/up_leds.c @@ -106,21 +106,21 @@ void up_ledinit(void) /* Set normal function output */ reg16 = getreg16(STR71X_GPIO1_PC0); - reg16 |= STR71X_LEDGPIO1_BITS + reg16 |= STR71X_LEDGPIO1_BITS; putreg16(reg16, STR71X_GPIO1_PC0); reg16 = getreg16(STR71X_GPIO1_PC1); - reg16 &= ~STR71X_LEDGPIO1_BITS + reg16 &= ~STR71X_LEDGPIO1_BITS; putreg16(reg16, STR71X_GPIO1_PC1); reg16 = getreg16(STR71X_GPIO1_PC2); - reg16 |= STR71X_LEDGPIO1_BITS + reg16 |= STR71X_LEDGPIO1_BITS; putreg16(reg16, STR71X_GPIO1_PC2); /* Clear the LEDs (1 clears; 0 sets) */ reg16 = getreg16(STR71X_GPIO1_PD); - reg16 |= STR71X_LEDGPIO1_BITS + reg16 |= STR71X_LEDGPIO1_BITS; putreg16(reg16, STR71X_GPIO1_PD); } |