diff options
author | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:42:53 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:42:53 +1000 |
commit | 0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478 (patch) | |
tree | 3dc625e7dfcfc620e83827ccd18423be1b5334f4 /src/gadc | |
parent | fcbb66a9394eaf4059bc942df6729b4b55a057d8 (diff) | |
download | uGFX-0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478.tar.gz uGFX-0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478.tar.bz2 uGFX-0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478.zip |
Rename lots of files to help prevent compile time name conflicts.
Diffstat (limited to 'src/gadc')
-rw-r--r-- | src/gadc/gadc_gadc.c (renamed from src/gadc/gadc.c) | 4 | ||||
-rw-r--r-- | src/gadc/sys_make.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gadc/gadc.c b/src/gadc/gadc_gadc.c index d307519b..5ac8e53c 100644 --- a/src/gadc/gadc.c +++ b/src/gadc/gadc_gadc.c @@ -6,7 +6,7 @@ */ /** - * @file src/gadc/gadc.c + * @file src/gadc/gadc_gadc.c * @brief GADC sub-system code. * * @addtogroup GADC @@ -17,7 +17,7 @@ #if GFX_USE_GADC /* Include the driver defines */ -#include "src/gadc/driver.h" +#include "driver.h" #if GADC_MAX_HIGH_SPEED_SAMPLERATE > GADC_MAX_SAMPLE_FREQUENCY/2 #error "GADC: GADC_MAX_HIGH_SPEED_SAMPLERATE has been set too high. It must be less than half the maximum CPU rate" diff --git a/src/gadc/sys_make.mk b/src/gadc/sys_make.mk index 05b1e9cc..21a07dbe 100644 --- a/src/gadc/sys_make.mk +++ b/src/gadc/sys_make.mk @@ -1 +1 @@ -GFXSRC += $(GFXLIB)/src/gadc/gadc.c +GFXSRC += $(GFXLIB)/src/gadc/gadc_gadc.c |