X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Ftriface%2Ftriface.c;h=eb47d8fad0f5c67f77c31de895c0d67ff506b62b;hb=627654bcdc254cd0d104035996661a5839974fa9;hp=5856c9f06ea20cc0fe5e917eba35e242085e2057;hpb=9ba9dcf2a59a952609e19154e11de3e2478cbf42;p=bertos.git

diff --git a/app/triface/triface.c b/app/triface/triface.c
index 5856c9f0..eb47d8fa 100644
--- a/app/triface/triface.c
+++ b/app/triface/triface.c
@@ -26,7 +26,8 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2006, 2008 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
  *
  * -->
  *
@@ -34,52 +35,64 @@
  *
  * \author Marco Benelli <marco@develer.com>
  * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Daniele Basile <asterix@develer.com>
  *
  * \brief Windowing system test.
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.4  2006/06/14 00:28:52  marco
- *#* Removed initial delay.
- *#*
- *#* Revision 1.3  2006/06/12 21:37:02  marco
- *#* implemented some commands (ver and sleep)
- *#*
- *#* Revision 1.2  2006/06/01 12:29:21  marco
- *#* Add first simple protocol command (version request).
- *#*
- *#* Revision 1.1  2006/05/18 00:41:47  bernie
- *#* New triface devlib application.
- *#*
- *#*/
 
 #include <drv/timer.h>
 #include <drv/buzzer.h>
 #include <drv/ser.h>
+#include <drv/sipo.h>
+
 #include <cfg/macros.h>
 #include <mware/parser.h>
+#include <net/keytag.h>
 
 #include "protocol.h"
+#include "hw_input.h"
+#include "hw_adc.h"
+
+
+static KFileSerial fd_ser;
 
 int main(void)
 {
+	/* SPI Port Initialization */
+	sipo_init();
+
 	kdbg_init();
 	timer_init();
-//	buz_init();
+	adc_init();
+	buz_init();
 
 	IRQ_ENABLE;
+	INPUT_INIT;
+
+	/* Initialize Tag serial port and data structure */
+	TagPacket pkt;
 
-	Serial *host_port = ser_open(0);
-	ser_setbaudrate(host_port, 38400);
+	/* Open the main communication port */
+	ser_init(&fd_ser, CONFIG_SER_HOSTPORT);
+	ser_setbaudrate(&fd_ser, CONFIG_SER_HOSTPORTBAUDRATE);
 
-	protocol_init(host_port);
+	ser_init(pkt.tag_ser, TAG_SER_PORT);
+	ser_setbaudrate(pkt.tag_ser, TAG_SER_BAUDRATE);
+
+	pkt.comm_ser = &fd_ser;
+	keytag_init(&pkt);
+
+	protocol_init(&fd_ser.fd);
 
 	// Main loop
 	for(;;)
 	{
-		protocol_run(host_port);
+		protocol_run(&fd_ser.fd);
+		keytag_poll(&pkt);
 	}
 
 	return 0;
 }
+
+