From: batt Date: Wed, 27 Aug 2008 14:18:16 +0000 (+0000) Subject: Update to new CONFIG_KERN. X-Git-Tag: 2.0.0~208 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=92d5e5f668bb596036e7c4fe674b29448f7ac65d;p=bertos.git Update to new CONFIG_KERN. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1726 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/app/battfs/appconfig.h b/app/battfs/appconfig.h index 5f316bc2..74686264 100644 --- a/app/battfs/appconfig.h +++ b/app/battfs/appconfig.h @@ -95,7 +95,7 @@ * * \sa config_kern.h */ -#define CONFIG_KERNEL 0 +#define CONFIG_KERN 0 /** * \name Serial driver parameters diff --git a/app/randpool/appconfig.h b/app/randpool/appconfig.h index 075857a9..75a16bb1 100644 --- a/app/randpool/appconfig.h +++ b/app/randpool/appconfig.h @@ -151,7 +151,7 @@ * * \sa config_kern.h */ -#define CONFIG_KERNEL 0 +#define CONFIG_KERN 0 /** * \name Serial driver parameters @@ -225,7 +225,7 @@ #define CONFIG_ADC_STROBE 0 /// Enable watchdog timer. -#define CONFIG_WATCHDOG 0 +#define CONFIG_WATCHDOG 0 /// EEPROM type for drv/eeprom.c #define CONFIG_EEPROM_TYPE EEPROM_24XX256 @@ -272,7 +272,7 @@ #define CONFIG_MD2_BLOCK_LEN 16 /// Use standard permutation in MD2 algorithm. -#define CONFIG_MD2_STD_PERM 0 +#define CONFIG_MD2_STD_PERM 0 /// Define a size, in byte, of entropy pool. #define CONFIG_SIZE_ENTROPY_POOL 256 diff --git a/bertos/cpu/arm/drv/adc_at91.c b/bertos/cpu/arm/drv/adc_at91.c index dbeb6117..b385184e 100644 --- a/bertos/cpu/arm/drv/adc_at91.c +++ b/bertos/cpu/arm/drv/adc_at91.c @@ -61,7 +61,7 @@ #include -#if CONFIG_KERNEL +#if CONFIG_KERN #include #include #include @@ -104,7 +104,7 @@ ADC_IER = BV(ADC_DRDY); } -#endif /* CONFIG_KERNEL */ +#endif /* CONFIG_KERN */ /** @@ -129,14 +129,14 @@ INLINE uint16_t adc_hw_read(void) { ASSERT(!(ADC_SR & ADC_EOC_MASK)); - #if CONFIG_KERNEL + #if CONFIG_KERN adc_process = proc_current(); #endif // Start convertion ADC_CR = BV(ADC_START); - #if CONFIG_KERNEL + #if CONFIG_KERN // Ensure IRQs enabled. ASSERT(IRQ_ENABLED()); sig_wait(SIG_ADC_COMPLETE); @@ -193,7 +193,7 @@ INLINE void adc_hw_init(void) ADC_MR |= ((ADC_COMPUTED_SHTIME << ADC_SHTIME_SHIFT) & ADC_SHTIME_MASK); LOG_INFO("shtime[%ld]\n", (ADC_COMPUTED_SHTIME << ADC_SHTIME_SHIFT) & ADC_SHTIME_MASK); - #if CONFIG_KERNEL + #if CONFIG_KERN //Register and enable irq for adc. adc_enable_irq(); #endif diff --git a/bertos/cpu/avr/drv/adc_avr.c b/bertos/cpu/avr/drv/adc_avr.c index fd8525d6..942345a7 100644 --- a/bertos/cpu/avr/drv/adc_avr.c +++ b/bertos/cpu/avr/drv/adc_avr.c @@ -51,7 +51,7 @@ #define ADC_AVR_AVCC 1 #define ADC_AVR_INT256 2 -#if CONFIG_KERNEL +#if CONFIG_KERN #include #include #include @@ -75,7 +75,7 @@ { sig_signal(adc_process, SIG_ADC_COMPLETE); } -#endif /* CONFIG_KERNEL */ +#endif /* CONFIG_KERN */ /** * Select mux channel \a ch. @@ -104,7 +104,7 @@ INLINE uint16_t adc_hw_read(void) // Start convertion ADCSRA |= BV(ADSC); - #if CONFIG_KERNEL + #if CONFIG_KERN // Ensure IRQs enabled. ASSERT(IRQ_ENABLED()); adc_process = proc_current(); @@ -143,11 +143,11 @@ INLINE void adc_hw_init(void) /* Disable Auto trigger source: ADC in Free running mode. */ ADCSRB = 0; - + /* Enable ADC, disable autotrigger mode. */ ADCSRA = BV(ADEN); - #if CONFIG_KERNEL + #if CONFIG_KERN MOD_CHECK(proc); ADCSRA |= BV(ADIE); #endif diff --git a/bertos/drv/dataflash_test.c b/bertos/drv/dataflash_test.c index 276f9f43..fa808558 100644 --- a/bertos/drv/dataflash_test.c +++ b/bertos/drv/dataflash_test.c @@ -114,8 +114,8 @@ int dataflash_testSetUp(void) LOG_INFO("KFILE setup..ok\n"); LOG_INFO("Check if kernel is enable (if enable you should see the assert message.)\n"); - SILENT_ASSERT("bertos/drv/dataflash_test.c:119: Assertion failed: !CONFIG_KERNEL"); - ASSERT(!CONFIG_KERNEL); + SILENT_ASSERT("bertos/drv/dataflash_test.c:119: Assertion failed: !CONFIG_KERN"); + ASSERT(!CONFIG_KERN); /* * This test use a kfile_test module, @@ -208,7 +208,7 @@ int main(void) IRQ_ENABLE; kdbg_init(); - #if CONFIG_KERNEL + #if CONFIG_KERN proc_init(); #endif diff --git a/bertos/drv/lcd_text.c b/bertos/drv/lcd_text.c index 9bff9bb5..3423eda6 100644 --- a/bertos/drv/lcd_text.c +++ b/bertos/drv/lcd_text.c @@ -54,15 +54,15 @@ /** Maximum number of layers. */ #define LCD_LAYERS 6 -#if CONFIG_KERNEL +#if CONFIG_KERN /** Semaphore to arbitrate access to the display. */ static struct Semaphore lcd_semaphore; #define LOCK_LCD sem_obtain(&lcd_semaphore) #define UNLOCK_LCD sem_release(&lcd_semaphore) -#else /* !CONFIG_KERNEL */ +#else /* !CONFIG_KERN */ #define LOCK_LCD do {} while (0) #define UNLOCK_LCD do {} while (0) -#endif /* !CONFIG_KERNEL */ +#endif /* !CONFIG_KERN */ DECLARE_LIST_TYPE(Layer); @@ -91,7 +91,7 @@ void lcd_setAddr(Layer *layer, lcdpos_t addr) layer->addr = addr; } -#if CONFIG_KERNEL +#if CONFIG_KERN void lcd_lock(void) { @@ -104,7 +104,7 @@ void lcd_unlock(void) UNLOCK_LCD; } -#endif /* CONFIG_KERNEL */ +#endif /* CONFIG_KERN */ /** diff --git a/bertos/drv/ser.c b/bertos/drv/ser.c index 60b1b749..f0f06ddd 100644 --- a/bertos/drv/ser.c +++ b/bertos/drv/ser.c @@ -69,7 +69,7 @@ * Sanity check for config parameters required by this module. */ #if !defined(CONFIG_KERN) || ((CONFIG_KERN != 0) && CONFIG_KERN != 1) - #error CONFIG_KERNEL must be set to either 0 or 1 in cfg_kern.h + #error CONFIG_KERN must be set to either 0 or 1 in cfg_kern.h #endif #if !defined(CONFIG_SER_RXTIMEOUT) #error CONFIG_SER_TXTIMEOUT missing in cfg_ser.h