diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-17 21:15:31 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-17 21:15:31 +0000 |
commit | 5a0722f9d657233ed85bdcf75a9a14ea321a1a28 (patch) | |
tree | 3ce9d8153ebbd5259472394eca8ef369cfcfd455 /nuttx/sched | |
parent | d8ee4cfaf8afacfe8ff455900ed391af4f642888 (diff) | |
download | px4-nuttx-5a0722f9d657233ed85bdcf75a9a14ea321a1a28.tar.gz px4-nuttx-5a0722f9d657233ed85bdcf75a9a14ea321a1a28.tar.bz2 px4-nuttx-5a0722f9d657233ed85bdcf75a9a14ea321a1a28.zip |
Straighten out conditional compilation
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1896 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched')
-rw-r--r-- | nuttx/sched/sched_releasetcb.c | 2 | ||||
-rw-r--r-- | nuttx/sched/wd_internal.h | 2 | ||||
-rw-r--r-- | nuttx/sched/wd_start.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/sched/sched_releasetcb.c b/nuttx/sched/sched_releasetcb.c index 35821b597..567db2021 100644 --- a/nuttx/sched/sched_releasetcb.c +++ b/nuttx/sched/sched_releasetcb.c @@ -137,7 +137,7 @@ int sched_releasetcb(FAR _TCB *tcb) /* Delete the tasks's allocated DSpace region (external modules only) */ -#ifdef CONFIG_NXFLAT +#ifdef CONFIG_PIC if (tcb->picbase) { sched_free(tcb->picbase); diff --git a/nuttx/sched/wd_internal.h b/nuttx/sched/wd_internal.h index 581f0c5da..216d82079 100644 --- a/nuttx/sched/wd_internal.h +++ b/nuttx/sched/wd_internal.h @@ -65,7 +65,7 @@ struct wdog_s { FAR struct wdog_s *next; /* Support for singly linked lists. */ wdentry_t func; /* Function to execute when delay expires */ -#ifdef CONFIG_NXFLAT +#ifdef CONFIG_PIC FAR void *picbase; /* PIC base address */ #endif int lag; /* Timer associated with the delay */ diff --git a/nuttx/sched/wd_start.c b/nuttx/sched/wd_start.c index d27f066f5..ea9117459 100644 --- a/nuttx/sched/wd_start.c +++ b/nuttx/sched/wd_start.c @@ -158,8 +158,8 @@ STATUS wd_start(WDOG_ID wdog, int delay, wdentry_t wdentry, int argc, ...) /* Save the data in the watchdog structure */ wdog->func = wdentry; /* Function to execute when delay expires */ -#ifdef CONFIG_NXFLAT - wdog->picbase = up_getpicbase(); +#ifdef CONFIG_PIC + up_getpicbase(&wdog->picbase); #endif wdog->argc = argc; |