Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / drivers / ao_ms5607.h

diff --git a/src/drivers/ao_ms5607.h b/src/drivers/ao_ms5607.h
index b2f98a59d9677397fa60e6a0fa42b94c5c6a8ded..322cc4684a292ddba5bf9e9cc667b1a38237f06a 100644 (file)
--- a/src/drivers/ao_ms5607.h
+++ b/src/drivers/ao_ms5607.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -57,6 +58,7 @@ struct ao_ms5607_value {
 };
 
 extern struct ao_ms5607_sample ao_ms5607_current;
+extern struct ao_ms5607_prom   ao_ms5607_prom;
 
 void
 ao_ms5607_setup(void);
@@ -71,9 +73,7 @@ void
 ao_ms5607_sample(struct ao_ms5607_sample *sample);
 
 void
-ao_ms5607_convert(struct ao_ms5607_sample *sample, struct ao_ms5607_value *value);
-
-void
-ao_ms5607_get_prom(struct ao_ms5607_prom *prom);
+ao_ms5607_convert(struct ao_ms5607_sample *sample,
+                 struct ao_ms5607_value *value);
 
 #endif /* _AO_MS5607_H_ */