From: Jakob Gruber <jakob.gruber@gmail.com>
Date: Thu, 26 Jul 2012 09:23:33 +0000 (+0200)
Subject: twi: Move avr_twi_irq_msg to avr_twi.c
X-Git-Tag: v1.0~47
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=363de56ad82a5dbd9866a8db1b70cd9091ef948f;p=sx%2Fsimavr.git

twi: Move avr_twi_irq_msg to avr_twi.c

This fixes inclusion of avr_twi.h into C++ files.
---

diff --git a/simavr/sim/avr_twi.c b/simavr/sim/avr_twi.c
index 6f17671..1d58174 100644
--- a/simavr/sim/avr_twi.c
+++ b/simavr/sim/avr_twi.c
@@ -392,3 +392,16 @@ void avr_twi_init(avr_t * avr, avr_twi_t * p)
 	avr_register_io_write(avr, p->twsr.reg, avr_twi_write_status, p);
 }
 
+uint32_t
+avr_twi_irq_msg(
+		uint8_t msg,
+		uint8_t addr,
+		uint8_t data)
+{
+	avr_twi_msg_irq_t _msg = {
+			.u.twi.msg = msg,
+			.u.twi.addr = addr,
+			.u.twi.data = data,
+	};
+	return _msg.u.v;
+}
diff --git a/simavr/sim/avr_twi.h b/simavr/sim/avr_twi.h
index 5a84ba9..6b30c34 100644
--- a/simavr/sim/avr_twi.h
+++ b/simavr/sim/avr_twi.h
@@ -97,18 +97,10 @@ avr_twi_init(
  * Create a message value for twi including the 'msg' bitfield,
  * 'addr' and data. This value is what is sent as the IRQ value
  */
-static inline uint32_t
+uint32_t
 avr_twi_irq_msg(
 		uint8_t msg,
 		uint8_t addr,
-		uint8_t data)
-{
-	avr_twi_msg_irq_t _msg = {
-			.u.twi.msg = msg,
-			.u.twi.addr = addr,
-			.u.twi.data = data,
-	};
-	return _msg.u.v;
-}
+		uint8_t data);
 
 #endif /* AVR_TWI_H_ */