From 298661aa1c189400f27328fa77d5b3a10f1ba3ef Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Tue, 12 Apr 2011 15:50:18 -0400
Subject: Reverting some "volatile" -> "__io" changes.

See https://github.com/leaflabs/libmaple/commit/c57d760676b97a0fc9cb51db99c8400bae2cb3b7#commitcomment-338822
---
 libmaple/i2c.h         | 2 +-
 libmaple/ring_buffer.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libmaple/i2c.h b/libmaple/i2c.h
index 07ee260..394fd57 100644
--- a/libmaple/i2c.h
+++ b/libmaple/i2c.h
@@ -66,7 +66,7 @@ typedef struct i2c_dev {
     uint8 clk_line;
     uint8 ev_nvic_line;
     uint8 er_nvic_line;
-    __io uint8 state;
+    volatile uint8 state;
     uint16 msgs_left;
     i2c_msg *msg;
 } i2c_dev;
diff --git a/libmaple/ring_buffer.h b/libmaple/ring_buffer.h
index 04f6499..2536617 100644
--- a/libmaple/ring_buffer.h
+++ b/libmaple/ring_buffer.h
@@ -51,7 +51,7 @@ extern "C"{
  *
  * One byte is left free to distinguish empty from full. */
 typedef struct ring_buffer {
-    __io uint8 *buf;     /**< Buffer items are stored into */
+    volatile uint8 *buf; /**< Buffer items are stored into */
     uint16 head;         /**< Index of the next item to remove */
     uint16 tail;         /**< Index where the next item will get inserted */
     uint16 size;         /**< Buffer capacity minus one */
-- 
cgit v1.2.3