Removed 2nd parameter to assertion and check macros.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6122 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 7 insertions, 8 deletions

diff --git a/os/hal/src/adc.c b/os/hal/src/adc.c
index ccc11574a..e6d8d8075 100644
--- a/os/hal/src/adc.c
+++ b/os/hal/src/adc.c
@@ -102,7 +102,7 @@ void adcStart(ADCDriver *adcp, const ADCConfig *config) {
 

   osalSysLock();

   osalDbgAssert((adcp->state == ADC_STOP) || (adcp->state == ADC_READY),

-                "adcStart(), #1", "invalid state");

+                "invalid state");

   adcp->config = config;

   adc_lld_start(adcp);

   adcp->state = ADC_READY;

@@ -122,7 +122,7 @@ void adcStop(ADCDriver *adcp) {
 

   osalSysLock();

   osalDbgAssert((adcp->state == ADC_STOP) || (adcp->state == ADC_READY),

-                "adcStop(), #1", "invalid state");

+                "invalid state");

   adc_lld_stop(adcp);

   adcp->state = ADC_STOP;

   osalSysUnlock();

@@ -183,7 +183,7 @@ void adcStartConversionI(ADCDriver *adcp,
   osalDbgAssert((adcp->state == ADC_READY) ||

                 (adcp->state == ADC_COMPLETE) ||

                 (adcp->state == ADC_ERROR),

-                "adcStartConversionI(), #1", "not ready");

+                "not ready");

 

   adcp->samples  = samples;

   adcp->depth    = depth;

@@ -207,9 +207,8 @@ void adcStopConversion(ADCDriver *adcp) {
   osalDbgCheck(adcp != NULL);

 

   osalSysLock();

-  osalDbgAssert((adcp->state == ADC_READY) ||

-                (adcp->state == ADC_ACTIVE),

-                "adcStopConversion(), #1", "invalid state");

+  osalDbgAssert((adcp->state == ADC_READY) || (adcp->state == ADC_ACTIVE),

+                "invalid state");

   if (adcp->state != ADC_READY) {

     adc_lld_stop_conversion(adcp);

     adcp->grpp  = NULL;

@@ -236,7 +235,7 @@ void adcStopConversionI(ADCDriver *adcp) {
   osalDbgAssert((adcp->state == ADC_READY) ||

                 (adcp->state == ADC_ACTIVE) ||

                 (adcp->state == ADC_COMPLETE),

-                "adcStopConversionI(), #1", "invalid state");

+                "invalid state");

 

   if (adcp->state != ADC_READY) {

     adc_lld_stop_conversion(adcp);

@@ -277,7 +276,7 @@ msg_t adcConvert(ADCDriver *adcp,
   msg_t msg;

 

   osalSysLock();

-  osalDbgAssert(adcp->thread == NULL, "adcConvert(), #1", "already waiting");

+  osalDbgAssert(adcp->thread == NULL, "already waiting");

   adcStartConversionI(adcp, grpp, samples, depth);

   msg = osalThreadSuspendS(&adcp->thread);

   osalSysUnlock();