diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-01-24 14:11:01 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-01-24 14:11:01 +0000 |
| commit | 1b9ed43ffceb80d38a15556c69739d1be87c91af (patch) | |
| tree | 3af4ef9c41b74016fde4ba0bfc25da0069556367 /os | |
| parent | feaff06e8b4516db9a40f0fdd9492d711522496b (diff) | |
| download | ChibiOS-1b9ed43ffceb80d38a15556c69739d1be87c91af.tar.gz ChibiOS-1b9ed43ffceb80d38a15556c69739d1be87c91af.tar.bz2 ChibiOS-1b9ed43ffceb80d38a15556c69739d1be87c91af.zip | |
Relocated OSALs under the HAL tree, adjusted all makefiles.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6641 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/osal/nil/osal.c (renamed from os/nil/osal/osal.c) | 0 | ||||
| -rw-r--r-- | os/hal/osal/nil/osal.h (renamed from os/nil/osal/osal.h) | 0 | ||||
| -rw-r--r-- | os/hal/osal/nil/osal.mk | 5 | ||||
| -rw-r--r-- | os/hal/osal/rt/osal.c (renamed from os/rt/osal/osal.c) | 0 | ||||
| -rw-r--r-- | os/hal/osal/rt/osal.h (renamed from os/rt/osal/osal.h) | 0 | ||||
| -rw-r--r-- | os/hal/osal/rt/osal.mk | 5 | ||||
| -rw-r--r-- | os/hal/ports/STM32F30x/adc_lld.c | 2 | ||||
| -rw-r--r-- | os/nil/osal/osal.mk | 5 | ||||
| -rw-r--r-- | os/rt/osal/osal.mk | 5 |
9 files changed, 11 insertions, 11 deletions
diff --git a/os/nil/osal/osal.c b/os/hal/osal/nil/osal.c index d2927bc12..d2927bc12 100644 --- a/os/nil/osal/osal.c +++ b/os/hal/osal/nil/osal.c diff --git a/os/nil/osal/osal.h b/os/hal/osal/nil/osal.h index 2c0980ead..2c0980ead 100644 --- a/os/nil/osal/osal.h +++ b/os/hal/osal/nil/osal.h diff --git a/os/hal/osal/nil/osal.mk b/os/hal/osal/nil/osal.mk new file mode 100644 index 000000000..b4872a691 --- /dev/null +++ b/os/hal/osal/nil/osal.mk @@ -0,0 +1,5 @@ +# OSAL files.
+OSALSRC += ${CHIBIOS}/os/hal/osal/nil/osal.c
+
+# Required include directories
+OSALINC += ${CHIBIOS}/os/hal/osal/nil
diff --git a/os/rt/osal/osal.c b/os/hal/osal/rt/osal.c index 52fc27041..52fc27041 100644 --- a/os/rt/osal/osal.c +++ b/os/hal/osal/rt/osal.c diff --git a/os/rt/osal/osal.h b/os/hal/osal/rt/osal.h index c26b9853d..c26b9853d 100644 --- a/os/rt/osal/osal.h +++ b/os/hal/osal/rt/osal.h diff --git a/os/hal/osal/rt/osal.mk b/os/hal/osal/rt/osal.mk new file mode 100644 index 000000000..3d123c986 --- /dev/null +++ b/os/hal/osal/rt/osal.mk @@ -0,0 +1,5 @@ +# OSAL files.
+OSALSRC += ${CHIBIOS}/os/hal/osal/rt/osal.c
+
+# Required include directories
+OSALINC += ${CHIBIOS}/os/hal/osal/rt
diff --git a/os/hal/ports/STM32F30x/adc_lld.c b/os/hal/ports/STM32F30x/adc_lld.c index 26fdcebf1..4be6b56a7 100644 --- a/os/hal/ports/STM32F30x/adc_lld.c +++ b/os/hal/ports/STM32F30x/adc_lld.c @@ -89,7 +89,7 @@ static void adc_lld_vreg_on(ADCDriver *adcp) { #if STM32_ADC_DUAL_MODE
adcp->adcs->CR = ADC_CR_ADVREGEN_0;
#endif
- osalSysPolledDelayX(US2RTC(10));
+ osalSysPolledDelayX(US2RTC(STM32_HCLK, 10));
}
/**
diff --git a/os/nil/osal/osal.mk b/os/nil/osal/osal.mk deleted file mode 100644 index f43560e2d..000000000 --- a/os/nil/osal/osal.mk +++ /dev/null @@ -1,5 +0,0 @@ -# OSAL files.
-OSALSRC += ${CHIBIOS}/os/nil/osal/osal.c
-
-# Required include directories
-OSALINC += ${CHIBIOS}/os/nil/osal
diff --git a/os/rt/osal/osal.mk b/os/rt/osal/osal.mk deleted file mode 100644 index 0c7b70ece..000000000 --- a/os/rt/osal/osal.mk +++ /dev/null @@ -1,5 +0,0 @@ -# OSAL files.
-OSALSRC += ${CHIBIOS}/os/rt/osal/osal.c
-
-# Required include directories
-OSALINC += ${CHIBIOS}/os/rt/osal
|