X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.h;h=322cc4684a292ddba5bf9e9cc667b1a38237f06a;hp=206efd64f8c2e8ccf7934ef0441c3bff70f16b78;hb=HEAD;hpb=dcc51bb18985c24fa35bce0dd42ea3d847b960bf

diff --git a/src/drivers/ao_ms5607.h b/src/drivers/ao_ms5607.h
index 206efd64..02350bb0 100644
--- 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
@@ -33,7 +34,7 @@
 #define AO_MS5607_CONVERT_D2_4096	0x58
 
 #define AO_MS5607_ADC_READ		0x00
-#define AO_MS5607_PROM_READ(ad)		(0xA0 | ((ad) << 1))
+#define AO_MS5607_PROM_READ(ad)		(0xA0U | (uint8_t) ((ad) << 1))
 
 struct ao_ms5607_prom {
 	uint16_t	reserved;
@@ -56,7 +57,8 @@ struct ao_ms5607_value {
 	int32_t		temp;	/* in °C * 100 */
 };
 
-extern __xdata struct ao_ms5607_sample	ao_ms5607_current;
+extern struct ao_ms5607_sample	ao_ms5607_current;
+extern struct ao_ms5607_prom	ao_ms5607_prom;
 
 void
 ao_ms5607_setup(void);
@@ -68,13 +70,10 @@ void
 ao_ms5607_info(void);
 
 void
-ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample);
+ao_ms5607_sample(struct ao_ms5607_sample *sample);
 
 void
-ao_ms5607_convert(__xdata struct ao_ms5607_sample *sample,
-		  __xdata struct ao_ms5607_value *value);
-
-void
-ao_ms5607_get_prom(__data struct ao_ms5607_prom *prom);
+ao_ms5607_convert(struct ao_ms5607_sample *sample,
+		  struct ao_ms5607_value *value);
 
 #endif /* _AO_MS5607_H_ */