Browse Source

AP_HAL: fixed argv declaration to match getopt()

mission-4.1.18
Andrew Tridgell 12 years ago
parent
commit
e10e3ee3be
  1. 2
      libraries/AP_HAL/HAL.h
  2. 2
      libraries/AP_HAL_AVR/HAL_AVR.cpp
  3. 2
      libraries/AP_HAL_AVR/HAL_AVR.h
  4. 2
      libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.cpp
  5. 2
      libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.h
  6. 2
      libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.cpp
  7. 2
      libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.h

2
libraries/AP_HAL/HAL.h

@ -42,7 +42,7 @@ public: @@ -42,7 +42,7 @@ public:
scheduler(_scheduler)
{}
virtual void init(int argc, const char *argv[]) const = 0;
virtual void init(int argc, char * const argv[]) const = 0;
AP_HAL::UARTDriver* uartA;
AP_HAL::UARTDriver* uartB;

2
libraries/AP_HAL_AVR/HAL_AVR.cpp

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
#include "HAL_AVR.h"
using namespace AP_HAL_AVR;
void HAL_AVR::init(int argc, const char *argv[]) const {
void HAL_AVR::init(int argc, char * const argv[]) const {
scheduler->init((void*)&isr_registry);

2
libraries/AP_HAL_AVR/HAL_AVR.h

@ -31,7 +31,7 @@ public: @@ -31,7 +31,7 @@ public:
_console, _gpio, _rcin,
_rcout, _scheduler) {}
void init(int argc, const char *argv[]) const;
void init(int argc, char * const argv[]) const;
AP_HAL_AVR::ISRRegistry isr_registry;
};
#endif // __AP_HAL_AVR_HAL_AVR_H__

2
libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.cpp

@ -50,7 +50,7 @@ HAL_AVR_APM1::HAL_AVR_APM1() : @@ -50,7 +50,7 @@ HAL_AVR_APM1::HAL_AVR_APM1() :
&avrScheduler )
{}
void HAL_AVR_APM1::init(int argc, const char *argv[]) const {
void HAL_AVR_APM1::init(int argc, char * const argv[]) const {
scheduler->init((void*)&isrRegistry);

2
libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.h

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
class HAL_AVR_APM1 : public AP_HAL::HAL {
public:
HAL_AVR_APM1();
void init(int argc, const char *argv[]) const;
void init(int argc, char * const argv[]) const;
};
/**

2
libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.cpp

@ -49,7 +49,7 @@ HAL_AVR_APM2::HAL_AVR_APM2() : @@ -49,7 +49,7 @@ HAL_AVR_APM2::HAL_AVR_APM2() :
&avrScheduler )
{}
void HAL_AVR_APM2::init(int argc, const char *argv[]) const {
void HAL_AVR_APM2::init(int argc, char * const argv[]) const {
scheduler->init((void*)&isrRegistry);

2
libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.h

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
class HAL_AVR_APM2 : public AP_HAL::HAL {
public:
HAL_AVR_APM2();
void init(int argc, const char *argv[]) const;
void init(int argc, char * const argv[]) const;
};
/**

Loading…
Cancel
Save