diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-12 09:34:41 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-12 09:34:41 +0100 |
| commit | b750a588a077c473685ed4115c93907a92867bf1 (patch) | |
| tree | f307650c7875b86fbbf2915fde8cd9ea519a0a00 /apps/drivers/px4io/uploader.h | |
| parent | 163257f3bd4ebe13f6f3eda537793602035baf28 (diff) | |
| parent | ab44a64ca01f35d9f9777d18a01ff9f35996fbf2 (diff) | |
| download | px4-firmware-b750a588a077c473685ed4115c93907a92867bf1.tar.gz px4-firmware-b750a588a077c473685ed4115c93907a92867bf1.tar.bz2 px4-firmware-b750a588a077c473685ed4115c93907a92867bf1.zip | |
Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c
Diffstat (limited to 'apps/drivers/px4io/uploader.h')
| -rw-r--r-- | apps/drivers/px4io/uploader.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/drivers/px4io/uploader.h b/apps/drivers/px4io/uploader.h index b8a3a2794..915ee9259 100644 --- a/apps/drivers/px4io/uploader.h +++ b/apps/drivers/px4io/uploader.h @@ -85,7 +85,7 @@ private: void log(const char *fmt, ...); - int recv(uint8_t &c, unsigned timeout = 1000); + int recv(uint8_t &c, unsigned timeout); int recv(uint8_t *p, unsigned count); void drain(); int send(uint8_t c); @@ -94,11 +94,10 @@ private: int sync(); int get_info(int param, uint32_t &val); int erase(); - int program(); - int verify_rev2(); - int verify_rev3(); + int program(size_t fw_size); + int verify_rev2(size_t fw_size); + int verify_rev3(size_t fw_size); int reboot(); - int compare(bool &identical); }; -#endif
\ No newline at end of file +#endif |