X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Ftriface%2Ftriface.c;h=86f21b2d22fb806dd4c96a8def5a8b07acd22137;hb=df94a4b7d8102b20810f889fbc926ac4823b61d9;hp=732e0c3d9bb01a685bb19b89807a5ef9b3197c23;hpb=d77aa42d34513249043d5a992a89551413b96c73;p=bertos.git

diff --git a/app/triface/triface.c b/app/triface/triface.c
old mode 100755
new mode 100644
index 732e0c3d..86f21b2d
--- a/app/triface/triface.c
+++ b/app/triface/triface.c
@@ -1,60 +1,101 @@
 /**
  * \file
  * <!--
- * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2003, 2004, 2006, 2008 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
+ *
  * -->
  *
  * \version $Id$
  *
  * \author Marco Benelli <marco@develer.com>
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
+ * \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 "protocol.h"
+#include "hw/hw_input.h"
+#include "hw/hw_adc.h"
+#include "cfg/cfg_ser.h"
+
+#include <cfg/macros.h>
 
 #include <drv/timer.h>
 #include <drv/buzzer.h>
 #include <drv/ser.h>
-#include <cfg/macros.h>
+#include <drv/sipo.h>
+
 #include <mware/parser.h>
+#include <net/keytag.h>
+
 
-#include "protocol.h"
+
+static Serial fd_ser;
+static Serial tag_ser;
 
 int main(void)
 {
+	/* SPI Port Initialization */
+	sipo_init();
+
 	kdbg_init();
 	timer_init();
-//	buz_init();
+	adc_init();
+	buz_init();
 
 	IRQ_ENABLE;
+	INPUT_INIT;
 
-	Serial *host_port = ser_open(0);
-	ser_setbaudrate(host_port, 38400);
+	/* Initialize Tag serial port and data structure */
+	TagPacket pkt;
 
-	protocol_init(host_port);
+	/* Open the main communication port */
+	ser_init(&fd_ser, CONFIG_TRIFACE_PORT);
+	ser_setbaudrate(&fd_ser, CONFIG_TRIFACE_BAUDRATE);
+
+	ser_init(&tag_ser, TAG_SER_PORT);
+	ser_setbaudrate(&tag_ser, TAG_SER_BAUDRATE);
+
+	keytag_init(&pkt, &fd_ser.fd, &tag_ser.fd);
+
+	protocol_init(&fd_ser.fd);
 
 	// Main loop
 	for(;;)
 	{
-		protocol_run(host_port);
+		protocol_run(&fd_ser.fd);
+		keytag_poll(&pkt);
 	}
 
 	return 0;
 }
+
+