diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-23 15:48:26 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-23 15:48:26 +0000 |
commit | a5d6df7b093a3f6cb0744527544ba69b10cb56e1 (patch) | |
tree | 4204a5b2e005576bc50ebf40111cdcbf11b01b68 /nuttx/arch/z16/src/z16f | |
parent | 4f21934e7a6b37606101519d79d4bf2e1f2d8bc3 (diff) | |
download | px4-nuttx-a5d6df7b093a3f6cb0744527544ba69b10cb56e1.tar.gz px4-nuttx-a5d6df7b093a3f6cb0744527544ba69b10cb56e1.tar.bz2 px4-nuttx-a5d6df7b093a3f6cb0744527544ba69b10cb56e1.zip |
Fixes for clean(er) compilation
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@558 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/z16/src/z16f')
-rw-r--r-- | nuttx/arch/z16/src/z16f/chip.h | 12 | ||||
-rw-r--r-- | nuttx/arch/z16/src/z16f/z16f_irq.c | 25 | ||||
-rw-r--r-- | nuttx/arch/z16/src/z16f/z16f_timerisr.c | 4 |
3 files changed, 21 insertions, 20 deletions
diff --git a/nuttx/arch/z16/src/z16f/chip.h b/nuttx/arch/z16/src/z16f/chip.h index 095c09069..2bea4d075 100644 --- a/nuttx/arch/z16/src/z16f/chip.h +++ b/nuttx/arch/z16/src/z16f/chip.h @@ -438,12 +438,12 @@ /* Register access macros ***********************************************************/ #ifndef __ASSEMBLY__ -# define getreg8(a) (*(ubyte volatile near*)((a) & 0xffff)) -# define putreg8(v,a) (*(ubyte volatile near*)((a) & 0xffff) = (v)) -# define getreg16(a) (*(uint16 volatile near*)((a) & 0xffff)) -# define putreg16(v,a) (*(uint16 volatile near*)((a) & 0xffff) = (v)) -# define getreg32(a) (*(uint32 volatile near*)((a) & 0xffff)) -# define putreg32(v,a) (*(uint32 volatile near*)((a) & 0xffff) = (v)) +# define getreg8(a) (*(ubyte volatile _Near*)((a) & 0xffff)) +# define putreg8(v,a) (*(ubyte volatile _Near*)((a) & 0xffff) = (v)) +# define getreg16(a) (*(uint16 volatile _Near*)((a) & 0xffff)) +# define putreg16(v,a) (*(uint16 volatile _Near*)((a) & 0xffff) = (v)) +# define getreg32(a) (*(uint32 volatile _Near*)((a) & 0xffff)) +# define putreg32(v,a) (*(uint32 volatile _Near*)((a) & 0xffff) = (v)) #endif /* __ASSEMBLY__ */ /************************************************************************************ diff --git a/nuttx/arch/z16/src/z16f/z16f_irq.c b/nuttx/arch/z16/src/z16f/z16f_irq.c index f5335af15..485b482fa 100644 --- a/nuttx/arch/z16/src/z16f/z16f_irq.c +++ b/nuttx/arch/z16/src/z16f/z16f_irq.c @@ -41,6 +41,7 @@ #include <sys/types.h> #include <nuttx/irq.h> +#include <arch/irq.h> #include "chip/chip.h" #include "os_internal.h" @@ -113,15 +114,15 @@ void up_disable_irq(int irq) if (irq < Z16F_IRQ_IRQ1) { - putreg8((getreg8(Z16F_IRQ0_ENH) & ~Z16_IRQ0_BIT(irq)), Z16F_IRQ0_ENH); + putreg8((getreg8(Z16F_IRQ0_ENH) & ~Z16F_IRQ0_BIT(irq)), Z16F_IRQ0_ENH); } else if (irq < Z16F_IRQ_IRQ2) { - putreg8((getreg8(Z16F_IRQ1_ENH) & ~Z16_IRQ1_BIT(irq)), Z16F_IRQ1_ENH); + putreg8((getreg8(Z16F_IRQ1_ENH) & ~Z16F_IRQ1_BIT(irq)), Z16F_IRQ1_ENH); } else if (irq < NR_IRQS) { - putreg8((getreg8(Z16F_IRQ2_ENH) & ~Z16_IRQ2_BIT(irq)), Z16F_IRQ2_ENH); + putreg8((getreg8(Z16F_IRQ2_ENH) & ~Z16F_IRQ2_BIT(irq)), Z16F_IRQ2_ENH); } } } @@ -146,15 +147,15 @@ void up_enable_irq(int irq) if (irq < Z16F_IRQ_IRQ1) { - putreg8((getreg8(Z16F_IRQ0_ENH) | Z16_IRQ0_BIT(irq)), Z16F_IRQ0_ENH); + putreg8((getreg8(Z16F_IRQ0_ENH) | Z16F_IRQ0_BIT(irq)), Z16F_IRQ0_ENH); } else if (irq < Z16F_IRQ_IRQ2) { - putreg8((getreg8(Z16F_IRQ1_ENH) | Z16_IRQ1_BIT(irq)), Z16F_IRQ1_ENH); + putreg8((getreg8(Z16F_IRQ1_ENH) | Z16F_IRQ1_BIT(irq)), Z16F_IRQ1_ENH); } else if (irq < NR_IRQS) { - putreg8((getreg8(Z16F_IRQ2_ENH) | Z16_IRQ2_BIT(irq)), Z16F_IRQ2_ENH); + putreg8((getreg8(Z16F_IRQ2_ENH) | Z16F_IRQ2_BIT(irq)), Z16F_IRQ2_ENH); } } } @@ -180,18 +181,18 @@ void up_maskack_irq(int irq) if (irq < Z16F_IRQ_IRQ1) { - putreg8((getreg8(Z16F_IRQ0_ENH) & ~Z16_IRQ0_BIT(irq)), Z16F_IRQ0_ENH); - putreg8(Z16_IRQ0_BIT(irq), Z16F_IRQ0); + putreg8((getreg8(Z16F_IRQ0_ENH) & ~Z16F_IRQ0_BIT(irq)), Z16F_IRQ0_ENH); + putreg8(Z16F_IRQ0_BIT(irq), Z16F_IRQ0); } else if (irq < Z16F_IRQ_IRQ2) { - putreg8((getreg8(Z16F_IRQ1_ENH) & ~Z16_IRQ1_BIT(irq)), Z16F_IRQ1_ENH); - putreg8(Z16_IRQ1_BIT(irq), Z16F_IRQ2); + putreg8((getreg8(Z16F_IRQ1_ENH) & ~Z16F_IRQ1_BIT(irq)), Z16F_IRQ1_ENH); + putreg8(Z16F_IRQ1_BIT(irq), Z16F_IRQ2); } else if (irq < NR_IRQS) { - putreg8((getreg8(Z16F_IRQ2_ENH) & ~Z16_IRQ2_BIT(irq)), Z16F_IRQ2_ENH); - putreg8(Z16_IRQ2_BIT(irq), Z16F_IRQ2); + putreg8((getreg8(Z16F_IRQ2_ENH) & ~Z16F_IRQ2_BIT(irq)), Z16F_IRQ2_ENH); + putreg8(Z16F_IRQ2_BIT(irq), Z16F_IRQ2); } } } diff --git a/nuttx/arch/z16/src/z16f/z16f_timerisr.c b/nuttx/arch/z16/src/z16f/z16f_timerisr.c index 78d1b51d2..37e834589 100644 --- a/nuttx/arch/z16/src/z16f/z16f_timerisr.c +++ b/nuttx/arch/z16/src/z16f/z16f_timerisr.c @@ -101,7 +101,7 @@ void up_timerinit(void) /* Disable the timer and configure for divide by 1 and continuous mode. */ - putreg16( Z16F_TIMERSCTL1_DIV1 | Z16F_TIMERSCTL1_CONT); + putreg8( Z16F_TIMERSCTL1_DIV1 | Z16F_TIMERSCTL1_CONT, Z16F_TIMER0_CTL1); /* Assign an intial timer value */ @@ -123,7 +123,7 @@ void up_timerinit(void) /* Enable the timer */ - putreg8((getret8(Z16F_TIMER0_CTL1) |= Z16F_TIMERCTL1_TEN), Z16F_TIMER0_CTL1); + putreg8((getreg8(Z16F_TIMER0_CTL1) | Z16F_TIMERCTL1_TEN), Z16F_TIMER0_CTL1); /* Set the timer priority */ |