Switch from GPLv2 to GPLv2+

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

diff --git a/src/drivers/ao_ms5607.h b/src/drivers/ao_ms5607.h
index e9c364d900917f7149289e43182b3e930e035cfa..18f99bf8928867c0d7802667fa3ba4fa1c0cfd1a 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
@@ -56,19 +57,23 @@ struct ao_ms5607_value {
        int32_t         temp;   /* in °C * 100 */
 };
 
+extern __xdata struct ao_ms5607_sample ao_ms5607_current;
+extern __xdata struct ao_ms5607_prom   ao_ms5607_prom;
+
 void
-ao_ms5607_init(void);
+ao_ms5607_setup(void);
 
 void
-ao_ms5607_info(void);
+ao_ms5607_init(void);
 
 void
-ao_ms5607_sample(struct ao_ms5607_sample *sample);
+ao_ms5607_info(void);
 
 void
-ao_ms5607_convert(struct ao_ms5607_sample *sample, struct ao_ms5607_value *value);
+ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample);
 
 void
-ao_ms5607_get_prom(struct ao_ms5607_prom *prom);
+ao_ms5607_convert(__xdata struct ao_ms5607_sample *sample,
+                 __xdata struct ao_ms5607_value *value);
 
 #endif /* _AO_MS5607_H_ */