* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
- * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
+ * 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.
*/
+#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 <drv/sipo.h>
-#include "protocol.h"
-#include "hw_input.h"
-#include "hw_adc.h"
+
+
+static Serial fd_ser;
+static Serial tag_ser;
int main(void)
{
TagPacket pkt;
/* Open the main communication port */
- Serial *host_port = ser_open(CONFIG_SER_HOSTPORT);
- ser_setbaudrate(host_port, CONFIG_SER_HOSTPORTBAUDRATE);
+ ser_init(&fd_ser, CONFIG_TRIFACE_PORT);
+ ser_setbaudrate(&fd_ser, CONFIG_TRIFACE_BAUDRATE);
- pkt.tag_ser = ser_open(TAG_SER_PORT);
- ser_setbaudrate(pkt.tag_ser, TAG_SER_BAUDRATE);
- pkt.comm_ser = host_port;
- keytag_init(&pkt);
+ 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(host_port);
+ protocol_init(&fd_ser.fd);
// Main loop
for(;;)
{
- protocol_run(host_port);
+ protocol_run(&fd_ser.fd);
keytag_poll(&pkt);
}
return 0;
}
+
+