From: Michel Pollet <buserror@gmail.com>
Date: Mon, 20 Mar 2017 18:31:33 +0000 (+0000)
Subject: Merge commit 'e6eb938344d6dd74bd7bdde5e8d17c468898b433'
X-Git-Tag: v1.6~48
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=1ae1912ac048b708560c55a44c2139cae977e270;p=sx%2Fsimavr.git

Merge commit 'e6eb938344d6dd74bd7bdde5e8d17c468898b433'
---

1ae1912ac048b708560c55a44c2139cae977e270
diff --cc simavr/sim/sim_irq.h
index f40809c,756323b..b96fd47
--- a/simavr/sim/sim_irq.h
+++ b/simavr/sim/sim_irq.h
@@@ -55,7 -56,7 +56,8 @@@ enum 
  	IRQ_FLAG_FILTERED	= (1 << 1),	//!< do not "notify" if "value" is the same as previous raise
  	IRQ_FLAG_ALLOC		= (1 << 2), //!< this irq structure was malloced via avr_alloc_irq
  	IRQ_FLAG_INIT		= (1 << 3), //!< this irq hasn't been used yet
- 	IRQ_FLAG_USER		= (1 << 4), //!< Can be used by irq users
+ 	IRQ_FLAG_FLOATING	= (1 << 4), //!< this 'pin'/signal is floating
++	IRQ_FLAG_USER		= (1 << 5), //!< Can be used by irq users
  };
  
  /*