diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-16 16:39:22 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-16 16:39:22 +0000 |
| commit | aa2f5af6f01de0e2083c2c92bc4ae2fedeac847d (patch) | |
| tree | 2e961919bddaa06ec5b876f8ea494078c77e90b5 /os/io/adc.c | |
| parent | b488811f14f65a746ac9e0cdd8d392cd011517e6 (diff) | |
| download | ChibiOS-aa2f5af6f01de0e2083c2c92bc4ae2fedeac847d.tar.gz ChibiOS-aa2f5af6f01de0e2083c2c92bc4ae2fedeac847d.tar.bz2 ChibiOS-aa2f5af6f01de0e2083c2c92bc4ae2fedeac847d.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1309 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/io/adc.c')
| -rw-r--r-- | os/io/adc.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/os/io/adc.c b/os/io/adc.c index d4fb20bab..4072677e0 100644 --- a/os/io/adc.c +++ b/os/io/adc.c @@ -42,9 +42,9 @@ void adcInit(void) { */
void adcObjectInit(ADCDriver *adcp) {
- adcp->adc_state = ADC_STOP;
- adcp->adc_config = NULL;
- chSemInit(&adcp->adc_sem, 0);
+ adcp->ad_state = ADC_STOP;
+ adcp->ad_config = NULL;
+ chSemInit(&adcp->ad_sem, 0);
}
/**
@@ -58,12 +58,12 @@ void adcStart(ADCDriver *adcp, const ADCConfig *config) { chDbgCheck((adcp != NULL) && (config != NULL), "adcStart");
chSysLock();
- chDbgAssert((adcp->adc_state == ADC_STOP) || (adcp->adc_state == ADC_READY),
+ chDbgAssert((adcp->ad_state == ADC_STOP) || (adcp->ad_state == ADC_READY),
"adcStart(), #1",
"invalid state");
- adcp->adc_config = config;
+ adcp->ad_config = config;
adc_lld_start(adcp);
- adcp->adc_state = ADC_READY;
+ adcp->ad_state = ADC_READY;
chSysUnlock();
}
@@ -77,11 +77,11 @@ void adcStop(ADCDriver *adcp) { chDbgCheck(adcp != NULL, "adcStop");
chSysLock();
- chDbgAssert((adcp->adc_state == ADC_STOP) || (adcp->adc_state == ADC_READY),
+ chDbgAssert((adcp->ad_state == ADC_STOP) || (adcp->ad_state == ADC_READY),
"adcStop(), #1",
"invalid state");
adc_lld_stop(adcp);
- adcp->adc_state = ADC_STOP;
+ adcp->ad_state = ADC_STOP;
chSysUnlock();
}
@@ -127,16 +127,16 @@ bool_t adcStartConversion(ADCDriver *adcp, "adcStartConversion");
chSysLock();
- chDbgAssert((adcp->adc_state == ADC_READY) ||
- (adcp->adc_state == ADC_RUNNING),
+ chDbgAssert((adcp->ad_state == ADC_READY) ||
+ (adcp->ad_state == ADC_RUNNING),
"adcStartConversion(), #1",
"invalid state");
- if (adcp->adc_state == ADC_RUNNING) {
+ if (adcp->ad_state == ADC_RUNNING) {
chSysUnlock();
return TRUE;
}
adc_lld_start_conversion(adcp, grpp, samples, depth, callback);
- adcp->adc_state = ADC_RUNNING;
+ adcp->ad_state = ADC_RUNNING;
chSysUnlock();
return FALSE;
}
@@ -151,12 +151,12 @@ void adcStopConversion(ADCDriver *adcp) { chDbgCheck(adcp != NULL, "adcStopConversion");
chSysLock();
- chDbgAssert((adcp->adc_state == ADC_READY) ||
- (adcp->adc_state == ADC_RUNNING),
+ chDbgAssert((adcp->ad_state == ADC_READY) ||
+ (adcp->ad_state == ADC_RUNNING),
"adcStopConversion(), #1",
"invalid state");
adc_lld_stop_conversion(adcp);
- adcp->adc_state = ADC_READY;
+ adcp->ad_state = ADC_READY;
chSysUnlock();
}
@@ -176,12 +176,12 @@ void adcStopConversion(ADCDriver *adcp) { msg_t adcWaitConversion(ADCDriver *adcp, systime_t timeout) {
chSysLock();
- chDbgAssert((adcp->adc_state == ADC_READY) ||
- (adcp->adc_state == ADC_RUNNING),
+ chDbgAssert((adcp->ad_state == ADC_READY) ||
+ (adcp->ad_state == ADC_RUNNING),
"adcWaitConversion(), #1",
"invalid state");
- if (adcp->adc_state == ADC_RUNNING) {
- if (chSemWaitTimeoutS(&adcp->adc_sem, timeout) == RDY_TIMEOUT) {
+ if (adcp->ad_state == ADC_RUNNING) {
+ if (chSemWaitTimeoutS(&adcp->ad_sem, timeout) == RDY_TIMEOUT) {
chSysUnlock();
return RDY_TIMEOUT;
}
|