summaryrefslogtreecommitdiffhomepage
path: root/digital
diff options
context:
space:
mode:
authorNicolas Schodet2009-05-09 02:43:24 +0200
committerNicolas Schodet2009-05-09 02:43:24 +0200
commit7d174ea9c2cbecfa548fa4423d432073c5fa8043 (patch)
tree03f17ece6c5dc1e9ca330ce72551ac212129399d /digital
parent859513759a2648e3f8cb675fac14892f7d6df9f6 (diff)
* digital/io:
- fixed compilation with contacts, no simulation yet.
Diffstat (limited to 'digital')
-rw-r--r--digital/io/src/contact.c3
-rw-r--r--digital/io/src/contact.h1
-rw-r--r--digital/io/src/simu.host.c3
-rw-r--r--digital/io/src/simu.host.h2
4 files changed, 8 insertions, 1 deletions
diff --git a/digital/io/src/contact.c b/digital/io/src/contact.c
index 3a26e962..a9b408a3 100644
--- a/digital/io/src/contact.c
+++ b/digital/io/src/contact.c
@@ -22,13 +22,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* }}} */
-
+#include "common.h"
#include "contact.h"
#include "io.h"
void
contact_init (void)
{
+ /* Pull-up. */
IO_SET (CONTACT_FILTER_BRIDGE_PUCK);
IO_SET (CONTACT_ELEVATOR_DOOR);
}
diff --git a/digital/io/src/contact.h b/digital/io/src/contact.h
index 5a681659..1e986f09 100644
--- a/digital/io/src/contact.h
+++ b/digital/io/src/contact.h
@@ -24,6 +24,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* }}} */
+#include "simu.host.h"
#define CONTACT_FILTER_BRIDGE_PUCK C, 0
#define CONTACT_ELEVATOR_DOOR C, 1
diff --git a/digital/io/src/simu.host.c b/digital/io/src/simu.host.c
index 935eadec..f13f84a5 100644
--- a/digital/io/src/simu.host.c
+++ b/digital/io/src/simu.host.c
@@ -69,6 +69,9 @@ uint8_t simu_switches;
uint16_t OCR1A;
uint8_t PORTB;
+/** Contact registers. */
+uint8_t PORTC, PINC;
+
/** Initialise simulation. */
void
simu_init (void)
diff --git a/digital/io/src/simu.host.h b/digital/io/src/simu.host.h
index 4203f42e..214fce3d 100644
--- a/digital/io/src/simu.host.h
+++ b/digital/io/src/simu.host.h
@@ -27,6 +27,8 @@
#ifdef HOST
+extern uint8_t PORTC, PINC;
+
/** Hooked, do nothing. */
void
switch_init (void);